Merge pull request #115 from antoinemadec/master

feat: add else_clause

grammar.js

@@ -660,12 +660,11 @@ module.exports = grammar({
       'if',
       field('condition', $.parenthesized_expression),
       field('consequence', $._statement),
-      optional(seq(
-        'else',
-        field('alternative', $._statement),
-      )),
+      optional(field('alternative', $.else_clause)),
     )),
 
+    else_clause: $ => seq('else', $._statement),
+
     switch_statement: $ => seq(
       'switch',
       field('condition', $.parenthesized_expression),

src/grammar.json

@@ -3998,21 +3998,12 @@
             "type": "CHOICE",
             "members": [
               {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": "else"
-                  },
-                  {
-                    "type": "FIELD",
-                    "name": "alternative",
-                    "content": {
-                      "type": "SYMBOL",
-                      "name": "_statement"
-                    }
-                  }
-                ]
+                "type": "FIELD",
+                "name": "alternative",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "else_clause"
+                }
               },
               {
                 "type": "BLANK"
@@ -4022,6 +4013,19 @@
         ]
       }
     },
+    "else_clause": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "else"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_statement"
+        }
+      ]
+    },
     "switch_statement": {
       "type": "SEQ",
       "members": [

src/node-types.json

@@ -1292,6 +1292,21 @@
       }
     }
   },
+  {
+    "type": "else_clause",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "_statement",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "enum_specifier",
     "named": true,
@@ -1961,7 +1976,7 @@
         "required": false,
         "types": [
           {
-            "type": "_statement",
+            "type": "else_clause",
             "named": true
           }
         ]

test/corpus/statements.txt

@@ -34,9 +34,10 @@ int main() {
         (compound_statement
           (expression_statement
             (number_literal)))
-        (compound_statement
-          (expression_statement
-            (number_literal)))))))
+        (else_clause
+          (compound_statement
+            (expression_statement
+              (number_literal))))))))
 
 ================================================================================
 For loops
@@ -518,11 +519,12 @@ void f() {
             (attribute
               (identifier)))
           (compound_statement))
-        (attributed_statement
-          (attribute_declaration
-            (attribute
-              (identifier)))
-          (compound_statement)))
+        (else_clause
+          (attributed_statement
+            (attribute_declaration
+              (attribute
+                (identifier)))
+            (compound_statement))))
       (do_statement
         (attributed_statement
           (attribute_declaration