Fixed while continue in blocks

stalwartlabs · Oct 6, 2023 · c9288b6 · c9288b6
1 parent 0932d6a
commit c9288b6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/src/compiler/grammar/instruction.rs b/src/compiler/grammar/instruction.rs
@@ -592,16 +592,24 @@ impl Compiler {
                                 token_info.line_num,
                                 token_info.line_pos,
                             )?;
-                            match (&state.block.btype, state.block_stack.last()) {
-                                (Word::While, Some(prev_block)) => {
+                            let mut found_while = 0;
+                            for block in [&state.block]
+                                .into_iter()
+                                .chain(state.block_stack.iter().rev())
+                            {
+                                if let Word::While = &block.btype {
+                                    found_while += 1;
+                                } else if found_while == 1 {
                                     state
                                         .instructions
-                                        .push(Instruction::Jmp(prev_block.last_block_start));
-                                }
-                                _ => {
-                                    return Err(token_info.custom(ErrorType::ContinueOutsideLoop));
+                                        .push(Instruction::Jmp(block.last_block_start));
+                                    found_while += 1;
+                                    break;
                                 }
                             }
+                            if found_while != 2 {
+                                return Err(token_info.custom(ErrorType::ContinueOutsideLoop));
+                            }
                         }
 
                         _ => {

diff --git a/tests/stalwart/while.svtest b/tests/stalwart/while.svtest
@@ -245,6 +245,21 @@ test "While - continue" {
         let "j" "j+1";
     }
 
+    if eval "j != 0 || i == 0" {
+        test_fail "while continue failed";
+    }
+
+        let "i" "0";
+    let "j" "0";
+
+    while "i < 5" {
+        let "i" "i+1";
+        if eval "true" {
+            continue;
+        }
+        let "j" "j+1";
+    }
+
     if eval "j != 0 || i == 0" {
         test_fail "while continue failed";
     }