feat(stdlib): loadBool for slices (#412)

tact-lang · Jun 13, 2024 · 7afc87e · 7afc87e
1 parent 56fa063
commit 7afc87e
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The bitwise NOT operation (`~`): PR [#337](https://github.com/tact-lang/tact/pull/337)
 - Augmented assignment bitwise operators `|=`, `&=`, `^=`: PR [#350](https://github.com/tact-lang/tact/pull/350)
 - Traversing maps from contract storage and structs is now allowed: PR [#389](https://github.com/tact-lang/tact/pull/389)
+- The `loadBool` method for `Slice` type: PR [#412](https://github.com/tact-lang/tact/pull/412)
 
 ### Changed
 

diff --git a/src/generator/writers/__snapshots__/writeSerialization.spec.ts.snap b/src/generator/writers/__snapshots__/writeSerialization.spec.ts.snap
@@ -75,6 +75,18 @@ return address;",
     "name": "__tact_verify_address",
     "signature": "slice __tact_verify_address(slice address)",
   },
+  {
+    "code": {
+      "code": "asm( -> 1 0) "1 LDI"",
+      "kind": "asm",
+    },
+    "comment": null,
+    "context": "stdlib",
+    "depends": Set {},
+    "flags": Set {},
+    "name": "__tact_load_bool",
+    "signature": "(slice, int) __tact_load_bool(slice s)",
+  },
   {
     "code": {
       "code": "slice raw = cs~load_msg_addr();
@@ -4664,6 +4676,18 @@ return address;",
     "name": "__tact_verify_address",
     "signature": "slice __tact_verify_address(slice address)",
   },
+  {
+    "code": {
+      "code": "asm( -> 1 0) "1 LDI"",
+      "kind": "asm",
+    },
+    "comment": null,
+    "context": "stdlib",
+    "depends": Set {},
+    "flags": Set {},
+    "name": "__tact_load_bool",
+    "signature": "(slice, int) __tact_load_bool(slice s)",
+  },
   {
     "code": {
       "code": "slice raw = cs~load_msg_addr();
@@ -9253,6 +9277,18 @@ return address;",
     "name": "__tact_verify_address",
     "signature": "slice __tact_verify_address(slice address)",
   },
+  {
+    "code": {
+      "code": "asm( -> 1 0) "1 LDI"",
+      "kind": "asm",
+    },
+    "comment": null,
+    "context": "stdlib",
+    "depends": Set {},
+    "flags": Set {},
+    "name": "__tact_load_bool",
+    "signature": "(slice, int) __tact_load_bool(slice s)",
+  },
   {
     "code": {
       "code": "slice raw = cs~load_msg_addr();

diff --git a/src/generator/writers/writeStdlib.ts b/src/generator/writers/writeStdlib.ts
@@ -43,6 +43,12 @@ export function writeStdlib(ctx: WriterContext) {
         });
     });
 
+    ctx.fun("__tact_load_bool", () => {
+        ctx.signature(`(slice, int) __tact_load_bool(slice s)`);
+        ctx.context("stdlib");
+        ctx.asm(`asm( -> 1 0) "1 LDI"`);
+    });
+
     ctx.fun("__tact_load_address", () => {
         ctx.signature(`(slice, slice) __tact_load_address(slice cs)`);
         ctx.flag("inline");

diff --git a/src/imports/stdlib.ts b/src/imports/stdlib.ts
@@ -139,19 +139,19 @@ files['std/cells.tact'] =
     'b2FkX2ludCkKZXh0ZW5kcyBtdXRhdGVzIG5hdGl2ZSBsb2FkSW50KHNlbGY6IFNsaWNlLCBsOiBJbnQpOiBJbnQ7CgpAbmFtZShwcmVsb2FkX2ludCkKZXh0ZW5kcyBu' +
     'YXRpdmUgcHJlbG9hZEludChzZWxmOiBTbGljZSwgbDogSW50KTogSW50OwoKQG5hbWUobG9hZF91aW50KQpleHRlbmRzIG11dGF0ZXMgbmF0aXZlIGxvYWRVaW50KHNl' +
     'bGY6IFNsaWNlLCBsOiBJbnQpOiBJbnQ7CgpAbmFtZShwcmVsb2FkX3VpbnQpCmV4dGVuZHMgbmF0aXZlIHByZWxvYWRVaW50KHNlbGY6IFNsaWNlLCBsOiBJbnQpOiBJ' +
-    'bnQ7CgpAbmFtZShsb2FkX2NvaW5zKQpleHRlbmRzIG11dGF0ZXMgbmF0aXZlIGxvYWRDb2lucyhzZWxmOiBTbGljZSk6IEludDsKCkBuYW1lKF9fdGFjdF9sb2FkX2Fk' +
-    'ZHJlc3MpCmV4dGVuZHMgbXV0YXRlcyBuYXRpdmUgbG9hZEFkZHJlc3Moc2VsZjogU2xpY2UpOiBBZGRyZXNzOwoKQG5hbWUoc2tpcF9iaXRzKQpleHRlbmRzIG11dGF0' +
-    'ZXMgbmF0aXZlIHNraXBCaXRzKHNlbGY6IFNsaWNlLCBsOiBJbnQpOwoKQG5hbWUoZW5kX3BhcnNlKQpleHRlbmRzIG5hdGl2ZSBlbmRQYXJzZShzZWxmOiBTbGljZSk7' +
-    'CgovLwovLyBTbGljZSBzaXplCi8vCgpAbmFtZShzbGljZV9yZWZzKQpleHRlbmRzIG5hdGl2ZSByZWZzKHNlbGY6IFNsaWNlKTogSW50OwoKQG5hbWUoc2xpY2VfYml0' +
-    'cykKZXh0ZW5kcyBuYXRpdmUgYml0cyhzZWxmOiBTbGljZSk6IEludDsKCkBuYW1lKHNsaWNlX2VtcHR5PykKZXh0ZW5kcyBuYXRpdmUgZW1wdHkoc2VsZjogU2xpY2Up' +
-    'OiBCb29sOwoKQG5hbWUoc2xpY2VfZGF0YV9lbXB0eT8pCmV4dGVuZHMgbmF0aXZlIGRhdGFFbXB0eShzZWxmOiBTbGljZSk6IEJvb2w7CgpAbmFtZShzbGljZV9yZWZz' +
-    'X2VtcHR5PykKZXh0ZW5kcyBuYXRpdmUgcmVmc0VtcHR5KHNlbGY6IFNsaWNlKTogQm9vbDsKCi8vCi8vIENvbnZlcnNpb25zCi8vCgppbmxpbmUgZXh0ZW5kcyBmdW4g' +
-    'YXNTbGljZShzZWxmOiBCdWlsZGVyKTogU2xpY2UgewogICAgcmV0dXJuIHNlbGYuZW5kQ2VsbCgpLmJlZ2luUGFyc2UoKTsKfQoKaW5saW5lIGV4dGVuZHMgZnVuIGFz' +
-    'U2xpY2Uoc2VsZjogQ2VsbCk6IFNsaWNlIHsKICAgIHJldHVybiBzZWxmLmJlZ2luUGFyc2UoKTsKfQoKaW5saW5lIGV4dGVuZHMgZnVuIGFzQ2VsbChzZWxmOiBTbGlj' +
-    'ZSk6IENlbGwgewogICAgcmV0dXJuIGJlZ2luQ2VsbCgpCiAgICAgICAgLnN0b3JlU2xpY2Uoc2VsZikKICAgICAgICAuZW5kQ2VsbCgpOwp9CgppbmxpbmUgZXh0ZW5k' +
-    'cyBmdW4gYXNDZWxsKHNlbGY6IEJ1aWxkZXIpOiBDZWxsIHsKICAgIHJldHVybiBzZWxmLmVuZENlbGwoKTsKfQoKaW5saW5lIGZ1biBlbXB0eUNlbGwoKTogQ2VsbCB7' +
-    'CiAgICByZXR1cm4gYmVnaW5DZWxsKCkuZW5kQ2VsbCgpOwp9CgppbmxpbmUgZnVuIGVtcHR5U2xpY2UoKTogU2xpY2UgewogICAgcmV0dXJuIGVtcHR5Q2VsbCgpLmFz' +
-    'U2xpY2UoKTsKfQ==';
+    'bnQ7CgpAbmFtZShfX3RhY3RfbG9hZF9ib29sKQpleHRlbmRzIG11dGF0ZXMgbmF0aXZlIGxvYWRCb29sKHNlbGY6IFNsaWNlKTogQm9vbDsKCkBuYW1lKGxvYWRfY29p' +
+    'bnMpCmV4dGVuZHMgbXV0YXRlcyBuYXRpdmUgbG9hZENvaW5zKHNlbGY6IFNsaWNlKTogSW50OwoKQG5hbWUoX190YWN0X2xvYWRfYWRkcmVzcykKZXh0ZW5kcyBtdXRh' +
+    'dGVzIG5hdGl2ZSBsb2FkQWRkcmVzcyhzZWxmOiBTbGljZSk6IEFkZHJlc3M7CgpAbmFtZShza2lwX2JpdHMpCmV4dGVuZHMgbXV0YXRlcyBuYXRpdmUgc2tpcEJpdHMo' +
+    'c2VsZjogU2xpY2UsIGw6IEludCk7CgpAbmFtZShlbmRfcGFyc2UpCmV4dGVuZHMgbmF0aXZlIGVuZFBhcnNlKHNlbGY6IFNsaWNlKTsKCi8vCi8vIFNsaWNlIHNpemUK' +
+    'Ly8KCkBuYW1lKHNsaWNlX3JlZnMpCmV4dGVuZHMgbmF0aXZlIHJlZnMoc2VsZjogU2xpY2UpOiBJbnQ7CgpAbmFtZShzbGljZV9iaXRzKQpleHRlbmRzIG5hdGl2ZSBi' +
+    'aXRzKHNlbGY6IFNsaWNlKTogSW50OwoKQG5hbWUoc2xpY2VfZW1wdHk/KQpleHRlbmRzIG5hdGl2ZSBlbXB0eShzZWxmOiBTbGljZSk6IEJvb2w7CgpAbmFtZShzbGlj' +
+    'ZV9kYXRhX2VtcHR5PykKZXh0ZW5kcyBuYXRpdmUgZGF0YUVtcHR5KHNlbGY6IFNsaWNlKTogQm9vbDsKCkBuYW1lKHNsaWNlX3JlZnNfZW1wdHk/KQpleHRlbmRzIG5h' +
+    'dGl2ZSByZWZzRW1wdHkoc2VsZjogU2xpY2UpOiBCb29sOwoKLy8KLy8gQ29udmVyc2lvbnMKLy8KCmlubGluZSBleHRlbmRzIGZ1biBhc1NsaWNlKHNlbGY6IEJ1aWxk' +
+    'ZXIpOiBTbGljZSB7CiAgICByZXR1cm4gc2VsZi5lbmRDZWxsKCkuYmVnaW5QYXJzZSgpOwp9CgppbmxpbmUgZXh0ZW5kcyBmdW4gYXNTbGljZShzZWxmOiBDZWxsKTog' +
+    'U2xpY2UgewogICAgcmV0dXJuIHNlbGYuYmVnaW5QYXJzZSgpOwp9CgppbmxpbmUgZXh0ZW5kcyBmdW4gYXNDZWxsKHNlbGY6IFNsaWNlKTogQ2VsbCB7CiAgICByZXR1' +
+    'cm4gYmVnaW5DZWxsKCkKICAgICAgICAuc3RvcmVTbGljZShzZWxmKQogICAgICAgIC5lbmRDZWxsKCk7Cn0KCmlubGluZSBleHRlbmRzIGZ1biBhc0NlbGwoc2VsZjog' +
+    'QnVpbGRlcik6IENlbGwgewogICAgcmV0dXJuIHNlbGYuZW5kQ2VsbCgpOwp9CgppbmxpbmUgZnVuIGVtcHR5Q2VsbCgpOiBDZWxsIHsKICAgIHJldHVybiBiZWdpbkNl' +
+    'bGwoKS5lbmRDZWxsKCk7Cn0KCmlubGluZSBmdW4gZW1wdHlTbGljZSgpOiBTbGljZSB7CiAgICByZXR1cm4gZW1wdHlDZWxsKCkuYXNTbGljZSgpOwp9';
 files['std/config.tact'] =
     'QG5hbWUoY29uZmlnX3BhcmFtKQpuYXRpdmUgZ2V0Q29uZmlnUGFyYW0oaWQ6IEludCk6IENlbGw/Ow==';
 files['std/context.tact'] =

diff --git a/src/test/e2e-emulated/contracts/stdlib.tact b/src/test/e2e-emulated/contracts/stdlib.tact
@@ -21,4 +21,8 @@ contract StdlibTest {
     get fun sliceRefs(sc: Slice): Int {
         return sc.refs();
     }
+
+    get fun loadBool(sc: Slice): Bool {
+        return sc.loadBool();
+    }
 }
diff --git a/src/test/e2e-emulated/stdlib.spec.ts b/src/test/e2e-emulated/stdlib.spec.ts
@@ -17,11 +17,9 @@ describe("stdlib", () => {
             .storeBit(1)
             .storeRef(beginCell().storeBit(1).endCell())
             .endCell();
-        const bits = await contract.getSliceBits(slice);
-        const refs = await contract.getSliceRefs(slice);
-        const empty = await contract.getSliceEmpty(slice);
-        expect(bits).toBe(2n);
-        expect(refs).toBe(1n);
-        expect(empty).toBe(false);
+        expect(await contract.getSliceBits(slice)).toBe(2n);
+        expect(await contract.getSliceRefs(slice)).toBe(1n);
+        expect(await contract.getSliceEmpty(slice)).toBe(false);
+        expect(await contract.getLoadBool(slice)).toBe(true);
     });
 });
diff --git a/stdlib/std/cells.tact b/stdlib/std/cells.tact
@@ -66,6 +66,9 @@ extends mutates native loadUint(self: Slice, l: Int): Int;
 @name(preload_uint)
 extends native preloadUint(self: Slice, l: Int): Int;
 
+@name(__tact_load_bool)
+extends mutates native loadBool(self: Slice): Bool;
+
 @name(load_coins)
 extends mutates native loadCoins(self: Slice): Int;