Ajout des boucles For

essai.lox

@@ -1,5 +1,8 @@
-var l=3;
+var a = 0;
-while(l>0) {
+var temp;
-    print l;
+
-    l = l-1;
+for (var b = 1; a < 10000; b = temp + b) {
+  print a;
+  temp = a;
+  a = b;
 }

src/interpreter.rs

@@ -232,7 +232,10 @@ impl StatementVisitor<()> for Interpreter {
                 let value = self.visit_expr(&e).unwrap();
                 self.environment.define(v.token.literal.clone(), value);
             }
-            None => {}
+            None => {
+                let value = LiteralNil;
+                self.environment.define(v.token.literal.clone(), value);
+            }
         }
     }
 

src/parser.rs

@@ -1,3 +1,4 @@
+use std::ptr::null;
 use crate::expr::{Assign, Binary, Expr, Grouping, Unary, Variable, Logical};
 use crate::expr::Expr::LogicalExpr;
 use crate::expr::Literal::{LiteralBool, LiteralNumber, LiteralString};
@@ -257,6 +258,10 @@ impl Parser {
     }
 
     fn statement(&mut self) -> Result<Statement, ParseError> {
+        if self.match_token(&[TokenType::For]) {
+            return self.for_statement();
+        }
+
         if self.match_token(&[TokenType::If]) {
             return self.if_statement();
         }
@@ -288,6 +293,45 @@ impl Parser {
         Ok(Statement::Block(BlockStatement::new(statements)))
     }
 
+    fn for_statement(&mut self) -> Result<Statement, ParseError> {
+        self.consume(&TokenType::LeftParen, String::from("Expect ("))?;
+
+        let initializer: Statement;
+        if self.match_token(&[TokenType::Semicolon]) {
+            initializer = Statement::Block(BlockStatement::new(Vec::new()));
+        } else if self.match_token(&[TokenType::Var]) {
+            initializer = self.var_declaration()?;
+        } else {
+            initializer = self.expr_statement()?;
+        }
+
+        let condition: Expr;
+        if !self.match_token(&[TokenType::Semicolon]) {
+            condition = self.expression()?;
+        } else {
+            condition = Expr::LiteralExpr(LiteralBool(true));
+        }
+        self.consume(&TokenType::Semicolon, String::from("Expect ;"))?;
+
+        let increment: Expr;
+        if !self.match_token(&[TokenType::RightParen]) {
+            increment = self.expression()?;
+        } else {
+            increment = Expr::LiteralExpr(LiteralBool(true));
+        }
+        self.consume(&TokenType::RightParen, String::from("Expect )"))?;
+
+        let mut for_body: Vec<Statement> = Vec::new();
+        for_body.push(self.statement()?);
+        for_body.push(Statement::Expression(ExpressionStatement { expr: increment }));
+
+        let mut for_statements: Vec<Statement> = Vec::new();
+        for_statements.push(initializer);
+        for_statements.push(Statement::While(WhileStatement{ condition, body: Box::new(Statement::Block(BlockStatement::new(for_body)))}));
+
+        Ok(Statement::Block(BlockStatement::new(for_statements)))
+    }
+
     fn print_statement(&mut self) -> Result<Statement, ParseError> {
         match self.expression() {
             Ok(e) => {