tree-sitter-java-orchard 0.5.9 → 0.5.15

package/grammar.js

@@ -242,7 +242,7 @@ export default grammar({
       $.switch_expression,
     ),
 
-    cast_expression: $ => prec(PREC.CAST, choice(
+    cast_expression: $ => prec.right(PREC.CAST, choice(
       seq(
         '(',
         field('type', $._type),
@@ -269,6 +269,7 @@ export default grammar({
         $._reserved_identifier,
         $.field_access,
         $.array_access,
+        $.parenthesized_expression,
       )),
       field('operator', choice('=', '+=', '-=', '*=', '/=', '&=', '|=', '^=', '%=', '<<=', '>>=', '>>>=')),
       field('right', $.expression),
@@ -352,12 +353,12 @@ export default grammar({
       field('operand', $.expression),
     )),
 
-    update_expression: $ => prec.left(PREC.UNARY, choice(
+    update_expression: $ => prec.right(PREC.UNARY, choice(
       // Post (in|de)crement is evaluated before pre (in|de)crement
-      seq($.expression, '++'),
-      seq($.expression, '--'),
-      seq('++', $.expression),
-      seq('--', $.expression),
+      seq($.primary_expression, '++'),
+      seq($.primary_expression, '--'),
+      seq('++', $.primary_expression),
+      seq('--', $.primary_expression),
     )),
 
     primary_expression: $ => choice(
@@ -1081,7 +1082,8 @@ export default grammar({
 
     annotation_type_declaration: $ => seq(
       optional($.modifiers),
-      '@interface',
+      '@',
+      'interface',
       field('name', $.identifier),
       field('body', $.annotation_type_body),
     ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-java-orchard",
-  "version": "0.5.9",
+  "version": "0.5.15",
   "description": "Java grammar for tree-sitter",
   "type": "module",
   "repository": {

package/src/grammar.json

@@ -1362,7 +1362,7 @@
       ]
     },
     "cast_expression": {
-      "type": "PREC",
+      "type": "PREC_RIGHT",
       "value": 14,
       "content": {
         "type": "CHOICE",
@@ -1506,6 +1506,10 @@
                 {
                   "type": "SYMBOL",
                   "name": "array_access"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "parenthesized_expression"
                 }
               ]
             }
@@ -2520,7 +2524,7 @@
       }
     },
     "update_expression": {
-      "type": "PREC_LEFT",
+      "type": "PREC_RIGHT",
       "value": 15,
       "content": {
         "type": "CHOICE",
@@ -2530,7 +2534,7 @@
             "members": [
               {
                 "type": "SYMBOL",
-                "name": "expression"
+                "name": "primary_expression"
               },
               {
                 "type": "STRING",
@@ -2543,7 +2547,7 @@
             "members": [
               {
                 "type": "SYMBOL",
-                "name": "expression"
+                "name": "primary_expression"
               },
               {
                 "type": "STRING",
@@ -2560,7 +2564,7 @@
               },
               {
                 "type": "SYMBOL",
-                "name": "expression"
+                "name": "primary_expression"
               }
             ]
           },
@@ -2573,7 +2577,7 @@
               },
               {
                 "type": "SYMBOL",
-                "name": "expression"
+                "name": "primary_expression"
               }
             ]
           }
@@ -6524,7 +6528,11 @@
         },
         {
           "type": "STRING",
-          "value": "@interface"
+          "value": "@"
+        },
+        {
+          "type": "STRING",
+          "value": "interface"
         },
         {
           "type": "FIELD",

package/src/node-types.json

@@ -766,6 +766,10 @@
           {
             "type": "identifier",
             "named": true
+          },
+          {
+            "type": "parenthesized_expression",
+            "named": true
           }
         ]
       },
@@ -4001,7 +4005,7 @@
       "required": true,
       "types": [
         {
-          "type": "expression",
+          "type": "primary_expression",
           "named": true
         }
       ]
@@ -4312,10 +4316,6 @@
     "type": "@",
     "named": false
   },
-  {
-    "type": "@interface",
-    "named": false
-  },
   {
     "type": "[",
     "named": false