parser: fix logical operator quirks with external scanner

Fixes #28, not sure if it's the right way with external scanner but it's definitely better than the ugly operator variant
usagi-coffee · Feb 23, 2024 · 04254df · 04254df
1 parent 580f9b3
commit 04254df
Show file tree

Hide file tree

Showing 5 changed files with 86,731 additions and 90,421 deletions.
diff --git a/grammar.js b/grammar.js
@@ -21,7 +21,7 @@ function kw(keyword) {
 module.exports = grammar({
   name: "abl",
 
-  externals: ($) => [$._namedot, $._namecolon],
+  externals: ($) => [$._namedot, $._namecolon, $._or_operator, $._and_operator],
   extras: ($) => [$.comment, $.include, /[\s\f\uFEFF\u2060\u200B]|\\\r?\n/],
   word: ($) => $.identifier,
   supertypes: ($) => [$._expression, $._statement, $._terminated_statement],
@@ -92,10 +92,7 @@ module.exports = grammar({
 
     _logical_operator: ($) =>
       prec.left(
-        choice(
-          choice(kw(" AND "), kw(" AND\n"), kw(" AND\r\n")),
-          choice(kw(" OR "), kw(" OR\n"), kw(" OR\r\n"))
-        )
+        choice(alias($._and_operator, "AND"), alias($._or_operator, "OR"))
       ),
     logical_expression: ($) =>
       prec.right(

diff --git a/src/grammar.json b/src/grammar.json
@@ -377,110 +377,22 @@
         "type": "CHOICE",
         "members": [
           {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "ALIAS",
-                "content": {
-                  "type": "TOKEN",
-                  "content": {
-                    "type": "PREC",
-                    "value": 1,
-                    "content": {
-                      "type": "PATTERN",
-                      "value": "[  ][aA][nN][dD][  ]"
-                    }
-                  }
-                },
-                "named": false,
-                "value": " AND "
-              },
-              {
-                "type": "ALIAS",
-                "content": {
-                  "type": "TOKEN",
-                  "content": {
-                    "type": "PREC",
-                    "value": 1,
-                    "content": {
-                      "type": "PATTERN",
-                      "value": "[  ][aA][nN][dD][\\n\\n]"
-                    }
-                  }
-                },
-                "named": false,
-                "value": " AND\n"
-              },
-              {
-                "type": "ALIAS",
-                "content": {
-                  "type": "TOKEN",
-                  "content": {
-                    "type": "PREC",
-                    "value": 1,
-                    "content": {
-                      "type": "PATTERN",
-                      "value": "[  ][aA][nN][dD][\\r\\r][\\n\\n]"
-                    }
-                  }
-                },
-                "named": false,
-                "value": " AND\r\n"
-              }
-            ]
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_and_operator"
+            },
+            "named": false,
+            "value": "AND"
           },
           {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "ALIAS",
-                "content": {
-                  "type": "TOKEN",
-                  "content": {
-                    "type": "PREC",
-                    "value": 1,
-                    "content": {
-                      "type": "PATTERN",
-                      "value": "[  ][oO][rR][  ]"
-                    }
-                  }
-                },
-                "named": false,
-                "value": " OR "
-              },
-              {
-                "type": "ALIAS",
-                "content": {
-                  "type": "TOKEN",
-                  "content": {
-                    "type": "PREC",
-                    "value": 1,
-                    "content": {
-                      "type": "PATTERN",
-                      "value": "[  ][oO][rR][\\n\\n]"
-                    }
-                  }
-                },
-                "named": false,
-                "value": " OR\n"
-              },
-              {
-                "type": "ALIAS",
-                "content": {
-                  "type": "TOKEN",
-                  "content": {
-                    "type": "PREC",
-                    "value": 1,
-                    "content": {
-                      "type": "PATTERN",
-                      "value": "[  ][oO][rR][\\r\\r][\\n\\n]"
-                    }
-                  }
-                },
-                "named": false,
-                "value": " OR\r\n"
-              }
-            ]
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_or_operator"
+            },
+            "named": false,
+            "value": "OR"
           }
         ]
       }
@@ -11607,6 +11519,14 @@
     {
       "type": "SYMBOL",
       "name": "_namecolon"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "_or_operator"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "_and_operator"
     }
   ],
   "inline": [],

diff --git a/src/node-types.json b/src/node-types.json
@@ -3119,30 +3119,6 @@
     "type": " ",
     "named": false
   },
-  {
-    "type": " AND\n",
-    "named": false
-  },
-  {
-    "type": " AND\r\n",
-    "named": false
-  },
-  {
-    "type": " AND ",
-    "named": false
-  },
-  {
-    "type": " OR\n",
-    "named": false
-  },
-  {
-    "type": " OR\r\n",
-    "named": false
-  },
-  {
-    "type": " OR ",
-    "named": false
-  },
   {
     "type": "\"",
     "named": false
@@ -3731,6 +3707,10 @@
     "type": "ON",
     "named": false
   },
+  {
+    "type": "OR",
+    "named": false
+  },
   {
     "type": "OTHERWISE",
     "named": false