Make the semicolon queryable (#135)

* make semicolon queryable * regenerate parser * add tests * use SEMICOLON instead of repeating the semicolon literal everywhere
tree-sitter · Nov 12, 2021 · 24b530c · 24b530c
1 parent 8600d7f
commit 24b530c
Show file tree

Hide file tree

Showing 5 changed files with 955 additions and 945 deletions.
diff --git a/grammar.js b/grammar.js
@@ -22,6 +22,8 @@ const PREC = {
   call: 20,
 }
 
+const SEMICOLON = ';'
+
 module.exports = grammar({
   name: 'python',
 
@@ -78,12 +80,8 @@ module.exports = grammar({
     // Simple statements
 
     _simple_statements: $ => seq(
-      $._simple_statement,
-      optional(repeat(seq(
-        $._semicolon,
-        $._simple_statement
-      ))),
-      optional($._semicolon),
+      sep1($._simple_statement, SEMICOLON),
+      optional(SEMICOLON),
       $._newline
     ),
 
@@ -968,8 +966,6 @@ module.exports = grammar({
     )),
 
     comment: $ => token(seq('#', /.*/)),
-
-    _semicolon: $ => ';'
   }
 })
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -26,39 +26,36 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "_simple_statement"
-        },
-        {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_simple_statement"
+            },
             {
               "type": "REPEAT",
               "content": {
                 "type": "SEQ",
                 "members": [
                   {
-                    "type": "SYMBOL",
-                    "name": "_semicolon"
+                    "type": "STRING",
+                    "value": ";"
                   },
                   {
                     "type": "SYMBOL",
                     "name": "_simple_statement"
                   }
                 ]
               }
-            },
-            {
-              "type": "BLANK"
             }
           ]
         },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "_semicolon"
+              "type": "STRING",
+              "value": ";"
             },
             {
               "type": "BLANK"
@@ -4885,10 +4882,6 @@
           }
         ]
       }
-    },
-    "_semicolon": {
-      "type": "STRING",
-      "value": ";"
     }
   },
   "extras": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -2611,6 +2611,10 @@
     "type": ":=",
     "named": false
   },
+  {
+    "type": ";",
+    "named": false
+  },
   {
     "type": "<",
     "named": false