fix: re-add some unary ops

tree-sitter-grammars · Jan 24, 2024 · eaabb02 · eaabb02
1 parent 121d749
commit eaabb02
Show file tree

Hide file tree

Showing 4 changed files with 10,404 additions and 9,903 deletions.
diff --git a/grammar.js b/grammar.js
@@ -25,6 +25,7 @@ const PREC = {
   PLUS: 9, // + -
   MULTI: 10, // * / // %
   CAST: 11, // ::
+  UNARY: 12, // not # -
   POWER: 13, // ^
 };
 
@@ -207,7 +208,7 @@ module.exports = grammar(lua, {
     literal_type: $ => choice($.string, $.true, $.false),
 
     expression: ($, original) => choice(
-      ...original.members.filter(member => member.name !== 'unary_expression'),
+      original,
       $.cast_expression,
       $.if_expression,
     ),
@@ -256,6 +257,11 @@ module.exports = grammar(lua, {
       ),
     ),
 
+    unary_expression: ($) => prec.left(
+      PREC.UNARY,
+      seq(choice('not', '#', '-'), field('operand', $.expression)),
+    ),
+
     cast_expression: $ => prec(PREC.CAST, seq(
       $.expression,
       '::',

diff --git a/src/grammar.json b/src/grammar.json
@@ -1151,52 +1151,61 @@
       "type": "CHOICE",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "nil"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "false"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "true"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "number"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "string"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "vararg_expression"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "function_definition"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "variable"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "function_call"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "parenthesized_expression"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "table_constructor"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "binary_expression"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "nil"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "false"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "true"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "number"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "string"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "vararg_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "function_definition"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "variable"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "function_call"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "parenthesized_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "table_constructor"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "binary_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "unary_expression"
+            }
+          ]
         },
         {
           "type": "SYMBOL",
@@ -2844,7 +2853,7 @@
     },
     "unary_expression": {
       "type": "PREC_LEFT",
-      "value": 11,
+      "value": 12,
       "content": {
         "type": "SEQ",
         "members": [
@@ -2862,10 +2871,6 @@
               {
                 "type": "STRING",
                 "value": "-"
-              },
-              {
-                "type": "STRING",
-                "value": "~"
               }
             ]
           },

diff --git a/src/node-types.json b/src/node-types.json
@@ -65,6 +65,10 @@
         "type": "true",
         "named": true
       },
+      {
+        "type": "unary_expression",
+        "named": true
+      },
       {
         "type": "vararg_expression",
         "named": true
@@ -1365,6 +1369,22 @@
       ]
     }
   },
+  {
+    "type": "unary_expression",
+    "named": true,
+    "fields": {
+      "operand": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "union_type",
     "named": true,
@@ -1824,10 +1844,6 @@
     "type": "}",
     "named": false
   },
-  {
-    "type": "~",
-    "named": false
-  },
   {
     "type": "~=",
     "named": false