Merge pull request tree-sitter#12 from tausbn/add-expression-annotations

Add support for expression annotations
tausbn · Jun 2, 2021 · 8e7fd7e · 8e7fd7e
2 parents 2c94445 + 31ad3d4
commit 8e7fd7e
Show file tree

Hide file tree

Showing 5 changed files with 32,334 additions and 29,890 deletions.
diff --git a/grammar.js b/grammar.js
@@ -264,6 +264,15 @@ module.exports = grammar({
 
     par_expr: $ => seq("(", $._exprOrTerm, ")"),
 
+    expr_annotation: $ => seq(
+      field('name', $.annotName),
+      "[",
+      field('annot_arg',$.annotName),
+      "]",
+      "(", 
+      $._exprOrTerm, 
+      ")",
+    ),
 
     _exprOrTerm: $ => choice(
       $.special_call,
@@ -292,7 +301,8 @@ module.exports = grammar({
       $.aggregate,
       $.range,
       $.set_literal,
-      $.par_expr                                                 // ParExpr
+      $.par_expr,                                                // ParExpr
+      $.expr_annotation
     ),
 
     literal: $ => choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -2063,6 +2063,47 @@
         }
       ]
     },
+    "expr_annotation": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "annotName"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "["
+        },
+        {
+          "type": "FIELD",
+          "name": "annot_arg",
+          "content": {
+            "type": "SYMBOL",
+            "name": "annotName"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "]"
+        },
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_exprOrTerm"
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
     "_exprOrTerm": {
       "type": "CHOICE",
       "members": [
@@ -2166,6 +2207,10 @@
         {
           "type": "SYMBOL",
           "name": "par_expr"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "expr_annotation"
         }
       ]
     },