Fix predence of attribute expressions

Fixes #61
tree-sitter · Mar 5, 2020 · aeebb11 · aeebb11
1 parent 2eb10f4
commit aeebb11
Show file tree

Hide file tree

Showing 4 changed files with 1,946 additions and 1,896 deletions.
diff --git a/grammar.js b/grammar.js
@@ -547,7 +547,7 @@ module.exports = grammar({
         field('operator', operator),
         field('right', $._primary_expression)
       ))));
-    },      
+    },
 
     unary_operator: $ => prec(PREC.unary, seq(
       field('operator', choice('+', '-', '~')),
@@ -624,11 +624,11 @@ module.exports = grammar({
       )
     ),
 
-    attribute: $ => seq(
+    attribute: $ => prec(PREC.call, seq(
       field('object', $._primary_expression),
       '.',
       field('attribute', $.identifier)
-    ),
+    )),
 
     subscript: $ => seq(
       field('value', $._primary_expression),

diff --git a/src/grammar.json b/src/grammar.json
@@ -3179,29 +3179,33 @@
       ]
     },
     "attribute": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "FIELD",
-          "name": "object",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_primary_expression"
-          }
-        },
-        {
-          "type": "STRING",
-          "value": "."
-        },
-        {
-          "type": "FIELD",
-          "name": "attribute",
-          "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
+      "type": "PREC",
+      "value": 20,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "FIELD",
+            "name": "object",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_primary_expression"
+            }
+          },
+          {
+            "type": "STRING",
+            "value": "."
+          },
+          {
+            "type": "FIELD",
+            "name": "attribute",
+            "content": {
+              "type": "SYMBOL",
+              "name": "identifier"
+            }
           }
-        }
-      ]
+        ]
+      }
     },
     "subscript": {
       "type": "SEQ",