diagnose functions

xffxff · Nov 11, 2023 · 8fc5e3e · 8fc5e3e
1 parent 16b8b3b
commit 8fc5e3e
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/lox-compile/src/compile.rs b/components/lox-compile/src/compile.rs
@@ -21,7 +21,7 @@ pub fn compile_file(db: &dyn crate::Db, input_file: InputFile) -> CompiledFuncti
 }
 
 #[salsa::tracked]
-pub fn compile(db: &dyn crate::Db, function: lox_ir::function::Function) -> CompiledFunction {
+pub fn compile_fn(db: &dyn crate::Db, function: lox_ir::function::Function) -> CompiledFunction {
     let stmts = function.parse(db);
 
     // Whether the scope depth is 0 or not determines the variable type, global or local

diff --git a/components/lox-compile/src/lib.rs b/components/lox-compile/src/lib.rs
@@ -2,10 +2,10 @@
 
 pub mod compile;
 pub use compile::compile_file;
-pub mod prelude;
+pub use compile::compile_fn;
 
 #[salsa::jar(db = Db)]
-pub struct Jar(compile::compile_file, compile::compile);
+pub struct Jar(compile::compile_file, compile::compile_fn);
 
 pub trait Db: salsa::DbWithJar<Jar> + lox_ir::Db + lox_parse::Db {}
 impl<T> Db for T where T: salsa::DbWithJar<Jar> + lox_ir::Db + lox_parse::Db {}
diff --git a/components/lox-compile/src/prelude.rs b/components/lox-compile/src/prelude.rs
diff --git a/components/lox-execute/Cargo.toml b/components/lox-execute/Cargo.toml
@@ -10,5 +10,6 @@ salsa = { path="../salsa" }
 lox-ir = { path="../lox-ir" }
 lox-lex = { path="../lox-lex" }
 lox-compile = { path="../lox-compile" }
+lox-error-format = { path="../lox-error-format" }
 tracing = "0.1.37"
 generational-arena = "0.2.9"
diff --git a/components/lox-execute/src/lib.rs b/components/lox-execute/src/lib.rs
@@ -10,5 +10,6 @@ pub use vm::VM;
 #[salsa::jar(db = Db)]
 pub struct Jar(execute::main_function);
 
-pub trait Db: salsa::DbWithJar<Jar> + lox_ir::Db + lox_compile::Db {}
-impl<T> Db for T where T: salsa::DbWithJar<Jar> + lox_ir::Db + lox_compile::Db {}
+pub trait Db: salsa::DbWithJar<Jar> + lox_ir::Db + lox_compile::Db + lox_error_format::Db {}
+impl<T> Db for T where T: salsa::DbWithJar<Jar> + lox_ir::Db + lox_compile::Db + lox_error_format::Db
+{}
diff --git a/components/lox-execute/src/vm.rs b/components/lox-execute/src/vm.rs
@@ -1,8 +1,9 @@
 use std::collections::HashMap;
 
-use lox_compile::prelude::FunctionCompileExt;
+use lox_compile::compile_fn;
 use lox_ir::{
     bytecode::{self, CompiledFunction},
+    diagnostic::Diagnostics,
     function::Function,
 };
 
@@ -188,7 +189,7 @@ pub struct VM {
 
 impl VM {
     pub fn new(main: Function, db: &dyn crate::Db) -> Self {
-        let function = main.compile(db);
+        let function = compile_fn(db, main);
         let frame = CallFrame {
             function,
             ip: 0,
@@ -422,8 +423,20 @@ impl VM {
                 let closure = self.peek_n_from_top(arity);
                 match closure {
                     Value::Function(function) => {
-                        let compiled_function = function.compile(db);
-                        self.push_frame(compiled_function);
+                        let compiled_function = compile_fn(db, function.clone());
+                        let diagnostics =
+                            compile_fn::accumulated::<Diagnostics>(db, function.clone());
+                        if diagnostics.is_empty() {
+                            self.push_frame(compiled_function);
+                        } else {
+                            let output = lox_error_format::format_diagnostics_with_options(
+                                db,
+                                &diagnostics,
+                                lox_error_format::FormatOptions::no_color(),
+                            )
+                            .unwrap();
+                            kernel.print(&output);
+                        }
                     }
                     _ => panic!("Cannot call {:?}", closure),
                 }

diff --git a/lox_tests/diagnostics/hello.lox → lox_tests/diagnostics/error_in_function.lox b/lox_tests/diagnostics/hello.lox → lox_tests/diagnostics/error_in_function.lox
diff --git a/lox_tests/diagnostics/hello/bytecode → ...ts/diagnostics/error_in_function/bytecode b/lox_tests/diagnostics/hello/bytecode → ...ts/diagnostics/error_in_function/bytecode
diff --git a/lox_tests/diagnostics/error_in_function/output b/lox_tests/diagnostics/error_in_function/output
@@ -0,0 +1,8 @@
+Error: expected `;`
+   ╭─[/home/zhoufan/workspace/rust/lox/lox_tests/diagnostics/error_in_function.lox:2:5]
+   │
+ 2 │     print "hello"
+   │     ┬  
+   │     ╰── here
+───╯
+
diff --git a/lox_tests/diagnostics/hello/syntax → ...ests/diagnostics/error_in_function/syntax b/lox_tests/diagnostics/hello/syntax → ...ests/diagnostics/error_in_function/syntax
diff --git a/lox_tests/diagnostics/hello/token → ...tests/diagnostics/error_in_function/token b/lox_tests/diagnostics/hello/token → ...tests/diagnostics/error_in_function/token
diff --git a/lox_tests/diagnostics/hello/output b/lox_tests/diagnostics/hello/output
diff --git a/src/main.rs b/src/main.rs
@@ -213,14 +213,9 @@ fn main() {
             lox_compile::compile_file(&db, input_file);
             let diagnostics =
                 lox_compile::compile_file::accumulated::<Diagnostics>(&db, input_file);
-            dbg!(&diagnostics);
             if !diagnostics.is_empty() {
                 for diagnostic in &diagnostics {
                     lox_error_format::print_diagnostic(&db, diagnostic).unwrap();
-                    println!(
-                        "{}",
-                        lox_error_format::format_diagnostics(&db, &diagnostics).unwrap()
-                    );
                 }
             } else {
                 lox_execute::execute_file(