supports compiling var decl

xffxff · Sep 24, 2023 · 87a9f29 · 87a9f29
1 parent f8d9c64
commit 87a9f29
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/components/lox-compile/src/compile.rs b/components/lox-compile/src/compile.rs
@@ -15,7 +15,16 @@ pub fn compile_file(db: &dyn crate::Db, input_file: InputFile) -> Chunk {
                 compile_expr(db, expr, &mut chunk);
                 chunk.emit_byte(Code::Print)
             },
-            syntax::Stmt::Var { name, initializer } => todo!()
+            syntax::Stmt::Var { name, initializer } => {
+                if let Some(initializer) = initializer {
+                    compile_expr(db, initializer, &mut chunk);
+                } else {
+                    chunk.emit_byte(Code::Nil)
+                }
+
+                let name_str = name.as_str(db);
+                chunk.emit_byte(Code::VarDeclaration(name_str.to_string()))
+            }
         }
     }
     chunk

diff --git a/components/lox-execute/src/vm.rs b/components/lox-execute/src/vm.rs
@@ -217,6 +217,8 @@ impl VM {
                     // FIXME: This should be a call to a intrinsic function.
                     println!("{:?}", value);
                 },
+                bytecode::Code::VarDeclaration(_) => todo!(),
+                bytecode::Code::Nil => todo!(),
             }
             if let Some(step_inspect) = &mut step_inspect {
                 step_inspect(instruction, self);

diff --git a/components/lox-ir/src/bytecode.rs b/components/lox-ir/src/bytecode.rs
@@ -17,7 +17,9 @@ pub enum Code {
     Less,
     LessEqual,
     String(String),
-    Print
+    Print,
+    VarDeclaration(String), // name of the variable
+    Nil,
 }
 
 #[derive(PartialEq, Eq, Debug, Clone, Default)]

diff --git a/lox_tests/var/bytecode b/lox_tests/var/bytecode
@@ -1,3 +1,12 @@
 Chunk {
-    code: [],
+    code: [
+        Constant(
+            F64(
+                1.0,
+            ),
+        ),
+        VarDeclaration(
+            "a",
+        ),
+    ],
 }