Split elseif_clause

Author: inaki-amatria

grammar.js

@@ -90,7 +90,6 @@ module.exports = grammar({
     [$.data_statement, $.identifier],
     [$.data_value, $._expression],
     [$.else_clause],
-    [$.elseif_clause],
     [$.elsewhere_clause],
     [$.intrinsic_type],
     [$._intrinsic_type, $.identifier],
@@ -104,6 +103,7 @@ module.exports = grammar({
     [$._preproc_expression, $._expression],
     [$.coarray_critical_statement, $.identifier],
     [$.block_if_clause],
+    [$.block_elseif_clause],
   ],
 
   rules: {
@@ -1339,7 +1339,7 @@ module.exports = grammar({
 
     block_if_statement: $ => seq(
       $.block_if_clause,
-      repeat($.elseif_clause),
+      repeat($.block_elseif_clause),
       optional($.else_clause),
       optional($.statement_label),
       $.end_if_statement
@@ -1364,13 +1364,17 @@ module.exports = grammar({
       optional($._block_label)
     ),
 
+    block_elseif_clause: $ => seq(
+      $.elseif_clause,
+      $.end_of_statement,
+      repeat($._statement),
+    ),
+
     elseif_clause: $ => seq(
       whiteSpacedKeyword('else', 'if'),
       $._parenthesized_expression,
       caseInsensitive('then'),
       optional($._block_label),
-      $.end_of_statement,
-      repeat($._statement)
     ),
 
     else_clause: $ => seq(

src/grammar.json

@@ -14671,7 +14671,7 @@
           "type": "REPEAT",
           "content": {
             "type": "SYMBOL",
-            "name": "elseif_clause"
+            "name": "block_elseif_clause"
           }
         },
         {
@@ -14819,6 +14819,26 @@
         }
       ]
     },
+    "block_elseif_clause": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "elseif_clause"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "end_of_statement"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_statement"
+          }
+        }
+      ]
+    },
     "elseif_clause": {
       "type": "SEQ",
       "members": [
@@ -14873,17 +14893,6 @@
               "type": "BLANK"
             }
           ]
-        },
-        {
-          "type": "SYMBOL",
-          "name": "end_of_statement"
-        },
-        {
-          "type": "REPEAT",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_statement"
-          }
         }
       ]
     },
@@ -20747,9 +20756,6 @@
     [
       "else_clause"
     ],
-    [
-      "elseif_clause"
-    ],
     [
       "elsewhere_clause"
     ],
@@ -20795,6 +20801,9 @@
     ],
     [
       "block_if_clause"
+    ],
+    [
+      "block_elseif_clause"
     ]
   ],
   "precedences": [],