tree-sitter-batch 0.3.2 → 0.4.2

package/README.md

@@ -48,8 +48,10 @@ Parsed tree:
   (echo_off)
   (comment)
   (setlocal_stmt)
-  (variable_assignment)
-  (variable_assignment)
+  (variable_assignment
+    (set_keyword) (variable_name) (assignment_value))
+  (variable_assignment
+    (set_keyword) (set_option) (variable_name) (assignment_value))
   (if_stmt
     (string)
     (parenthesized

package/grammar.js

@@ -1,5 +1,6 @@
 const ci = (word) => new RegExp(word.split('').map((c) => /[a-zA-Z]/.test(c) ? `[${c.toLowerCase()}${c.toUpperCase()}]` : c).join(''));
 const kw = (word) => token(prec(10, ci(word)));
+const operand = ($) => [$.cond_exec, $.pipe_stmt, $.cmd, $.parenthesized];
 
 export default grammar({
   name: 'batch',
@@ -11,7 +12,7 @@ export default grammar({
       $.echo_off, $.comment, $.label, $.variable_assignment,
       $.if_stmt, $.goto_stmt, $.call_stmt, $.exit_stmt,
       $.setlocal_stmt, $.endlocal_stmt, $.for_stmt,
-      $.redirect_stmt, $.pipe_stmt, $.cond_exec,
+      $.redirect_stmt, $.pipe_stmt, $.cond_exec, $.command_sep,
       $.parenthesized, $.cmd,
     ),
     echo_off: () => prec(10, seq('@', kw('echo'), choice(kw('off'), kw('on')))),
@@ -20,12 +21,13 @@ export default grammar({
       seq('::', /[^\r\n]*/),
     ))),
     label: () => token(seq(':', /[a-zA-Z_][a-zA-Z0-9_-]*/)),
-    variable_assignment: () => prec(8, seq(
-      optional('@'), kw('set'),
-      optional(seq(/[ \t]+/, /\/[aApP]/)), /[ \t]+/,
+    variable_assignment: ($) => prec(8, seq(
+      optional('@'), alias(kw('set'), $.set_keyword),
+      optional(seq(/[ \t]+/, alias(/\/[aApP]/, $.set_option))),
+      /[ \t]+/,
       choice(
-        seq('"', /[a-zA-Z_][a-zA-Z0-9_]*/, '=', optional(/[^"\r\n]*/), '"'),
-        seq(/[a-zA-Z_][a-zA-Z0-9_]*/, '=', optional(/[^\r\n]*/)),
+        seq('"', alias(/[a-zA-Z_][a-zA-Z0-9_]*/, $.variable_name), '=', optional(alias(/[^"\r\n]+/, $.assignment_value)), '"'),
+        seq(alias(/[a-zA-Z_][a-zA-Z0-9_]*/, $.variable_name), '=', optional(alias(/[^\r\n]+/, $.assignment_value))),
       ),
     )),
     if_stmt: ($) => prec.right(8, seq(
@@ -84,7 +86,7 @@ export default grammar({
     for_options: () => token(prec(10, choice(ci('/d'), seq(ci('/r'), optional(seq(/[ \t]+/, /[^\s]+/))), ci('/l'), seq(ci('/f'), optional(seq(/[ \t]+/, '"', /[^"]*/, '"')))))),
     for_variable: () => token(seq('%%', optional('~'), /[a-zA-Z]/)),
     for_set: () => /[^)\r\n]+/,
-    parenthesized: ($) => seq('(', repeat(choice(seq($._stmt, /\r?\n/), /\r?\n/)), ')'),
+    parenthesized: ($) => seq('(', repeat(choice(seq($._stmt, /\r?\n/), /\r?\n/)), optional($._stmt), ')'),
     redirect_stmt: ($) => prec.right(4, seq(choice($.cmd, $.parenthesized), $.redirection)),
     redirection: ($) => prec.right(seq(
       optional(/[0-2]/), $.redirect_op, $.redirect_target,
@@ -94,9 +96,14 @@ export default grammar({
     redirect_target: () => token(choice(ci('nul'), ci('con'), /[^\s|&><\r\n]+/)),
     pipe_stmt: ($) => prec.left(3, seq(choice($.cmd, $.parenthesized), '|', choice($.cmd, $.parenthesized))),
     cond_exec: ($) => choice(
-      prec.left(2, seq(choice($.cmd, $.parenthesized), '&&', choice($.cmd, $.parenthesized))),
-      prec.left(1, seq(choice($.cmd, $.parenthesized), '||', choice($.cmd, $.parenthesized))),
+      prec.left(1, seq(choice(...operand($)), '&&', choice($.cmd, $.parenthesized))),
+      prec.left(1, seq(choice(...operand($)), '||', choice($.cmd, $.parenthesized))),
     ),
+    command_sep: ($) => prec.left(0, seq(
+      choice($.command_sep, ...operand($)),
+      '&',
+      choice(...operand($)),
+    )),
     variable_reference: () => token(choice(
       seq('%', /[a-zA-Z_][a-zA-Z0-9_]*/, '%'),
       seq('%~', /[a-zA-Z]*/, /[0-9]/),
@@ -109,9 +116,10 @@ export default grammar({
     cmd: ($) => prec.right(5, seq(optional('@'), $.command_name, optional($.argument_list))),
     command_name: () => /[a-zA-Z_][a-zA-Z0-9_.-]*/,
     argument_list: ($) => prec.right(repeat1($._arg)),
-    _arg: ($) => choice($.string, $.variable_reference, $.command_option, $.argument_value),
+    _arg: ($) => choice($.string, $.variable_reference, $.command_option, $.paren_expression, $.argument_value),
     command_option: () => token(seq('/', /[a-zA-Z_?][a-zA-Z0-9_:]*/)),
-    argument_value: () => /[^\s|&><"\r\n%!][^\s|&><"\r\n]*/,
+    paren_expression: ($) => seq('(', repeat($._arg), ')'),
+    argument_value: () => /(?:\^[&|<>^()]|[^\s|&><"\r\n%!()])(?:\^[&|<>^()]|[^\s|&><"\r\n()])*/,
     integer: () => /[0-9]+/,
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-batch",
-  "version": "0.3.2",
+  "version": "0.4.2",
   "description": "A Windows Batch/CMD grammar for tree-sitter",
   "type": "module",
   "repository": {

package/queries/highlights.scm

@@ -8,7 +8,10 @@
 (label) @label
 
 ; Variable assignment
-(variable_assignment) @variable
+(set_keyword) @keyword
+(variable_name) @variable
+(set_option) @constant
+(assignment_value) @string
 
 ; IF/FOR/GOTO/CALL statements
 (if_stmt) @keyword

package/src/grammar.json

@@ -87,6 +87,10 @@
           "type": "SYMBOL",
           "name": "cond_exec"
         },
+        {
+          "type": "SYMBOL",
+          "name": "command_sep"
+        },
         {
           "type": "SYMBOL",
           "name": "parenthesized"
@@ -250,15 +254,20 @@
             ]
           },
           {
-            "type": "TOKEN",
+            "type": "ALIAS",
             "content": {
-              "type": "PREC",
-              "value": 10,
+              "type": "TOKEN",
               "content": {
-                "type": "PATTERN",
-                "value": "[sS][eE][tT]"
+                "type": "PREC",
+                "value": 10,
+                "content": {
+                  "type": "PATTERN",
+                  "value": "[sS][eE][tT]"
+                }
               }
-            }
+            },
+            "named": true,
+            "value": "set_keyword"
           },
           {
             "type": "CHOICE",
@@ -271,8 +280,13 @@
                     "value": "[ \\t]+"
                   },
                   {
-                    "type": "PATTERN",
-                    "value": "\\/[aApP]"
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "PATTERN",
+                      "value": "\\/[aApP]"
+                    },
+                    "named": true,
+                    "value": "set_option"
                   }
                 ]
               },
@@ -296,8 +310,13 @@
                     "value": "\""
                   },
                   {
-                    "type": "PATTERN",
-                    "value": "[a-zA-Z_][a-zA-Z0-9_]*"
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "PATTERN",
+                      "value": "[a-zA-Z_][a-zA-Z0-9_]*"
+                    },
+                    "named": true,
+                    "value": "variable_name"
                   },
                   {
                     "type": "STRING",
@@ -307,8 +326,13 @@
                     "type": "CHOICE",
                     "members": [
                       {
-                        "type": "PATTERN",
-                        "value": "[^\"\\r\\n]*"
+                        "type": "ALIAS",
+                        "content": {
+                          "type": "PATTERN",
+                          "value": "[^\"\\r\\n]+"
+                        },
+                        "named": true,
+                        "value": "assignment_value"
                       },
                       {
                         "type": "BLANK"
@@ -325,8 +349,13 @@
                 "type": "SEQ",
                 "members": [
                   {
-                    "type": "PATTERN",
-                    "value": "[a-zA-Z_][a-zA-Z0-9_]*"
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "PATTERN",
+                      "value": "[a-zA-Z_][a-zA-Z0-9_]*"
+                    },
+                    "named": true,
+                    "value": "variable_name"
                   },
                   {
                     "type": "STRING",
@@ -336,8 +365,13 @@
                     "type": "CHOICE",
                     "members": [
                       {
-                        "type": "PATTERN",
-                        "value": "[^\\r\\n]*"
+                        "type": "ALIAS",
+                        "content": {
+                          "type": "PATTERN",
+                          "value": "[^\\r\\n]+"
+                        },
+                        "named": true,
+                        "value": "assignment_value"
                       },
                       {
                         "type": "BLANK"
@@ -1228,6 +1262,18 @@
             ]
           }
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_stmt"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "STRING",
           "value": ")"
@@ -1422,13 +1468,21 @@
       "members": [
         {
           "type": "PREC_LEFT",
-          "value": 2,
+          "value": 1,
           "content": {
             "type": "SEQ",
             "members": [
               {
                 "type": "CHOICE",
                 "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "cond_exec"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "pipe_stmt"
+                  },
                   {
                     "type": "SYMBOL",
                     "name": "cmd"
@@ -1468,6 +1522,14 @@
               {
                 "type": "CHOICE",
                 "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "cond_exec"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "pipe_stmt"
+                  },
                   {
                     "type": "SYMBOL",
                     "name": "cmd"
@@ -1500,6 +1562,65 @@
         }
       ]
     },
+    "command_sep": {
+      "type": "PREC_LEFT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "command_sep"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "cond_exec"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "pipe_stmt"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "cmd"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "parenthesized"
+              }
+            ]
+          },
+          {
+            "type": "STRING",
+            "value": "&"
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "cond_exec"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "pipe_stmt"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "cmd"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "parenthesized"
+              }
+            ]
+          }
+        ]
+      }
+    },
     "variable_reference": {
       "type": "TOKEN",
       "content": {
@@ -1709,6 +1830,10 @@
           "type": "SYMBOL",
           "name": "command_option"
         },
+        {
+          "type": "SYMBOL",
+          "name": "paren_expression"
+        },
         {
           "type": "SYMBOL",
           "name": "argument_value"
@@ -1731,9 +1856,29 @@
         ]
       }
     },
+    "paren_expression": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_arg"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
     "argument_value": {
       "type": "PATTERN",
-      "value": "[^\\s|&><\"\\r\\n%!][^\\s|&><\"\\r\\n]*"
+      "value": "(?:\\^[&|<>^()]|[^\\s|&><\"\\r\\n%!()])(?:\\^[&|<>^()]|[^\\s|&><\"\\r\\n()])*"
     },
     "integer": {
       "type": "PATTERN",

package/src/node-types.json

@@ -15,6 +15,10 @@
           "type": "command_option",
           "named": true
         },
+        {
+          "type": "paren_expression",
+          "named": true
+        },
         {
           "type": "string",
           "named": true
@@ -64,6 +68,37 @@
       ]
     }
   },
+  {
+    "type": "command_sep",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "cmd",
+          "named": true
+        },
+        {
+          "type": "command_sep",
+          "named": true
+        },
+        {
+          "type": "cond_exec",
+          "named": true
+        },
+        {
+          "type": "parenthesized",
+          "named": true
+        },
+        {
+          "type": "pipe_stmt",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "cond_exec",
     "named": true,
@@ -76,9 +111,17 @@
           "type": "cmd",
           "named": true
         },
+        {
+          "type": "cond_exec",
+          "named": true
+        },
         {
           "type": "parenthesized",
           "named": true
+        },
+        {
+          "type": "pipe_stmt",
+          "named": true
         }
       ]
     }
@@ -211,6 +254,37 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "paren_expression",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "argument_value",
+          "named": true
+        },
+        {
+          "type": "command_option",
+          "named": true
+        },
+        {
+          "type": "paren_expression",
+          "named": true
+        },
+        {
+          "type": "string",
+          "named": true
+        },
+        {
+          "type": "variable_reference",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "parenthesized",
     "named": true,
@@ -227,6 +301,10 @@
           "type": "cmd",
           "named": true
         },
+        {
+          "type": "command_sep",
+          "named": true
+        },
         {
           "type": "comment",
           "named": true
@@ -322,6 +400,10 @@
           "type": "cmd",
           "named": true
         },
+        {
+          "type": "command_sep",
+          "named": true
+        },
         {
           "type": "comment",
           "named": true
@@ -431,12 +513,38 @@
   {
     "type": "variable_assignment",
     "named": true,
-    "fields": {}
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "assignment_value",
+          "named": true
+        },
+        {
+          "type": "set_keyword",
+          "named": true
+        },
+        {
+          "type": "set_option",
+          "named": true
+        },
+        {
+          "type": "variable_name",
+          "named": true
+        }
+      ]
+    }
   },
   {
     "type": "\"",
     "named": false
   },
+  {
+    "type": "&",
+    "named": false
+  },
   {
     "type": "&&",
     "named": false
@@ -461,6 +569,10 @@
     "type": "argument_value",
     "named": true
   },
+  {
+    "type": "assignment_value",
+    "named": true
+  },
   {
     "type": "command_name",
     "named": true
@@ -501,10 +613,22 @@
     "type": "redirect_target",
     "named": true
   },
+  {
+    "type": "set_keyword",
+    "named": true
+  },
+  {
+    "type": "set_option",
+    "named": true
+  },
   {
     "type": "string",
     "named": true
   },
+  {
+    "type": "variable_name",
+    "named": true
+  },
   {
     "type": "variable_reference",
     "named": true