While loops

README.md

@@ -288,7 +288,15 @@ if (a == 1) {
 
 #### Loops
 
-For now loops are not supported. To achieve the same result as a loop, use recursion. In the future loops might be supported.
+While loops have been implemented, but for now keywords such as `break` and `continue` have not yet been implemented.
+
+```monkey
+let a = 1;
+while (a < 4) {
+    puts(a);
+    let a = a + 1;
+}
+```
 
 ### Comments
 

src/compiler/compiler_tests.rs

@@ -1188,4 +1188,40 @@ pub mod tests {
 
         run_compiler(tests);
     }
+
+    #[test]
+    fn test_while_statements() {
+        let input = r#"
+                    while (true){
+                        ("yes");
+                    }
+            "#
+        .to_string();
+
+        println!("{input}");
+        println!("{:?}", parse(&input));
+        println!("{}", parse(&input));
+
+        let tests = vec![CompilerTestCase {
+            input: r#"
+                    while (true){
+                        puts("yes");
+                    }
+                    "#
+            .to_string(),
+            expected_constants: vec![Object::STRING("yes".to_string())],
+            expected_instructions: flatten_instructions(vec![
+                Opcode::True.make(vec![]),            // 000
+                Opcode::JumpNotTruthy.make(vec![15]), // 001
+                Opcode::GetBuiltin.make(vec![5]),     // 004
+                Opcode::Constant.make(vec![0]),       // 006
+                Opcode::Call.make(vec![1]),           // 009
+                Opcode::Pop.make(vec![]),             // 011
+                Opcode::Jump.make(vec![0]),           // 012
+                                                      // 015
+            ]),
+        }];
+
+        run_compiler(tests);
+    }
 }

src/compiler/mod.rs

@@ -17,7 +17,7 @@ use crate::{
     },
     parser::ast::{
         BlockStatement, Conditional, Expression, FunctionLiteral, InfixOperator, Primitive,
-        Program, Statement,
+        Program, Statement, WhileStatement,
     },
 };
 
@@ -168,6 +168,9 @@ impl Compiler {
                 self.compile_expression(r.return_value)?;
                 self.emit(Opcode::ReturnValue, vec![]);
             }
+            Statement::While(wh) => {
+                self.compile_while_statement(wh)?;
+            }
         }
 
         Ok(())
@@ -380,6 +383,23 @@ impl Compiler {
         Ok(())
     }
 
+    fn compile_while_statement(&mut self, wh: WhileStatement) -> Result<(), String> {
+        let condition_pos = self.current_instructions().data.len();
+        self.compile_expression(wh.condition)?;
+
+        let jump_not_truthy_pos = self.emit(Opcode::JumpNotTruthy, vec![9999]); // We emit a dummy value for the jump offset
+                                                                                // and we will fix it later
+        self.compile_block_statement(wh.body)?;
+
+        self.emit(Opcode::Jump, vec![condition_pos as i32]); // We emit a dummy value for the jump offset
+                                                             // and we will fix it later
+
+        let after_body_pos = self.current_instructions().data.len();
+        self.change_operand(jump_not_truthy_pos, after_body_pos as i32)?;
+
+        Ok(())
+    }
+
     fn last_instruction_is(&self, opcode: Opcode) -> bool {
         match self.scopes[self.scope_index].last_instruction {
             Some(ref last) => last.opcode == opcode,

src/formatter/formatter_tests.rs

@@ -536,6 +536,42 @@ let a = 10;
         let expected = r#"puts("Hello, Monkey!");
 let arr = [1, 2, 3];
 let length = len(arr);
+"#;
+
+        assert_eq!(format(input), expected);
+    }
+
+    #[test]
+    fn test_while() {
+        let input = r#"
+        let a = 1;
+    while (a<3){
+let a = a + 1,
+puts(21);
+    }
+    let a = fn (x){
+        let a = 1;
+        while (x > 0){
+            let a = a * 2;
+        }
+        a
+    };
+    a(12);
+        "#;
+
+        let expected = r#"let a = 1;
+while (a < 3) {
+    let a = a + 1;
+    puts(21);
+}
+let a = fn (x) {
+    let a = 1;
+    while (x > 0) {
+        let a = a * 2;
+    }
+    a
+};
+a(12);
 "#;
 
         assert_eq!(format(input), expected);

src/formatter/mod.rs

@@ -112,6 +112,16 @@ impl Formatter {
                     self.push(";");
                 }
             }
+            Statement::While(wh) => {
+                self.push("while (");
+                self.visit_expression(&wh.condition);
+                self.push(") {\n");
+                self.indent += 1;
+                self.visit_block_statement(&wh.body);
+                self.indent -= 1;
+                self.push_indent();
+                self.push("}");
+            }
         }
         self.push("\n");
         self.last_expression = None;