while - continue support

stalwartlabs · Oct 4, 2023 · 0932d6a · 0932d6a
1 parent 3039311
commit 0932d6a
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 1 deletion.
diff --git a/src/compiler/grammar/instruction.rs b/src/compiler/grammar/instruction.rs
@@ -585,6 +585,24 @@ impl Compiler {
                                 jz_pos: usize::MAX,
                             }));
                         }
+                        Word::Continue => {
+                            state.validate_argument(
+                                0,
+                                Capability::While.into(),
+                                token_info.line_num,
+                                token_info.line_pos,
+                            )?;
+                            match (&state.block.btype, state.block_stack.last()) {
+                                (Word::While, Some(prev_block)) => {
+                                    state
+                                        .instructions
+                                        .push(Instruction::Jmp(prev_block.last_block_start));
+                                }
+                                _ => {
+                                    return Err(token_info.custom(ErrorType::ContinueOutsideLoop));
+                                }
+                            }
+                        }
 
                         _ => {
                             if state.has_capability(&Capability::Ihave) {

diff --git a/src/compiler/lexer/word.rs b/src/compiler/lexer/word.rs
@@ -156,6 +156,7 @@ pub(crate) enum Word {
     Local,
     While,
     Let,
+    Continue,
 }
 
 pub(crate) static WORDS: phf::Map<&'static str, Word> = phf_map! {
@@ -286,6 +287,7 @@ pub(crate) static WORDS: phf::Map<&'static str, Word> = phf_map! {
     "local" => Word::Local,
     "while" => Word::While,
     "let" => Word::Let,
+    "continue" => Word::Continue,
 };
 
 impl Display for Word {
@@ -418,6 +420,7 @@ impl Display for Word {
             Word::Local => f.write_str("local"),
             Word::While => f.write_str("while"),
             Word::Let => f.write_str("let"),
+            Word::Continue => f.write_str("continue"),
         }
     }
 }
diff --git a/src/compiler/mod.rs b/src/compiler/mod.rs
@@ -81,6 +81,7 @@ pub enum ErrorType {
     LabelAlreadyDefined(String),
     LabelUndefined(String),
     BreakOutsideLoop,
+    ContinueOutsideLoop,
     UnsupportedComparator(String),
     DuplicatedParameter,
     UndeclaredCapability(Capability),
@@ -464,6 +465,7 @@ impl Display for CompileError {
             ErrorType::LabelAlreadyDefined(value) => write!(f, "Label {value:?} already defined"),
             ErrorType::LabelUndefined(value) => write!(f, "Label {value:?} does not exist"),
             ErrorType::BreakOutsideLoop => write!(f, "Break used outside of foreverypart loop"),
+            ErrorType::ContinueOutsideLoop => write!(f, "Continue used outside of while loop"),
             ErrorType::UnsupportedComparator(value) => {
                 write!(f, "Comparator {value:?} is not supported")
             }

diff --git a/src/runtime/mod.rs b/src/runtime/mod.rs
@@ -226,7 +226,7 @@ impl<'x> Variable<'x> {
 
     pub fn to_string_array<'y: 'x>(&'y self) -> Vec<Cow<'x, str>> {
         match self {
-            Variable::Array(l) => l.into_iter().map(|i| i.to_cow()).collect(),
+            Variable::Array(l) => l.iter().map(|i| i.to_cow()).collect(),
             Variable::ArrayRef(l) => l.iter().map(|i| i.to_cow()).collect(),
             v if !v.is_empty() => vec![v.to_cow()],
             _ => vec![],

diff --git a/tests/stalwart/while.svtest b/tests/stalwart/while.svtest
@@ -222,3 +222,32 @@ test "While - body variable" {
     }
 }
 
+
+test "While - continue" {
+    let "i" "0";
+    let "j" "0";
+
+    while "i < 5" {
+        let "i" "i+1";
+        let "j" "j+1";
+    }
+
+    if eval "i != j" {
+        test_fail "i != j";
+    }
+
+    let "i" "0";
+    let "j" "0";
+
+    while "i < 5" {
+        let "i" "i+1";
+        continue;
+        let "j" "j+1";
+    }
+
+    if eval "j != 0 || i == 0" {
+        test_fail "while continue failed";
+    }
+
+}
+