Fix if parsing

corpus/declarations.sk

@@ -9,4 +9,4 @@ let basic_value = 10
 
 let calculation = (1 * 1) + (2 * (2 + 3))
 
-let calculation_with_fn fn = 1 * fn (2 * 2)
+let calculation_with_fn fn = 1 * (fn (2 * 2))

src/grammar.pest

@@ -27,13 +27,14 @@ func = { type_term ~ "->" ~ type_expr }
 type_ident = ${ #name = ident ~ #args = type_args? }
 type_args  =  { "<" ~ MLF ~ type_ident* ~ MLF ~ ">" }
 
-expr       =  { infix_expr | call_expr | term }
+expr       =  { infix_expr | call_expr | if | term }
+if         =  { "if" ~ #predicate = expr ~ "then" ~ MLF ~ #then = expr ~ (MLF ~ "else" ~ MLF ~ #else = expr)? }
 term       = _{ ident | literal | "(" ~ MLF ~ expr ~ MLF ~ ")" | block }
 call_expr  =  {
     #name = ident ~ #args = (term)+
 }
 infix_expr =  {
-    #lhs = term ~ operator ~ #rhs = expr
+    #lhs = term ~ operator ~ #rhs = (infix_expr | term)
 }
 
 operator = { "+" | "-" | "*" | "/" | "&&" | "||" | "<" | ">" | "==" | "!=" }
@@ -41,9 +42,10 @@ operator = { "+" | "-" | "*" | "/" | "&&" | "||" | "<" | ">" | "==" | "!=" }
 ident         = @{ !KEYWORD ~ ALPHABETIC ~ (ALPHABETIC | NUMBER | "_")* | quoted_indent }
 quoted_indent = _{ "`" ~ (!"`" ~ ANY)+ ~ "`" }
 
-literal = { string | number | boolean | char }
+literal = { quoted_string | number | boolean | char }
 
-string  =  { "\"" ~ (!"\"" ~ ANY)* ~ "\"" }
+quoted_string = _{ "\"" ~ string ~ "\"" }
+string        =  { (!"\"" ~ ANY)* }
 char          =  { "'" ~ !"'" ~ ANY ~ "'" }
 number        = _{ byte | float | integer }
 integer       = @{ "-"? ~ ASCII_DIGIT+ }
@@ -53,7 +55,7 @@ float   = @{
 byte          = @{ "0x" ~ ASCII_HEX_DIGIT{1, 2} | "0b" ~ ASCII_BIN_DIGIT{0, 8} }
 boolean       = @{ "true" | "false" }
 
-KEYWORD   = _{ "let" | "rec" | "enum" }
+KEYWORD   = _{ "let" | "rec" | "enum" | "if" | "then" | "else" }
 TERMINATE = _{ LF | EOI | ";" }
 MLF       = _{ (LF)* }
 LF        = _{ "\n" | "\r" }

src/test/expressions.rs

@@ -11,13 +11,11 @@ fn it_parses_addition() {
                     integer(0, 1)
                 ]),
                 operator(2, 3),
-                expr(4, 5, [
                 literal(4, 5, [
                     integer(4, 5)
                 ])
             ])
         ])
-        ])
     ]);
 }
 
@@ -45,11 +43,9 @@ fn it_parses_addition_with_variables() {
             infix_expr(0, 14, [
                 ident(0, 5),
                 operator(6, 7),
-                expr(8, 14, [
                 ident(8, 14)
             ])
         ])
-        ])
     ]);
 }
 
@@ -62,13 +58,11 @@ fn it_parses_subtraction() {
                     float(0, 3)
                 ]),
                 operator(4, 5),
-                expr(6, 9, [
                 literal(6, 9, [
                     float(6, 9)
                 ])
             ])
         ])
-        ])
     ]);
 }
 
@@ -81,21 +75,17 @@ fn it_parses_multiple_operations() {
                     integer(0, 1)
                 ]),
                 operator(2, 3),
-                expr(4, 9, [
                 infix_expr(4, 9, [
                     literal(4, 5, [
                         integer(4, 5)
                     ]),
                     operator(6, 7),
-                        expr(8, 9, [
                     literal(8, 9, [
                         integer(8, 9)
                     ])
                 ])
             ])
         ])
-            ])
-        ])
     ]);
 }
 
@@ -119,12 +109,10 @@ fn it_parses_calls() {
                             integer(7, 8)
                         ]),
                         operator(9, 10),
-                        expr(11, 12, [
                             literal(11, 12, [
                                 integer(11, 12)
                             ]),
                     ])
-                    ])
                 ]),
                 ident(14, 15)
             ])
@@ -141,13 +129,11 @@ fn it_parses_calls() {
                                 integer(7, 8)
                             ]),
                             operator(9, 10),
-                            expr(11, 12, [
                             literal(11, 12, [
                                 integer(11, 12)
                             ]),
                         ])
                     ])
-                    ])
                 ]),
                 ident(14, 15)
             ])

src/test/literals.rs

@@ -60,17 +60,17 @@ fn it_parses_bytes() {
 fn it_parses_strings() {
     parses_to!(parser: SnekParser, input: r#""Hello world""#, rule: Rule::literal, tokens: [
         literal(0, 13, [
-            string(0, 13)
+            string(1, 12)
         ])
     ]);
     parses_to!(parser: SnekParser, input: r#""""#, rule: Rule::literal, tokens: [
         literal(0, 2, [
-            string(0, 2)
+            string(1, 1)
         ])
     ]);
     parses_to!(parser: SnekParser, input: r#""\"""#, rule: Rule::literal, tokens: [
         literal(0, 3, [
-            string(0, 3)
+            string(1, 2)
         ])
     ]);
 }

src/test/statements.rs

@@ -29,6 +29,13 @@ fn it_parses_decl_with_type() {
     }
 }
 
+#[test]
+fn it_parses_if_stmt() {
+    if let Err(e) = (*TESTER).evaluate_strict("if-stmt") {
+        panic!("{e}")
+    }
+}
+
 #[test]
 fn it_parses_blocks() {
     parses_to!(parser: SnekParser, input: "let a = { 1 + 1 }", rule: Rule::statement, tokens: [
@@ -43,7 +50,6 @@ fn it_parses_blocks() {
                                    integer(10, 11)
                                ]),
                                operator(12, 13),
-                               expr(14, 15, [
                                literal(14, 15, [
                                    integer(14, 15)
                                ])
@@ -51,7 +57,6 @@ fn it_parses_blocks() {
                        ])
                     ])
                 ])
-                ])
             ]),
             EOI(17, 17)
         ])
@@ -75,13 +80,11 @@ fn it_parses_multiline_blocks() {
                                            integer(18, 19)
                                        ]),
                                        operator(20, 21),
-                                       expr(22, 23, [
                                        literal(22, 23, [
                                            integer(22, 23)
                                        ])
                                    ])
                                ])
-                               ])
                            ]),
                         ]),
                         statement(24, 26, [

tests/corpus/statements/decl-with-type.txt

@@ -1,4 +1,4 @@
-Declaration Test
+Declaration with types test
 
 ======
 
@@ -24,7 +24,6 @@ let add_a x: Num -> Num = x + a
             (integer: "1")
           )
           (operator: "+")
-          (expr
           (literal
             (integer: "1")
           )
@@ -32,7 +31,6 @@ let add_a x: Num -> Num = x + a
       )
     )
   )
-  )
   (statement
     (decl
       (ident: "add_a")
@@ -55,12 +53,10 @@ let add_a x: Num -> Num = x + a
         (infix_expr
           (ident: "x")
           (operator: "+")
-          (expr
           (ident: "a")
         )
       )
     )
   )
-  )
   (EOI: "")
 )

tests/corpus/statements/fn-decl.txt

@@ -1,4 +1,4 @@
-Args Declaration Test
+Function Declaration Test
 
 ======
 
@@ -17,12 +17,10 @@ let add1 a = add a 1
         (infix_expr
           (ident: "a")
           (operator: "+")
-          (expr
           (ident: "b")
         )
       )
     )
-    )
   )
 	(statement
     (decl

tests/corpus/statements/if-stmt.txt

@@ -0,0 +1,92 @@
+If-Statements
+
+======
+
+if a == "test" then
+  print "test"
+else
+  print "no test"
+
+if 1 != 1 then {
+  let a = 1
+  a + 1
+}
+
+======
+
+(file
+  (statement
+    (expr
+      (if
+        (expr
+          (infix_expr
+            (ident: "a")
+            (operator: "==")
+            (literal
+              (string: "test")
+            )
+          )
+        )
+        (expr
+          (call_expr
+            (ident: "print")
+            (literal
+              (string: "test")
+            )
+          )
+        )
+        (expr
+          (call_expr
+            (ident: "print")
+            (literal
+              (string: "no test")
+            )
+          )
+        )
+      )
+    )
+  )
+  (statement
+    (expr
+      (if
+        (expr
+          (infix_expr
+            (literal
+              (integer: "1")
+            )
+            (operator: "!=")
+            (literal
+              (integer: "1")
+            )
+          )
+        )
+        (expr
+          (block
+            (statement
+              (decl
+                (ident: "a")
+                (expr
+                  (literal
+                    (integer: "1")
+                  )
+                )
+              )
+            )
+            (statement
+              (expr
+                (infix_expr
+                  (ident: "a")
+                  (operator: "+")
+                  (literal
+                    (integer: "1")
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    )
+  )
+  (EOI: "")
+)

tests/corpus/statements/simple-decl.txt

@@ -17,14 +17,12 @@ let b = a + 2
             (integer: "1")
           )
           (operator: "+")
-          (expr
           (literal
             (integer: "1")
           )
         )
       )
     )
-    )
   )
   (statement
     (decl
@@ -33,7 +31,6 @@ let b = a + 2
         (infix_expr
           (ident: "a")
           (operator: "+")
-          (expr
           (literal
             (integer: "2")
           )
@@ -41,6 +38,5 @@ let b = a + 2
       )
     )
   )
-  )
   (EOI: "")
 )