Fix if statements.

src/parser/ast.yaml

@@ -349,27 +349,15 @@ ExpressionStatement:
     - expression
 IfStatement:
   children:
-    - if_kw:
+    - if_clause
-        rule: If
-        skip: true
-    - expression
-    - then_kw:
-        rule: Then
-        skip: true
-    - statements:
-        rule: Statement
-        vec: true
-    - end_kw:
-        rule: End
-        skip: true
-IfElseStatement:
-  children:
-    - if_else_first
     - if_else_ifs:
         rule: IfElseIf
         vec: true
-    - if_else_else
+    - if_else
-IfElseFirst:
+    - end_kw:
+        rule: End
+        skip: true
+IfClause:
   children:
     - if_kw:
         rule: If
@@ -386,17 +374,8 @@ IfElseIf:
     - else_kw:
         rule: Else
         skip: true
-    - if_kw:
+    - if_clause
-        rule: If
+IfElse:
-        skip: true
-    - expression
-    - then_kw:
-        rule: Then
-        skip: true
-    - statements:
-        rule: Statement
-        vec: true
-IfElseElse:
   children:
     - else_kw:
         rule: Else
@@ -404,9 +383,6 @@ IfElseElse:
     - statements:
         rule: Statement
         vec: true
-    - end_kw:
-        rule: End
-        skip: true
 WhileStatement:
   children:
     - while_kw:

src/parser/deimos.pest

@@ -546,7 +546,6 @@ Statement = {
     | AssignmentStatement
     | ExpressionStatement
     | UseStatement
-    | IfElseStatement
     | IfStatement
     | WhileStatement
     | ForStatement
@@ -571,20 +570,13 @@ ExpressionStatement = {
 }
 
 IfStatement = {
-      If
+      IfClause
-    ~ Expression
+    ~ IfElseIf*
-    ~ Then
+    ~ IfElse?
-    ~ Statement*
     ~ End
 }
 
-IfElseStatement = {
+IfClause = {
-      IfElseFirst
-    ~ IfElseIf*
-    ~ IfElseElse
-}
-
-IfElseFirst = {
       If
     ~ Expression
     ~ Then
@@ -593,16 +585,12 @@ IfElseFirst = {
 
 IfElseIf = {
       Else
-    ~ If
+    ~ IfClause
-    ~ Expression
-    ~ Then
-    ~ Statement*
 }
 
-IfElseElse = {
+IfElse = {
       Else
     ~ Statement*
-    ~ End
 }
 
 WhileStatement = {