tree-sitter-bsl 0.1.5 → 0.1.6

package/grammar.js

@@ -243,11 +243,9 @@ module.exports = grammar({
       seq(
         field('val', optional($.VAL_KEYWORD)),
         field('name', $.identifier),
-        field('def', optional($._def_value)),
+        optional(seq('=', field('def', $._const_value))),
       ),
 
-    _def_value: ($) => seq('=', $._const_value),
-
     // Statements
     _statement: ($) =>
       choice(
@@ -284,7 +282,7 @@ module.exports = grammar({
       ),
 
     return_statement: ($) =>
-      prec.right(seq($.RETURN_KEYWORD, optional($.expression), optional(';'))),
+      prec.right(seq($.RETURN_KEYWORD, field('result', optional($.expression)), optional(';'))),
 
     try_statement: ($) =>
       seq(
@@ -395,6 +393,7 @@ module.exports = grammar({
         $.binary_expression,
         $.ternary_expression,
         $.new_expression,
+        $.new_expression_method,
         $.method_call,
         $.call_expression,
         $.property_access,
@@ -449,15 +448,15 @@ module.exports = grammar({
     new_expression: ($) =>
       prec(
         PREC.NEW,
-        choice(
-          seq(
-            $.NEW_KEYWORD,
-            field('type', $.identifier),
-            field('arguments', optional($.arguments)),
-          ),
-          seq($.NEW_KEYWORD, field('arguments', $.arguments)),
-        ),
-      ),
+        seq(
+          $.NEW_KEYWORD,
+          field('type', $.identifier),
+          field('arguments', optional($.arguments)),
+        )),
+    new_expression_method: ($) =>
+      prec.right(
+        PREC.NEW,
+        seq($.NEW_KEYWORD, '(', field('type', $.expression), optional(seq(',', field('arguments', $.expression), ')')))),
 
     call_expression: ($) => prec(PREC.CALL - 1, $._access_call),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-bsl",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "1C (BSL) grammar for tree-sitter",
   "repository": "https://github.com/alkoleft/tree-sitter-bsl",
   "license": "MIT",
@@ -32,11 +32,12 @@
   "devDependencies": {
     "eslint": "^9.14.0",
     "eslint-config-treesitter": "^1.0.2",
-    "tree-sitter-cli": "^0.25.1",
-    "prebuildify": "^6.0.1"
+    "prebuildify": "^6.0.1",
+    "tree-sitter": "^0.25.0",
+    "tree-sitter-cli": "^0.26.6"
   },
   "peerDependencies": {
-    "tree-sitter": "^0.21.1"
+    "tree-sitter": "^0.25.0"
   },
   "peerDependenciesMeta": {
     "tree-sitter": {

package/src/grammar.json

@@ -315,33 +315,29 @@
           }
         },
         {
-          "type": "FIELD",
-          "name": "def",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_def_value"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          }
-        }
-      ]
-    },
-    "_def_value": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "="
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_const_value"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "="
+                },
+                {
+                  "type": "FIELD",
+                  "name": "def",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "_const_value"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -504,16 +500,20 @@
             "name": "RETURN_KEYWORD"
           },
           {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "expression"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
+            "type": "FIELD",
+            "name": "result",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
           },
           {
             "type": "CHOICE",
@@ -1206,6 +1206,10 @@
           "type": "SYMBOL",
           "name": "new_expression"
         },
+        {
+          "type": "SYMBOL",
+          "name": "new_expression_method"
+        },
         {
           "type": "SYMBOL",
           "name": "method_call"
@@ -1562,55 +1566,87 @@
       "type": "PREC",
       "value": 19,
       "content": {
-        "type": "CHOICE",
+        "type": "SEQ",
         "members": [
           {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "NEW_KEYWORD"
-              },
-              {
-                "type": "FIELD",
-                "name": "type",
-                "content": {
+            "type": "SYMBOL",
+            "name": "NEW_KEYWORD"
+          },
+          {
+            "type": "FIELD",
+            "name": "type",
+            "content": {
+              "type": "SYMBOL",
+              "name": "identifier"
+            }
+          },
+          {
+            "type": "FIELD",
+            "name": "arguments",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
                   "type": "SYMBOL",
-                  "name": "identifier"
-                }
-              },
-              {
-                "type": "FIELD",
-                "name": "arguments",
-                "content": {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "arguments"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
+                  "name": "arguments"
+                },
+                {
+                  "type": "BLANK"
                 }
-              }
-            ]
+              ]
+            }
+          }
+        ]
+      }
+    },
+    "new_expression_method": {
+      "type": "PREC_RIGHT",
+      "value": 19,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "NEW_KEYWORD"
           },
           {
-            "type": "SEQ",
+            "type": "STRING",
+            "value": "("
+          },
+          {
+            "type": "FIELD",
+            "name": "type",
+            "content": {
+              "type": "SYMBOL",
+              "name": "expression"
+            }
+          },
+          {
+            "type": "CHOICE",
             "members": [
               {
-                "type": "SYMBOL",
-                "name": "NEW_KEYWORD"
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "FIELD",
+                    "name": "arguments",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "expression"
+                    }
+                  },
+                  {
+                    "type": "STRING",
+                    "value": ")"
+                  }
+                ]
               },
               {
-                "type": "FIELD",
-                "name": "arguments",
-                "content": {
-                  "type": "SYMBOL",
-                  "name": "arguments"
-                }
+                "type": "BLANK"
               }
             ]
           }

package/src/node-types.json

@@ -527,6 +527,10 @@
           "type": "new_expression",
           "named": true
         },
+        {
+          "type": "new_expression_method",
+          "named": true
+        },
         {
           "type": "property_access",
           "named": true
@@ -1064,6 +1068,10 @@
           "type": "new_expression",
           "named": true
         },
+        {
+          "type": "new_expression_method",
+          "named": true
+        },
         {
           "type": "property_access",
           "named": true
@@ -1097,6 +1105,7 @@
   {
     "type": "line_comment",
     "named": true,
+    "extra": true,
     "fields": {}
   },
   {
@@ -1141,7 +1150,7 @@
       },
       "type": {
         "multiple": false,
-        "required": false,
+        "required": true,
         "types": [
           {
             "type": "identifier",
@@ -1161,18 +1170,50 @@
       ]
     }
   },
+  {
+    "type": "new_expression_method",
+    "named": true,
+    "fields": {
+      "arguments": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          }
+        ]
+      },
+      "type": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "NEW_KEYWORD",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "parameter",
     "named": true,
     "fields": {
       "def": {
-        "multiple": true,
+        "multiple": false,
         "required": false,
         "types": [
-          {
-            "type": "=",
-            "named": false
-          },
           {
             "type": "NULL_KEYWORD",
             "named": true
@@ -1471,18 +1512,25 @@
   {
     "type": "return_statement",
     "named": true,
-    "fields": {},
+    "fields": {
+      "result": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
-      "multiple": true,
+      "multiple": false,
       "required": true,
       "types": [
         {
           "type": "RETURN_KEYWORD",
           "named": true
-        },
-        {
-          "type": "expression",
-          "named": true
         }
       ]
     }