fix: garbage collector and error position display

viddrobnic · Jun 15, 2024 · 240a24f · 240a24f
1 parent c1fcd4c
commit 240a24f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/runtime/src/vm/gc.rs b/runtime/src/vm/gc.rs
@@ -61,13 +61,17 @@ impl GarbageCollector {
         rc_ref
     }
 
-    pub fn free(&mut self, used_stack: &[Object]) {
+    pub fn free(&mut self, used_stack: &[Object], globals: &[Object]) {
         self.mark_all(true);
 
         for obj in used_stack {
             self.traverse(obj);
         }
 
+        for obj in globals {
+            self.traverse(obj)
+        }
+
         self.owners.retain(|_, owner| !owner.marked);
     }
 

diff --git a/runtime/src/vm/mod.rs b/runtime/src/vm/mod.rs
@@ -118,7 +118,7 @@ impl VirtualMachine {
             }
 
             if self.gc.should_free() {
-                self.gc.free(&self.stack[0..self.sp]);
+                self.gc.free(&self.stack[0..self.sp], &self.globals);
             }
         }
 

diff --git a/src/main.rs b/src/main.rs
@@ -28,7 +28,9 @@ fn run(path: PathBuf) {
         Err(err) => {
             println!(
                 "Syntax error on line {}, character {}:\n  {}",
-                err.range.start.line, err.range.start.character, err
+                err.range.start.line + 1,
+                err.range.start.character + 1,
+                err
             );
             exit(1);
         }
@@ -39,7 +41,9 @@ fn run(path: PathBuf) {
         Err(err) => {
             println!(
                 "Runtime error on line {}, character {}:\n  {}",
-                err.range.start.line, err.range.start.character, err
+                err.range.start.line + 1,
+                err.range.start.character + 1,
+                err
             );
             exit(1);
         }