use the pythonic "elif" syntax for the zkDSL

Author: TomWambsgans

crates/lean_compiler/src/grammar.pest

@@ -76,7 +76,7 @@ assignment_target_list = { ("(" ~ simple_target_list ~ ")") | simple_target_list
 simple_target_list = { assignment_target ~ ("," ~ assignment_target)* ~ ","? }
 assignment_target = { (identifier ~ mut_annotation) | array_access_expr | identifier }
 
-if_statement = { "if" ~ condition ~ ":" ~ newline ~ statement* ~ end_block ~ else_if_clause* ~ else_clause? }
+if_statement = { "if" ~ condition ~ ":" ~ newline ~ statement* ~ end_block ~ elif_clause* ~ else_clause? }
 
 condition = { assumed_bool_expr | "(" ~ comparison ~ ")" | comparison }
 
@@ -86,7 +86,7 @@ assumed_bool_expr = { "!!assume_bool" ~ "(" ~ expression ~ ")" }
 comparison = { add_expr ~ comparison_op ~ add_expr }
 comparison_op = { "==" | "!=" | "<=" | "<" }
 
-else_if_clause = { "else" ~ "if" ~ condition ~ ":" ~ newline ~ statement* ~ end_block }
+elif_clause = { "elif" ~ condition ~ ":" ~ newline ~ statement* ~ end_block }
 
 else_clause = { "else" ~ ":" ~ newline ~ statement* ~ end_block }
 

crates/lean_compiler/src/parser/parsers/statement.rs

@@ -57,26 +57,25 @@ impl Parse<Line> for IfStatementParser {
         let condition = ConditionParser.parse(next_inner_pair(&mut inner, "if condition")?, ctx)?;
 
         let mut then_branch: Vec<Line> = Vec::new();
-        let mut else_if_branches: Vec<(Condition, Vec<Line>, SourceLineNumber)> = Vec::new();
+        let mut elif_branches: Vec<(Condition, Vec<Line>, SourceLineNumber)> = Vec::new();
         let mut else_branch: Vec<Line> = Vec::new();
 
         for item in inner {
             match item.as_rule() {
                 Rule::statement => {
                     Self::add_statement_with_location(&mut then_branch, item, ctx)?;
                 }
-                Rule::else_if_clause => {
+                Rule::elif_clause => {
                     let line_number = item.line_col().0;
                     let mut inner = item.into_inner();
-                    let else_if_condition =
-                        ConditionParser.parse(next_inner_pair(&mut inner, "else if condition")?, ctx)?;
-                    let mut else_if_branch = Vec::new();
-                    for else_if_item in inner {
-                        if else_if_item.as_rule() == Rule::statement {
-                            Self::add_statement_with_location(&mut else_if_branch, else_if_item, ctx)?;
+                    let elif_condition = ConditionParser.parse(next_inner_pair(&mut inner, "elif condition")?, ctx)?;
+                    let mut elif_branch = Vec::new();
+                    for elif_item in inner {
+                        if elif_item.as_rule() == Rule::statement {
+                            Self::add_statement_with_location(&mut elif_branch, elif_item, ctx)?;
                         }
                     }
-                    else_if_branches.push((else_if_condition, else_if_branch, line_number));
+                    elif_branches.push((elif_condition, elif_branch, line_number));
                 }
                 Rule::else_clause => {
                     for else_item in item.into_inner() {
@@ -92,10 +91,10 @@ impl Parse<Line> for IfStatementParser {
         let mut outer_else_branch = Vec::new();
         let mut inner_else_branch = &mut outer_else_branch;
 
-        for (else_if_condition, else_if_branch, line_number) in else_if_branches.into_iter() {
+        for (elif_condition, elif_branch, line_number) in elif_branches.into_iter() {
             inner_else_branch.push(Line::IfCondition {
-                condition: else_if_condition,
-                then_branch: else_if_branch,
+                condition: elif_condition,
+                then_branch: elif_branch,
                 else_branch: Vec::new(),
                 location: SourceLocation {
                     file_id: ctx.current_file_id,

crates/lean_compiler/tests/test_data/perf_constant_if_with_conditions.py

@@ -58,9 +58,9 @@ def main():
     # Chain of if-else-if with constants
     if A == 1:
         result = result + 5000
-    else if A == 2:
+    elif A == 2:
         result = result + 6000
-    else if A == 10:
+    elif A == 10:
         result = result + 64
     else:
         result = result + 7000

crates/lean_compiler/tests/test_data/program_110.py

@@ -52,7 +52,7 @@ def main():
     outer_sel = 1
     if outer_sel == 0:
         p = p + 100
-    else if outer_sel == 1:
+    elif outer_sel == 1:
         inner_sel = 2
         match inner_sel:
             case 0:

crates/lean_compiler/tests/test_data/program_111.py

@@ -90,11 +90,11 @@ def state_machine_step(current_state, phase):
             result = 1
         else:
             result = current_state + 1000
-    else if phase == 1:
+    elif phase == 1:
         result = current_state + 11
-    else if phase == 2:
+    elif phase == 2:
         result = current_state + 3
-    else if phase == 3:
+    elif phase == 3:
         result = current_state * 10
     else:
         result = current_state + 1

crates/lean_compiler/tests/test_data/program_112.py

@@ -23,7 +23,7 @@ def main():
     if phase == 0:
         counter = 0
         flag = 100
-    else if phase == 1:
+    elif phase == 1:
         counter = 10
         flag = 200
     else:

crates/lean_compiler/tests/test_data/program_114.py

@@ -36,7 +36,7 @@ def main():
     if mode == 0:
         fwd_x = 1
         fwd_y = 1
-    else if mode == 1:
+    elif mode == 1:
         fwd_x = 10
         fwd_y = 10
     else:
@@ -86,7 +86,7 @@ def complex_nested_compute(outer, inner, depth):
 
     if outer == 0:
         result = 100
-    else if outer == 1:
+    elif outer == 1:
         if inner == 0:
             result = 110
         else:
@@ -95,18 +95,18 @@ def complex_nested_compute(outer, inner, depth):
         if inner == 0:
             if depth == 0:
                 result = 200
-            else if depth == 1:
+            elif depth == 1:
                 result = 210
-            else if depth == 2:
+            elif depth == 2:
                 result = 220
             else:
                 result = 230
         else:
             if depth == 0:
                 result = 250
-            else if depth == 1:
+            elif depth == 1:
                 result = 260
-            else if depth == 2:
+            elif depth == 2:
                 result = 270
             else:
                 result = 280

crates/lean_compiler/tests/test_data/program_118.py

@@ -72,12 +72,12 @@ def long_else_if_chain(n):
     result: Mut = 0
     if n == 0:
         result = 1
-    else if n == 1:
+    elif n == 1:
         result = 2
-    else if n == 2:
+    elif n == 2:
         result = 3
-    else if n == 3:
+    elif n == 3:
         result = 4
-    else if n == 4:
+    elif n == 4:
         result = 5
     return result

crates/lean_compiler/tests/test_data/program_12.py

@@ -11,9 +11,9 @@ def fill_array(arr):
     for i in range(0, N):
         if i == 0:
             arr[i] = 10
-        else if i == 1:
+        elif i == 1:
             arr[i] = 20
-        else if i == 2:
+        elif i == 2:
             arr[i] = 30
         else:
             i_plus_one = i + 1

crates/lean_compiler/tests/test_data/program_137.py

@@ -6,13 +6,13 @@ def main():
     for i in range(0, 6):
         if i == 0:
             result += 1
-        else if i == 1:
+        elif i == 1:
             result += 2
-        else if i == 2:
+        elif i == 2:
             result += 4
-        else if i == 3:
+        elif i == 3:
             result += 8
-        else if i == 4:
+        elif i == 4:
             result += 16
         else:
             result += 32