parser: parse else if then statements

usagi-coffee · Oct 25, 2023 · 3551921 · 3551921
1 parent f0d8350
commit 3551921
Show file tree

Hide file tree

Showing 5 changed files with 17,664 additions and 16,908 deletions.
diff --git a/grammar.js b/grammar.js
@@ -326,10 +326,19 @@ module.exports = grammar({
         field("condition", $._expression),
         kw("THEN"),
         $._terminated_statement,
+        optional(repeat($.else_then_if_statement)),
         optional($.else_then_statement)
       ),
 
-    else_then_statement: ($) => seq("ELSE", $._terminated_statement),
+    else_then_if_statement: ($) =>
+      seq(
+        kw("ELSE"),
+        kw("IF"),
+        field("condition", $._expression),
+        kw("THEN"),
+        $._terminated_statement
+      ),
+    else_then_statement: ($) => seq(kw("ELSE"), $._terminated_statement),
 
     ternary_expression: ($) =>
       prec.right(

diff --git a/src/grammar.json b/src/grammar.json
@@ -2211,6 +2211,21 @@
           "type": "SYMBOL",
           "name": "_terminated_statement"
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "else_then_if_statement"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "CHOICE",
           "members": [
@@ -2225,11 +2240,88 @@
         }
       ]
     },
+    "else_then_if_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 1,
+              "content": {
+                "type": "PATTERN",
+                "value": "[eE][lL][sS][eE]"
+              }
+            }
+          },
+          "named": false,
+          "value": "ELSE"
+        },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 1,
+              "content": {
+                "type": "PATTERN",
+                "value": "[iI][fF]"
+              }
+            }
+          },
+          "named": false,
+          "value": "IF"
+        },
+        {
+          "type": "FIELD",
+          "name": "condition",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_expression"
+          }
+        },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 1,
+              "content": {
+                "type": "PATTERN",
+                "value": "[tT][hH][eE][nN]"
+              }
+            }
+          },
+          "named": false,
+          "value": "THEN"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_terminated_statement"
+        }
+      ]
+    },
     "else_then_statement": {
       "type": "SEQ",
       "members": [
         {
-          "type": "STRING",
+          "type": "ALIAS",
+          "content": {
+            "type": "TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 1,
+              "content": {
+                "type": "PATTERN",
+                "value": "[eE][lL][sS][eE]"
+              }
+            }
+          },
+          "named": false,
           "value": "ELSE"
         },
         {

diff --git a/src/node-types.json b/src/node-types.json
@@ -859,6 +859,44 @@
       ]
     }
   },
+  {
+    "type": "else_then_if_statement",
+    "named": true,
+    "fields": {
+      "condition": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "_expression",
+            "named": true
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "abl_statement",
+          "named": true
+        },
+        {
+          "type": "function_call_statement",
+          "named": true
+        },
+        {
+          "type": "return_statement",
+          "named": true
+        },
+        {
+          "type": "variable_assignment",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "else_then_statement",
     "named": true,
@@ -1207,6 +1245,10 @@
           "type": "abl_statement",
           "named": true
         },
+        {
+          "type": "else_then_if_statement",
+          "named": true
+        },
         {
           "type": "else_then_statement",
           "named": true