refactor: use compiler base session in resolver and remove un-used co…

…de in the kclvm error crate. (#442) * refactor: diagnostic 0-based column * refactor: use compiler base session in resolver and remove un-used code in the kclvm error crate. * feat: impl Into for PanicInfo and Diagnostic * refactor: enhance file not found error message showing.
kcl-lang · Mar 10, 2023 · fb2beed · fb2beed
1 parent 82c2be0
commit fb2beed
Show file tree

Hide file tree

Showing 34 changed files with 368 additions and 504 deletions.
diff --git a/kclvm/Cargo.lock b/kclvm/Cargo.lock
diff --git a/kclvm/ast_pretty/Cargo.toml b/kclvm/ast_pretty/Cargo.toml
@@ -14,3 +14,4 @@ indexmap = "1.0"
 fancy-regex = "0.7.1"
 pretty_assertions = "1.3.0"
 compiler_base_session = {path = "../../compiler_base/session", version = "0.0.12"}
+compiler_base_macros = "0.0.1"
diff --git a/kclvm/ast_pretty/src/node.rs b/kclvm/ast_pretty/src/node.rs
@@ -1,11 +1,11 @@
 use std::collections::HashSet;
 
+use compiler_base_macros::bug;
 use kclvm_ast::{
     ast::{self, CallExpr},
     token::{DelimToken, TokenKind},
     walker::MutSelfTypedResultWalker,
 };
-use kclvm_error::bug;
 
 use super::{Indentation, Printer};
 

diff --git a/kclvm/capi/src/service/service.rs b/kclvm/capi/src/service/service.rs
@@ -93,7 +93,7 @@ impl KclvmService {
         let kcl_paths_str = kcl_paths.iter().map(|s| s.as_str()).collect::<Vec<&str>>();
         let mut result = ExecProgram_Result::default();
         let sess = Arc::new(Session::default());
-        let mut program = load_program(sess, &kcl_paths_str.as_slice(), Some(opts))?;
+        let mut program = load_program(sess.clone(), &kcl_paths_str.as_slice(), Some(opts))?;
 
         if let Err(err) = apply_overrides(
             &mut program,
@@ -105,7 +105,7 @@ impl KclvmService {
         }
 
         let start_time = SystemTime::now();
-        let exec_result = kclvm_runner::execute(program, self.plugin_agent, &native_args);
+        let exec_result = kclvm_runner::execute(sess, program, self.plugin_agent, &native_args);
         let escape_time = match SystemTime::now().duration_since(start_time) {
             Ok(dur) => dur.as_secs_f32(),
             Err(err) => return Err(err.to_string()),

diff --git a/kclvm/cmd/src/lint.rs b/kclvm/cmd/src/lint.rs
@@ -25,7 +25,7 @@ pub fn lint_command(matches: &ArgMatches) -> Result<()> {
     (err_handler.diagnostics, warning_handler.diagnostics) =
         lint_files(&files, Some(args.get_load_program_options()));
     if matches.occurrences_of("emit_warning") > 0 {
-        warning_handler.emit();
+        warning_handler.emit()?;
     }
     err_handler.abort_if_any_errors();
     Ok(())

diff --git a/kclvm/compiler/src/codegen/llvm/context.rs b/kclvm/compiler/src/codegen/llvm/context.rs
@@ -1750,10 +1750,9 @@ impl<'ctx> LLVMCodeGenContext<'ctx> {
                                 column: None,
                             },
                         );
-                        handler.abort_if_errors()
-                    } else {
-                        result
+                        handler.abort_if_any_errors()
                     }
+                    result
                 }
             }
         }

diff --git a/kclvm/error/Cargo.toml b/kclvm/error/Cargo.toml
@@ -9,13 +9,13 @@ edition = "2021"
 compiler_base_span = {path = "../../compiler_base/span", version = "0.0.2"}
 compiler_base_session = {path = "../../compiler_base/session", version = "0.0.12"}
 compiler_base_error = "0.0.8"
+compiler_base_macros = "0.0.1"
 kclvm-span = {path = "../span", version = "0.4.5"}
 kclvm-runtime = {path = "../runtime", version = "0.4.5"}
 
 anyhow = "1.0"
 tracing = "0.1"
 atty = "0.2"
-termcolor = "1.0"
-annotate-snippets = "0.8.0"
+annotate-snippets = { version = "0.9.0", default-features = false, features = ["color"] }
 termize = "0.1.1"
 indexmap = "1.0"
diff --git a/kclvm/error/src/bug.rs b/kclvm/error/src/bug.rs
diff --git a/kclvm/error/src/diagnostic.rs b/kclvm/error/src/diagnostic.rs
@@ -1,10 +1,7 @@
+use kclvm_span::Loc;
 use std::fmt;
 use std::hash::Hash;
 
-use indexmap::IndexSet;
-use kclvm_span::Loc;
-use termcolor::{Color, ColorSpec};
-
 use crate::{ErrorKind, WarningKind};
 
 /// Diagnostic structure.
@@ -19,7 +16,7 @@ pub struct Diagnostic {
 /// line, and column location.
 ///
 /// A Position is valid if the line number is > 0.
-/// The line and column are both 1 based.
+/// The line is 1-based and the column is 0-based.
 #[derive(PartialEq, Clone, Eq, Hash, Debug, Default)]
 pub struct Position {
     pub filename: String,
@@ -89,7 +86,7 @@ impl From<Loc> for Position {
             line: loc.line as u64,
             column: if loc.col_display > 0 {
                 // Loc col is the (0-based) column offset.
-                Some(loc.col.0 as u64 + 1)
+                Some(loc.col.0 as u64)
             } else {
                 None
             },
@@ -156,22 +153,6 @@ impl Level {
             Level::Note => "note",
         }
     }
-
-    pub fn color(&self) -> ColorSpec {
-        let mut spec = ColorSpec::new();
-        match self {
-            Level::Error => {
-                spec.set_fg(Some(Color::Red)).set_intense(true);
-            }
-            Level::Warning => {
-                spec.set_fg(Some(Color::Yellow)).set_intense(cfg!(windows));
-            }
-            Level::Note => {
-                spec.set_fg(Some(Color::Green)).set_intense(true);
-            }
-        }
-        spec
-    }
 }
 
 impl fmt::Display for Level {
@@ -189,20 +170,3 @@ pub enum Style {
     LineAndColumn,
     Line,
 }
-
-/// Classify diagnostics into errors and warnings.
-pub fn classification(
-    diagnostics: &IndexSet<Diagnostic>,
-) -> (IndexSet<Diagnostic>, IndexSet<Diagnostic>) {
-    let (mut errs, mut warnings) = (IndexSet::new(), IndexSet::new());
-    for diag in diagnostics {
-        if diag.level == Level::Error {
-            errs.insert(diag.clone());
-        } else if diag.level == Level::Warning {
-            warnings.insert(diag.clone());
-        } else {
-            continue;
-        }
-    }
-    (errs, warnings)
-}