Fix statement 1 not appearing

Author: some100

src/ast/stmt.rs

@@ -21,6 +21,9 @@ pub enum Stmt {
         body: Vec<Stmt>,
     },
     For {
+        name: Name,
+        value: Box<Expr>,
+        type_: Type,
         cond: Box<Expr>,
         incr: Box<Stmt>,
         body: Vec<Stmt>,

src/codegen/sb3.rs

@@ -1022,10 +1022,13 @@ where T: Write + Seek
         match stmt {
             Stmt::Repeat { times, body } => self.repeat(s, d, this_id, times, body),
             Stmt::For {
+                name,
+                value,
+                type_,
                 cond,
                 incr,
                 body
-            } => self.r#for(s, d, this_id, cond, incr, body),
+            } => self.r#for(s, d, this_id, name, value, type_, cond, incr, body),
             Stmt::ForEach { 
                 name, 
                 times, 

src/codegen/stmt.rs

@@ -60,6 +60,9 @@ where T: Write + Seek
         s: S,
         d: D,
         this_id: NodeID,
+        _name: &Name,
+        _value: &Expr,
+        _type: &Type,
         cond: &Expr,
         incr: &Stmt,
         body: &[Stmt],

src/parser/grammar.lalrpop

@@ -88,14 +88,10 @@ Stmt: Stmt = {
     },
     REPEAT <times:BoxedIfExpr> <body:Stmts> => Stmt::Repeat { times, body },
     FOR <type_:Type> <l:@L> <name:NAME> <r:@R> "=" <value:BoxedExpr> ";" <cond:BoxedIfExpr> ";" <incr:BoxedStmt> <body:Stmts> => {
-        Stmt::SetVar {
+        Stmt::For {
             name: Name::Name { name, span: l..r },
             value,
             type_,
-            is_local: false,
-            is_cloud: false,
-        };
-        Stmt::For {
             cond,
             incr,
             body,

src/visitor/pass1.rs

@@ -186,7 +186,8 @@ fn visit_stmt(stmt: &mut Stmt, s: S, d: D) {
             visit_expr(times, s, d, false);
             visit_stmts(body, s, d, false);
         }
-        Stmt::For { incr, cond, body } => {
+        Stmt::For { name, value, type_, incr, cond, body } => {
+            visit_expr(value, s, d, false);
             visit_stmt(incr, s, d);
             visit_expr(cond, s, d, true);
             visit_stmts(body, s, d, false);

src/visitor/pass2.rs

@@ -100,7 +100,22 @@ fn visit_stmt(stmt: &mut Stmt, s: &mut S) -> Vec<Stmt> {
             visit_expr(times, &mut before, s);
             visit_stmts(body, s);
         }
-        Stmt::For { cond, incr, body } => {
+        Stmt::For { 
+            name,
+            value,
+            type_,
+            cond, 
+            incr, 
+            body 
+        } => {
+            before.push(Stmt::SetVar {
+                name: name.clone(),
+                value: value.clone(),
+                type_: type_.clone(),
+                is_local: false,
+                is_cloud: false,
+            });
+            visit_expr(value, &mut before, s);
             visit_expr(cond, &mut before, s);
             visit_stmt(incr, s);
             visit_stmts(body, s);