fix(grammar): allow !! in chains of method calls (#257)

tact-lang · Apr 15, 2024 · fab39a0 · fab39a0
1 parent 9c741b2
commit fab39a0
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 239 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 node_modules
 coverage
 dist
-output/
+output/
+src/grammar/grammar.ohm-bundle.js
+src/grammar/grammar.ohm-bundle.d.ts
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Incorrect "already exists" errors when using names such as `toString` or `valueOf`: PR [#208](https://github.com/tact-lang/tact/pull/208)
 - Escape backticks in error messages for generated TypeScript code: PR [#192](https://github.com/tact-lang/tact/pull/192)
 - Empty inherited trait lists after `with` keyword are now disallowed: PR [#246](https://github.com/tact-lang/tact/pull/246)
+- Allow chaining method calls with `!!`, for instance, `map.asCell()!!.hash()` is grammatically correct now: PR [#257](ttps://github.com/tact-lang/tact/pull/257)
 
 ## [1.2.0] - 2024-02-29
 

diff --git a/src/grammar/__snapshots__/grammar.spec.ts.snap b/src/grammar/__snapshots__/grammar.spec.ts.snap
@@ -5266,3 +5266,79 @@ exports[`grammar should parse case-32 1`] = `
   "kind": "program",
 }
 `;
+
+exports[`grammar should parse case-33 1`] = `
+{
+  "entries": [
+    {
+      "args": [
+        {
+          "id": 3,
+          "kind": "def_argument",
+          "name": "m",
+          "ref": m: map<Int, Int>,
+          "type": {
+            "id": 2,
+            "key": "Int",
+            "keyAs": null,
+            "kind": "type_ref_map",
+            "ref": map<Int, Int>,
+            "value": "Int",
+            "valueAs": null,
+          },
+        },
+      ],
+      "attributes": [],
+      "id": 9,
+      "kind": "def_function",
+      "name": "testFunc",
+      "origin": "user",
+      "ref": fun testFunc(m: map<Int, Int>): Int {
+    return m.asCell()!!.hash();
+},
+      "return": {
+        "id": 1,
+        "kind": "type_ref_simple",
+        "name": "Int",
+        "optional": false,
+        "ref": Int,
+      },
+      "statements": [
+        {
+          "expression": {
+            "args": [],
+            "id": 7,
+            "kind": "op_call",
+            "name": "hash",
+            "ref": m.asCell()!!.hash(),
+            "src": {
+              "id": 6,
+              "kind": "op_unary",
+              "op": "!!",
+              "ref": m.asCell()!!,
+              "right": {
+                "args": [],
+                "id": 5,
+                "kind": "op_call",
+                "name": "asCell",
+                "ref": m.asCell(),
+                "src": {
+                  "id": 4,
+                  "kind": "id",
+                  "ref": m,
+                  "value": "m",
+                },
+              },
+            },
+          },
+          "id": 8,
+          "kind": "statement_return",
+          "ref": return m.asCell()!!.hash();,
+        },
+      ],
+    },
+  ],
+  "id": 10,
+  "kind": "program",
+}
+`;
diff --git a/src/grammar/grammar.ohm b/src/grammar/grammar.ohm
@@ -151,16 +151,15 @@ Tact {
                   | ExpressionMul "/" ExpressionUnary --div
                   | ExpressionMul "%" ExpressionUnary --rem
                   | ExpressionUnary
-    ExpressionUnary = "-" ExpressionUnarySuffix --neg
-                    | "+" ExpressionUnarySuffix --add
-                    | "!" ExpressionUnarySuffix --not
-                    | ExpressionUnarySuffix
-    ExpressionUnarySuffix = ExpressionValue "!!" --notNull
-                          | ExpressionValue
+    ExpressionUnary = "-" ExpressionValue --neg
+                    | "+" ExpressionValue --add
+                    | "!" ExpressionValue --not
+                    | ExpressionValue
     ExpressionBracket = "(" Expression ")"
 
     // Order is important
-    ExpressionValue = ExpressionCall
+    ExpressionValue = ExpressionUnboxNotNull
+                    | ExpressionCall
                     | ExpressionField
                     | ExpressionStaticCall
                     | ExpressionBracket
@@ -171,6 +170,7 @@ Tact {
                     | null
                     | ExpressionInitOf
                     | ExpressionString
+    ExpressionUnboxNotNull = ExpressionValue "!!"
     ExpressionString = stringLiteral
     ExpressionField = ExpressionValue "." id ~"("
     ExpressionCall = ExpressionValue "." id "(" ListOf<Expression, ","> ","? ")"

diff --git a/src/grammar/grammar.ohm-bundle.d.ts b/src/grammar/grammar.ohm-bundle.d.ts
diff --git a/src/grammar/grammar.ohm-bundle.js b/src/grammar/grammar.ohm-bundle.js
diff --git a/src/grammar/grammar.ts b/src/grammar/grammar.ts
@@ -1110,7 +1110,7 @@ semantics.addOperation<ASTNode>("resolve_expression", {
     ExpressionBracket(_arg0, arg1, _arg2) {
         return arg1.resolve_expression();
     },
-    ExpressionUnarySuffix_notNull(arg0, _arg1) {
+    ExpressionUnboxNotNull(arg0, _arg1) {
         return createNode({
             kind: "op_unary",
             op: "!!",

diff --git a/src/grammar/test/case-33.tact b/src/grammar/test/case-33.tact
@@ -0,0 +1,3 @@
+fun testFunc(m: map<Int, Int>): Int {
+    return m.asCell()!!.hash();
+}