Revert "Restructure language grammar"

This reverts commit 6ed376335b.

corpus/control_flow.txt

@@ -92,6 +92,7 @@ else if 4 == 9
             (expression
               (value
                 (integer)))
+            (logic_operator)
             (expression
               (value
                 (integer)))))
@@ -104,6 +105,7 @@ else if 4 == 9
             (expression
               (value
                 (integer)))
+            (logic_operator)
             (expression
               (value
                 (integer)))))

corpus/operators.txt

@@ -14,6 +14,7 @@ Simple Equality
           (expression
             (value
               (integer)))
+          (logic_operator)
           (expression
             (value
               (integer))))))))
@@ -38,12 +39,15 @@ Complex Equality
                   (expression
                     (value
                       (integer)))
+                  (math_operator)
                   (expression
                     (value
                       (integer)))))
+              (math_operator)
               (expression
                 (value
                   (integer)))))
+          (logic_operator)
           (expression
             (value
               (integer))))))))

corpus/tables.txt

@@ -66,6 +66,7 @@ select number from foobar where text == 'answer'
           (logic
             (expression
               (identifier))
+            (logic_operator)
             (expression
               (value
                 (string)))))))))

corpus/yield.txt

@@ -33,6 +33,7 @@ Complex Yield
             (expression
               (value
                 (integer)))
+            (math_operator)
             (expression
               (value
                 (integer)))))

grammar.js

@@ -95,11 +95,11 @@ module.exports = grammar({
 
     math: $ => prec.left(seq(
       $.expression,
-      $._math_operator,
+      $.math_operator,
       $.expression,
     )),
 
-    _math_operator: $ => choice(
+    math_operator: $ => choice(
       '+',
       '-',
       '*',
@@ -109,11 +109,11 @@ module.exports = grammar({
 
     logic: $ => prec.left(seq(
       $.expression,
-      $._logic_operator,
+      $.logic_operator,
       $.expression,
     )),
 
-    _logic_operator: $ => choice(
+    logic_operator: $ => choice(
       '==',
       '!=',
       '&&',

src/grammar.json

@@ -424,7 +424,7 @@
           },
           {
             "type": "SYMBOL",
-            "name": "_math_operator"
+            "name": "math_operator"
           },
           {
             "type": "SYMBOL",
@@ -433,7 +433,7 @@
         ]
       }
     },
-    "_math_operator": {
+    "math_operator": {
       "type": "CHOICE",
       "members": [
         {
@@ -470,7 +470,7 @@
           },
           {
             "type": "SYMBOL",
-            "name": "_logic_operator"
+            "name": "logic_operator"
           },
           {
             "type": "SYMBOL",
@@ -479,7 +479,7 @@
         ]
       }
     },
-    "_logic_operator": {
+    "logic_operator": {
       "type": "CHOICE",
       "members": [
         {

src/node-types.json

@@ -203,10 +203,19 @@
         {
           "type": "expression",
           "named": true
+        },
+        {
+          "type": "logic_operator",
+          "named": true
         }
       ]
     }
   },
+  {
+    "type": "logic_operator",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "loop",
     "named": true,
@@ -275,10 +284,19 @@
         {
           "type": "expression",
           "named": true
+        },
+        {
+          "type": "math_operator",
+          "named": true
         }
       ]
     }
   },
+  {
+    "type": "math_operator",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "root",
     "named": true,