parser(fix): if statements

Jaredanwolfgang · Dec 4, 2024 · fd7cefb · fd7cefb
1 parent 16c75e3
commit fd7cefb
Showing 1 changed file with 49 additions and 30 deletions.
diff --git a/src/parser/src/grammar.lalrpop b/src/parser/src/grammar.lalrpop
@@ -164,7 +164,55 @@ pub Body: tree::Body = {
 }
 
 Expr: tree::Expr = {
-    <expr:IfExpr> => expr,
+    <expr:OpenExpr> => expr,
+    <expr:CloseExpr> => expr,
+}
+
+OpenExpr: tree::Expr = {
+    "if" "(" <cond:CondExpr> ")" <body:Expr> => {
+        let body = match body {
+            tree::Expr::Body(body) => body,
+            _ => tree::Body::Body(vec![body])
+        };
+        tree::Expr::If(tree::If::IfExpr(cond, body))
+    },
+    "if" "(" <cond:CondExpr> ")" <body:CloseExpr> "else" <body_2:OpenExpr> => {
+        let body = match body {
+            tree::Expr::Body(body) => body,
+            _ => tree::Body::Body(vec![body])
+        };
+        let body_2 = match body_2 {
+            tree::Expr::Body(body) => body,
+            _ => tree::Body::Body(vec![body_2])
+        };
+        tree::Expr::If(
+            tree::If::IfElseExpr(
+                cond,
+                body,
+                body_2
+            )
+        )
+    },
+}
+
+CloseExpr: tree::Expr = {
+    "if" "(" <cond:CondExpr> ")" <body:CloseExpr> "else" <body_2:CloseExpr> => {
+        let body = match body {
+            tree::Expr::Body(body) => body,
+            _ => tree::Body::Body(vec![body])
+        };
+        let body_2 = match body_2 {
+            tree::Expr::Body(body) => body,
+            _ => tree::Body::Body(vec![body_2])
+        };
+        tree::Expr::If(
+            tree::If::IfElseExpr(
+                cond,
+                body,
+                body_2
+            )
+        )
+    },
     <expr:WhileExpr> => expr,
     <expr:ForExpr> => expr,
     <expr:FuncCall> => expr,
@@ -196,35 +244,6 @@ Expr: tree::Expr = {
     }
 }
 
-IfExpr: tree::Expr = {
-    "if" "(" <cond:CondExpr> ")" <body:Expr>  => {
-        match body {
-            tree::Expr::Body(body) => {
-                tree::Expr::If(
-                    tree::If::IfExpr(
-                        cond,
-                        body
-                    )
-                )
-            },
-            _ => {
-                tree::Expr::If(
-                    tree::If::IfExpr(cond, tree::Body::Body(vec![body]))
-                )
-            }
-        }
-    },
-    "if" "(" <cond:CondExpr> ")" "{" <body:Body> "}" "else" "{" <body_2:Body> "}" => {
-        tree::Expr::If(
-            tree::If::IfElseExpr(
-                cond,
-                body, 
-                body_2
-            )
-        )
-    }
-}
-
 WhileExpr: tree::Expr = {
     "while" "(" <cond:CondExpr> ")" "{" <body:Body> "}" => {
         tree::Expr::Loop(