clear temp variables in stack

xffxff · Sep 25, 2023 · 20fa3d5 · 20fa3d5
1 parent 3029d38
commit 20fa3d5
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 251 deletions.
diff --git a/components/lox-compile/src/compile.rs b/components/lox-compile/src/compile.rs
@@ -38,7 +38,10 @@ struct Compiler {
 impl Compiler {
     fn compile_stmt(&mut self, db: &dyn crate::Db, stmt: &syntax::Stmt, chunk: &mut Chunk) {
         match stmt {
-            syntax::Stmt::Expr(expr) => self.compile_expr(db, expr, chunk),
+            syntax::Stmt::Expr(expr) => {
+                self.compile_expr(db, expr, chunk);
+                chunk.emit_byte(Code::Pop);
+            }
             syntax::Stmt::Print(expr) => {
                 self.compile_expr(db, expr, chunk);
                 chunk.emit_byte(Code::Print)

diff --git a/lox_tests/arithmetic/bytecode b/lox_tests/arithmetic/bytecode
@@ -11,6 +11,7 @@ Chunk {
             ),
         ),
         Add,
+        Pop,
         Constant(
             F64(
                 1.0,
@@ -28,6 +29,7 @@ Chunk {
         ),
         Multiply,
         Add,
+        Pop,
         Constant(
             F64(
                 1.0,
@@ -45,6 +47,7 @@ Chunk {
         ),
         Divide,
         Subtract,
+        Pop,
         Constant(
             F64(
                 1.0,
@@ -63,5 +66,6 @@ Chunk {
         Negate,
         Multiply,
         Add,
+        Pop,
     ],
 }
diff --git a/lox_tests/arithmetic/execute b/lox_tests/arithmetic/execute
@@ -30,15 +30,15 @@ stack: [
     ),
 ]
 
+execute: Pop
+stack: []
+
 execute: Constant(
     F64(
         1.0,
     ),
 )
 stack: [
-    Number(
-        3.0,
-    ),
     Number(
         1.0,
     ),
@@ -50,9 +50,6 @@ execute: Constant(
     ),
 )
 stack: [
-    Number(
-        3.0,
-    ),
     Number(
         1.0,
     ),
@@ -67,9 +64,6 @@ execute: Constant(
     ),
 )
 stack: [
-    Number(
-        3.0,
-    ),
     Number(
         1.0,
     ),
@@ -83,9 +77,6 @@ stack: [
 
 execute: Multiply
 stack: [
-    Number(
-        3.0,
-    ),
     Number(
         1.0,
     ),
@@ -96,26 +87,20 @@ stack: [
 
 execute: Add
 stack: [
-    Number(
-        3.0,
-    ),
     Number(
         7.0,
     ),
 ]
 
+execute: Pop
+stack: []
+
 execute: Constant(
     F64(
         1.0,
     ),
 )
 stack: [
-    Number(
-        3.0,
-    ),
-    Number(
-        7.0,
-    ),
     Number(
         1.0,
     ),
@@ -127,12 +112,6 @@ execute: Constant(
     ),
 )
 stack: [
-    Number(
-        3.0,
-    ),
-    Number(
-        7.0,
-    ),
     Number(
         1.0,
     ),
@@ -147,12 +126,6 @@ execute: Constant(
     ),
 )
 stack: [
-    Number(
-        3.0,
-    ),
-    Number(
-        7.0,
-    ),
     Number(
         1.0,
     ),
@@ -166,12 +139,6 @@ stack: [
 
 execute: Divide
 stack: [
-    Number(
-        3.0,
-    ),
-    Number(
-        7.0,
-    ),
     Number(
         1.0,
     ),
@@ -182,32 +149,20 @@ stack: [
 
 execute: Subtract
 stack: [
-    Number(
-        3.0,
-    ),
-    Number(
-        7.0,
-    ),
     Number(
         0.33333333333333337,
     ),
 ]
 
+execute: Pop
+stack: []
+
 execute: Constant(
     F64(
         1.0,
     ),
 )
 stack: [
-    Number(
-        3.0,
-    ),
-    Number(
-        7.0,
-    ),
-    Number(
-        0.33333333333333337,
-    ),
     Number(
         1.0,
     ),
@@ -219,15 +174,6 @@ execute: Constant(
     ),
 )
 stack: [
-    Number(
-        3.0,
-    ),
-    Number(
-        7.0,
-    ),
-    Number(
-        0.33333333333333337,
-    ),
     Number(
         1.0,
     ),
@@ -242,15 +188,6 @@ execute: Constant(
     ),
 )
 stack: [
-    Number(
-        3.0,
-    ),
-    Number(
-        7.0,
-    ),
-    Number(
-        0.33333333333333337,
-    ),
     Number(
         1.0,
     ),
@@ -264,15 +201,6 @@ stack: [
 
 execute: Negate
 stack: [
-    Number(
-        3.0,
-    ),
-    Number(
-        7.0,
-    ),
-    Number(
-        0.33333333333333337,
-    ),
     Number(
         1.0,
     ),
@@ -286,15 +214,6 @@ stack: [
 
 execute: Multiply
 stack: [
-    Number(
-        3.0,
-    ),
-    Number(
-        7.0,
-    ),
-    Number(
-        0.33333333333333337,
-    ),
     Number(
         1.0,
     ),
@@ -305,17 +224,11 @@ stack: [
 
 execute: Add
 stack: [
-    Number(
-        3.0,
-    ),
-    Number(
-        7.0,
-    ),
-    Number(
-        0.33333333333333337,
-    ),
     Number(
         -5.0,
     ),
 ]
 
+execute: Pop
+stack: []
+
diff --git a/lox_tests/assignment/bytecode b/lox_tests/assignment/bytecode
@@ -16,6 +16,7 @@ Chunk {
         Assign(
             "a",
         ),
+        Pop,
         ReadGlobalVariable {
             name: "a",
         },
@@ -45,6 +46,7 @@ Chunk {
         Assign(
             "c",
         ),
+        Pop,
         ReadGlobalVariable {
             name: "c",
         },
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ Chunk { @@
             Assign(
                 "a",
             ),
+            Pop,
             ReadGlobalVariable {
                 name: "a",
             },
@@ Expand Down Expand Up / @@ -45,6 +46,7 @@ Chunk { @@
             Assign(
                 "c",
             ),
+            Pop,
             ReadGlobalVariable {
                 name: "c",
             },
@@ Expand Down @@