tree-sitter-bsl 0.1.3 → 0.1.4

package/grammar.js

@@ -12,7 +12,7 @@ const PREC = {
   NEW: 19,
   TERNARY: 20,
   ASSIGNMENT: 21,
-  AWAIT: 22
+  AWAIT: 22,
 };
 
 const keyword = (...words) => token(choice(...words.map(caseInsensitive)));
@@ -99,6 +99,10 @@ function buildKeywords() {
   return kw;
 }
 
+function reservedKeywords($) {
+  return Object.keys(buildKeywords()).map((k) => $[k]);
+}
+
 const Preprocessor = {
   preprocessor: ($) => {
     const region = [
@@ -180,6 +184,9 @@ module.exports = grammar({
 
   word: ($) => $.identifier,
 
+  reserved: {
+    global: ($) => reservedKeywords($),
+  },
   rules: {
     source_file: ($) => repeat($._definition),
 
@@ -258,7 +265,8 @@ module.exports = grammar({
         $.await_statement
       ),
 
-    call_statement: ($) => seq(choice($.method_call, $.call_expression), optional(";")),
+    call_statement: ($) =>
+      seq(choice($.method_call, $.call_expression), optional(";")),
 
     assignment_statement: ($) =>
       seq(
@@ -444,7 +452,8 @@ module.exports = grammar({
 
     call_expression: ($) => prec(PREC.CALL - 1, $._access_call),
 
-    await_expression: ($) => prec(PREC.AWAIT, seq($.AWAIT_KEYWORD, $.expression)),
+    await_expression: ($) =>
+      prec(PREC.AWAIT, seq($.AWAIT_KEYWORD, $.expression)),
 
     _assignment_member: ($) => choice($.identifier, $.property_access),
 
@@ -463,13 +472,15 @@ module.exports = grammar({
         )
       ),
     _access_call: ($) => seq($.access, ".", $.method_call),
-    _access_index: ($) =>
-      seq($.access, "[", alias($.expression, $.index), "]"),
+    _access_index: ($) => seq($.access, "[", alias($.expression, $.index), "]"),
     _access_property: ($) =>
       seq($.access, ".", alias($.identifier, $.property)),
 
     method_call: ($) =>
-      prec(PREC.CALL, seq(field("name", $.identifier), field("arguments", $.arguments))),
+      prec(
+        PREC.CALL,
+        seq(field("name", $.identifier), field("arguments", $.arguments))
+      ),
 
     arguments: ($) => seq("(", sepBy(",", $.expression), ")"),
 
@@ -486,7 +497,6 @@ module.exports = grammar({
         $.boolean,
         $.UNDEFINED_KEYWORD,
         $.NULL_KEYWORD
-        //TODO Date
       ),
 
     boolean: ($) => choice($.TRUE_KEYWORD, $.FALSE_KEYWORD),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-bsl",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "1C (BSL) language",
   "repository": "https://github.com/tree-sitter/tree-sitter-bsl",
   "license": "MIT",

package/src/grammar.json

@@ -1561,7 +1561,7 @@
     },
     "call_expression": {
       "type": "PREC",
-      "value": 16,
+      "value": 17,
       "content": {
         "type": "SYMBOL",
         "name": "_access_call"
@@ -1599,7 +1599,7 @@
     },
     "property_access": {
       "type": "PREC",
-      "value": 18,
+      "value": 17,
       "content": {
         "type": "CHOICE",
         "members": [
@@ -1710,7 +1710,7 @@
     },
     "method_call": {
       "type": "PREC",
-      "value": 17,
+      "value": 18,
       "content": {
         "type": "SEQ",
         "members": [
@@ -3320,5 +3320,192 @@
   "supertypes": [
     "statement"
   ],
-  "reserved": {}
+  "reserved": {
+    "global": [
+      {
+        "type": "SYMBOL",
+        "name": "IF_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "THEN_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "ELSIF_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "ELSE_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "ENDIF_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "FOR_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "EACH_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "IN_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "TO_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "WHILE_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "DO_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "ENDDO_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "GOTO_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "RETURN_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "BREAK_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "CONTINUE_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "PROCEDURE_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "FUNCTION_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "ENDPROCEDURE_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "ENDFUNCTION_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "VAR_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "EXPORT_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "VAL_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "TRUE_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "FALSE_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "UNDEFINED_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "TRY_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "EXCEPT_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "RAISE_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "ENDTRY_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "ASYNC_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "AWAIT_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "NEW_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "EXECUTE_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "ADDHANDLER_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "REMOVEHANDLER_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "AND_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "OR_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "NOT_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "PREPROC_IF_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "PREPROC_ELSIF_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "PREPROC_ELSE_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "PREPROC_ENDIF_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "PREPROC_REGION_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "PREPROC_ENDREGION_KEYWORD"
+      },
+      {
+        "type": "SYMBOL",
+        "name": "NULL_KEYWORD"
+      }
+    ]
+  }
 }