feat: sliceLast -> lastBits, and make computeDataSize an extend…

… function for both cell and slice
tact-lang · Nov 18, 2024 · 3d0e90e · 3d0e90e
1 parent c88e882
commit 3d0e90e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/imports/stdlib.ts b/src/imports/stdlib.ts
@@ -177,20 +177,20 @@ files['std/cells.tact'] =
     'IG11dGF0ZXMgbmF0aXZlIGxvYWRBZGRyZXNzKHNlbGY6IFNsaWNlKTogQWRkcmVzczsKCmFzbSBleHRlbmRzIG11dGF0ZXMgZnVuIHNraXBCaXRzKHNlbGY6IFNsaWNl' +
     'LCBsOiBJbnQpIHsgU0RTS0lQRklSU1QgfQoKYXNtIGV4dGVuZHMgZnVuIGVuZFBhcnNlKHNlbGY6IFNsaWNlKSB7IEVORFMgfQoKYXNtIGV4dGVuZHMgZnVuIHNraXBM' +
     'YXN0Qml0cyhzZWxmOiBTbGljZSwgbGVuOiBJbnQpOiBTbGljZSB7IFNEU0tJUExBU1QgfQoKYXNtIGV4dGVuZHMgZnVuIGZpcnN0Qml0cyhzZWxmOiBTbGljZSwgbGVu' +
-    'OiBJbnQpOiBTbGljZSB7IFNEQ1VURklSU1QgfQoKYXNtIGV4dGVuZHMgZnVuIHNsaWNlTGFzdChzZWxmOiBTbGljZSwgbGVuOiBJbnQpOiBTbGljZSB7IFNEQ1VUTEFT' +
-    'VCB9Cgphc20gZXh0ZW5kcyBmdW4gZGVwdGgoc2VsZjogU2xpY2UpOiBJbnQgeyBTREVQVEggfQoKLy8KLy8gU2xpY2Ugc2l6ZQovLwoKYXNtIGV4dGVuZHMgZnVuIHJl' +
-    'ZnMoc2VsZjogU2xpY2UpOiBJbnQgeyBTUkVGUyB9Cgphc20gZXh0ZW5kcyBmdW4gYml0cyhzZWxmOiBTbGljZSk6IEludCB7IFNCSVRTIH0KCmFzbSBleHRlbmRzIGZ1' +
-    'biBlbXB0eShzZWxmOiBTbGljZSk6IEJvb2wgeyBTRU1QVFkgfQoKYXNtIGV4dGVuZHMgZnVuIGRhdGFFbXB0eShzZWxmOiBTbGljZSk6IEJvb2wgeyBTREVNUFRZIH0K' +
-    'CmFzbSBleHRlbmRzIGZ1biByZWZzRW1wdHkoc2VsZjogU2xpY2UpOiBCb29sIHsgU1JFTVBUWSB9CgovLwovLyBDb252ZXJzaW9ucwovLwoKaW5saW5lIGV4dGVuZHMg' +
-    'ZnVuIGFzU2xpY2Uoc2VsZjogQnVpbGRlcik6IFNsaWNlIHsKICAgIHJldHVybiBzZWxmLmVuZENlbGwoKS5iZWdpblBhcnNlKCk7Cn0KCmlubGluZSBleHRlbmRzIGZ1' +
-    'biBhc1NsaWNlKHNlbGY6IENlbGwpOiBTbGljZSB7CiAgICByZXR1cm4gc2VsZi5iZWdpblBhcnNlKCk7Cn0KCmlubGluZSBleHRlbmRzIGZ1biBhc0NlbGwoc2VsZjog' +
-    'U2xpY2UpOiBDZWxsIHsKICAgIHJldHVybiBiZWdpbkNlbGwoKQogICAgICAgIC5zdG9yZVNsaWNlKHNlbGYpCiAgICAgICAgLmVuZENlbGwoKTsKfQoKaW5saW5lIGV4' +
-    'dGVuZHMgZnVuIGFzQ2VsbChzZWxmOiBCdWlsZGVyKTogQ2VsbCB7CiAgICByZXR1cm4gc2VsZi5lbmRDZWxsKCk7Cn0KCmlubGluZSBmdW4gZW1wdHlDZWxsKCk6IENl' +
-    'bGwgewogICAgcmV0dXJuIGJlZ2luQ2VsbCgpLmVuZENlbGwoKTsKfQoKaW5saW5lIGZ1biBlbXB0eVNsaWNlKCk6IFNsaWNlIHsKICAgIHJldHVybiBlbXB0eUNlbGwo' +
-    'KS5hc1NsaWNlKCk7Cn0KCnN0cnVjdCBEYXRhU2l6ZSB7CiAgICBjZWxsczogSW50OwogICAgYml0czogSW50OwogICAgcmVmczogSW50Owp9Cgphc20gZnVuIGNvbXB1' +
-    'dGVEYXRhU2l6ZShjZWxsOiBDZWxsLCBtYXhDZWxsczogSW50KTogRGF0YVNpemUgeyBDREFUQVNJWkUgVFJJUExFIH0KCmFzbSBmdW4gY29tcHV0ZVNsaWNlRGF0YVNp' +
-    'emUoc2xpY2U6IFNsaWNlLCBtYXhDZWxsczogSW50KTogRGF0YVNpemUgeyBTREFUQVNJWkUgVFJJUExFIH0KCmFzbSBleHRlbmRzIGZ1biBkZXB0aChzZWxmOiBDZWxs' +
-    'KTogSW50IHsgQ0RFUFRIIH0KCg==';
+    'OiBJbnQpOiBTbGljZSB7IFNEQ1VURklSU1QgfQoKYXNtIGV4dGVuZHMgZnVuIGxhc3RCaXRzKHNlbGY6IFNsaWNlLCBsZW46IEludCk6IFNsaWNlIHsgU0RDVVRMQVNU' +
+    'IH0KCmFzbSBleHRlbmRzIGZ1biBkZXB0aChzZWxmOiBTbGljZSk6IEludCB7IFNERVBUSCB9CgovLwovLyBTbGljZSBzaXplCi8vCgphc20gZXh0ZW5kcyBmdW4gcmVm' +
+    'cyhzZWxmOiBTbGljZSk6IEludCB7IFNSRUZTIH0KCmFzbSBleHRlbmRzIGZ1biBiaXRzKHNlbGY6IFNsaWNlKTogSW50IHsgU0JJVFMgfQoKYXNtIGV4dGVuZHMgZnVu' +
+    'IGVtcHR5KHNlbGY6IFNsaWNlKTogQm9vbCB7IFNFTVBUWSB9Cgphc20gZXh0ZW5kcyBmdW4gZGF0YUVtcHR5KHNlbGY6IFNsaWNlKTogQm9vbCB7IFNERU1QVFkgfQoK' +
+    'YXNtIGV4dGVuZHMgZnVuIHJlZnNFbXB0eShzZWxmOiBTbGljZSk6IEJvb2wgeyBTUkVNUFRZIH0KCi8vCi8vIENvbnZlcnNpb25zCi8vCgppbmxpbmUgZXh0ZW5kcyBm' +
+    'dW4gYXNTbGljZShzZWxmOiBCdWlsZGVyKTogU2xpY2UgewogICAgcmV0dXJuIHNlbGYuZW5kQ2VsbCgpLmJlZ2luUGFyc2UoKTsKfQoKaW5saW5lIGV4dGVuZHMgZnVu' +
+    'IGFzU2xpY2Uoc2VsZjogQ2VsbCk6IFNsaWNlIHsKICAgIHJldHVybiBzZWxmLmJlZ2luUGFyc2UoKTsKfQoKaW5saW5lIGV4dGVuZHMgZnVuIGFzQ2VsbChzZWxmOiBT' +
+    'bGljZSk6IENlbGwgewogICAgcmV0dXJuIGJlZ2luQ2VsbCgpCiAgICAgICAgLnN0b3JlU2xpY2Uoc2VsZikKICAgICAgICAuZW5kQ2VsbCgpOwp9CgppbmxpbmUgZXh0' +
+    'ZW5kcyBmdW4gYXNDZWxsKHNlbGY6IEJ1aWxkZXIpOiBDZWxsIHsKICAgIHJldHVybiBzZWxmLmVuZENlbGwoKTsKfQoKaW5saW5lIGZ1biBlbXB0eUNlbGwoKTogQ2Vs' +
+    'bCB7CiAgICByZXR1cm4gYmVnaW5DZWxsKCkuZW5kQ2VsbCgpOwp9CgppbmxpbmUgZnVuIGVtcHR5U2xpY2UoKTogU2xpY2UgewogICAgcmV0dXJuIGVtcHR5Q2VsbCgp' +
+    'LmFzU2xpY2UoKTsKfQoKc3RydWN0IERhdGFTaXplIHsKICAgIGNlbGxzOiBJbnQ7CiAgICBiaXRzOiBJbnQ7CiAgICByZWZzOiBJbnQ7Cn0KCmFzbSBleHRlbmRzIGZ1' +
+    'biBjb21wdXRlRGF0YVNpemUoc2VsZjogQ2VsbCwgbWF4Q2VsbHM6IEludCk6IERhdGFTaXplIHsgQ0RBVEFTSVpFIFRSSVBMRSB9Cgphc20gZXh0ZW5kcyBmdW4gY29t' +
+    'cHV0ZURhdGFTaXplKHNlbGY6IFNsaWNlLCBtYXhDZWxsczogSW50KTogRGF0YVNpemUgeyBTREFUQVNJWkUgVFJJUExFIH0KCmFzbSBleHRlbmRzIGZ1biBkZXB0aChz' +
+    'ZWxmOiBDZWxsKTogSW50IHsgQ0RFUFRIIH0KCg==';
 files['std/config.tact'] =
     'YXNtIGZ1biBnZXRDb25maWdQYXJhbShpZDogSW50KTogQ2VsbD8geyBDT05GSUdPUFRQQVJBTSB9Cg==';
 files['std/context.tact'] =

diff --git a/stdlib/std/cells.tact b/stdlib/std/cells.tact
@@ -154,7 +154,7 @@ asm extends fun skipLastBits(self: Slice, len: Int): Slice { SDSKIPLAST }
 
 asm extends fun firstBits(self: Slice, len: Int): Slice { SDCUTFIRST }
 
-asm extends fun sliceLast(self: Slice, len: Int): Slice { SDCUTLAST }
+asm extends fun lastBits(self: Slice, len: Int): Slice { SDCUTLAST }
 
 asm extends fun depth(self: Slice): Int { SDEPTH }
 
@@ -208,9 +208,9 @@ struct DataSize {
     refs: Int;
 }
 
-asm fun computeDataSize(cell: Cell, maxCells: Int): DataSize { CDATASIZE TRIPLE }
+asm extends fun computeDataSize(self: Cell, maxCells: Int): DataSize { CDATASIZE TRIPLE }
 
-asm fun computeSliceDataSize(slice: Slice, maxCells: Int): DataSize { SDATASIZE TRIPLE }
+asm extends fun computeDataSize(self: Slice, maxCells: Int): DataSize { SDATASIZE TRIPLE }
 
 asm extends fun depth(self: Cell): Int { CDEPTH }