Changes towards a language server friendly compiler

Cargo.toml

@@ -24,10 +24,10 @@ default = ["cli"]
 cli = ["dep:clap"]
 
 [dependencies]
-TSPL = "0.0.12"
+TSPL = "0.0.13"
 clap = { version = "4.4.1", features = ["derive"], optional = true }
 highlight_error = "0.1.1"
-hvm = "=2.0.19"
+hvm = "2.0.22"
 indexmap = "2.2.3"
 interner = "0.2.1"
 itertools = "0.11.0"

cspell.json

@@ -21,6 +21,7 @@
     "concat",
     "ctrs",
     "cuda",
+    "curr",
     "datatypes",
     "Deque",
     "destructures",

src/diagnostics.rs

@@ -1,7 +1,10 @@
+use TSPL::ParseError;
+
 use crate::fun::{display::DisplayFn, Name};
 use std::{
   collections::BTreeMap,
   fmt::{Display, Formatter},
+  ops::Range,
 };
 
 pub const ERR_INDENT_SIZE: usize = 2;
@@ -28,16 +31,21 @@ pub struct DiagnosticsConfig {
 
 #[derive(Debug, Clone)]
 pub struct Diagnostic {
-  message: String,
-  severity: Severity,
+  pub message: String,
+  pub severity: Severity,
+  pub span: Option<FileSpan>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum DiagnosticOrigin {
+  /// An error when parsing source code.
+  Parsing,
   /// An error from the relationship between multiple top-level definitions.
   Book,
   /// An error in a pattern-matching function definition rule.
   Rule(Name),
+  /// An error when transforming `imp` syntax into `fun`.
+  Function(Name),
   /// An error in a compiled inet.
   Inet(String),
   /// An error during readback of hvm-core run results.
@@ -68,39 +76,66 @@ impl Diagnostics {
     Self { err_counter: 0, diagnostics: Default::default(), config }
   }
 
+  pub fn add_parsing_error(&mut self, err: impl std::fmt::Display, span: FileSpan) {
+    self.err_counter += 1;
+    self.add_diagnostic(err, Severity::Error, DiagnosticOrigin::Parsing, Some(span));
+  }
+
   pub fn add_book_error(&mut self, err: impl std::fmt::Display) {
     self.err_counter += 1;
-    self.add_diagnostic(err, Severity::Error, DiagnosticOrigin::Book);
+    self.add_diagnostic(err, Severity::Error, DiagnosticOrigin::Book, None);
+  }
+
+  pub fn add_rule_error(&mut self, err: impl std::fmt::Display, name: Name) {
+    self.err_counter += 1;
+    self.add_diagnostic(err, Severity::Error, DiagnosticOrigin::Rule(name.def_name_from_generated()), None);
   }
 
-  pub fn add_rule_error(&mut self, err: impl std::fmt::Display, def_name: Name) {
+  pub fn add_function_error(&mut self, err: impl std::fmt::Display, name: Name, span: Option<FileSpan>) {
     self.err_counter += 1;
-    self.add_diagnostic(err, Severity::Error, DiagnosticOrigin::Rule(def_name.def_name_from_generated()));
+    self.add_diagnostic(
+      err,
+      Severity::Error,
+      DiagnosticOrigin::Function(name.def_name_from_generated()),
+      span,
+    );
   }
 
   pub fn add_inet_error(&mut self, err: impl std::fmt::Display, def_name: String) {
     self.err_counter += 1;
-    self.add_diagnostic(err, Severity::Error, DiagnosticOrigin::Inet(def_name));
+    self.add_diagnostic(err, Severity::Error, DiagnosticOrigin::Inet(def_name), None);
   }
 
-  pub fn add_rule_warning(&mut self, warn: impl std::fmt::Display, warn_type: WarningType, def_name: Name) {
+  pub fn add_rule_warning(
+    &mut self,
+    warn: impl std::fmt::Display,
+    warn_type: WarningType,
+    def_name: Name,
+    span: Option<FileSpan>,
+  ) {
     let severity = self.config.warning_severity(warn_type);
     if severity == Severity::Error {
       self.err_counter += 1;
     }
-    self.add_diagnostic(warn, severity, DiagnosticOrigin::Rule(def_name.def_name_from_generated()));
+    self.add_diagnostic(warn, severity, DiagnosticOrigin::Rule(def_name.def_name_from_generated()), span);
   }
 
   pub fn add_book_warning(&mut self, warn: impl std::fmt::Display, warn_type: WarningType) {
     let severity = self.config.warning_severity(warn_type);
     if severity == Severity::Error {
       self.err_counter += 1;
     }
-    self.add_diagnostic(warn, severity, DiagnosticOrigin::Book);
+    self.add_diagnostic(warn, severity, DiagnosticOrigin::Book, None);
   }
 
-  pub fn add_diagnostic(&mut self, msg: impl ToString, severity: Severity, orig: DiagnosticOrigin) {
-    let diag = Diagnostic { message: msg.to_string(), severity };
+  pub fn add_diagnostic(
+    &mut self,
+    msg: impl std::fmt::Display,
+    severity: Severity,
+    orig: DiagnosticOrigin,
+    range: Option<FileSpan>,
+  ) {
+    let diag = Diagnostic { message: msg.to_string(), severity, span: range };
     self.diagnostics.entry(orig).or_default().push(diag)
   }
 
@@ -171,6 +206,11 @@ impl Diagnostics {
         let mut errs = filter(errs, severity).peekable();
         if errs.peek().is_some() {
           match orig {
+            DiagnosticOrigin::Parsing => {
+              for err in errs {
+                writeln!(f, "{err}")?;
+              }
+            }
             DiagnosticOrigin::Book => {
               for err in errs {
                 writeln!(f, "{err}")?;
@@ -182,6 +222,12 @@ impl Diagnostics {
                 writeln!(f, "{:ERR_INDENT_SIZE$}{err}", "")?;
               }
             }
+            DiagnosticOrigin::Function(nam) => {
+              writeln!(f, "\x1b[1mIn function '\x1b[4m{}\x1b[0m\x1b[1m':\x1b[0m", nam)?;
+              for err in errs {
+                writeln!(f, "{:ERR_INDENT_SIZE$}{err}", "")?;
+              }
+            }
             DiagnosticOrigin::Inet(nam) => {
               writeln!(f, "\x1b[1mIn compiled inet '\x1b[4m{}\x1b[0m\x1b[1m':\x1b[0m", nam)?;
               for err in errs {
@@ -204,6 +250,15 @@ impl Diagnostics {
       Ok(())
     })
   }
+
+  pub fn display_only_messages(&self) -> impl std::fmt::Display + '_ {
+    DisplayFn(move |f| {
+      for err in self.diagnostics.values().flatten() {
+        writeln!(f, "{err}")?;
+      }
+      Ok(())
+    })
+  }
 }
 
 impl Display for Diagnostics {
@@ -223,7 +278,24 @@ impl From<String> for Diagnostics {
     Self {
       diagnostics: BTreeMap::from_iter([(
         DiagnosticOrigin::Book,
-        vec![Diagnostic { message: value, severity: Severity::Error }],
+        vec![Diagnostic { message: value, severity: Severity::Error, span: None }],
+      )]),
+      ..Default::default()
+    }
+  }
+}
+
+impl From<ParseError> for Diagnostics {
+  /// Transforms a parse error into `Diagnostics`.
+  ///
+  /// NOTE: Since `ParseError` does not include the source code, we can't get the `TextLocation` of the error,
+  /// so it is not included in the diagnostic.
+  /// range is set as None.
+  fn from(value: ParseError) -> Self {
+    Self {
+      diagnostics: BTreeMap::from_iter([(
+        DiagnosticOrigin::Parsing,
+        vec![Diagnostic { message: value.into(), severity: Severity::Error, span: None }],
       )]),
       ..Default::default()
     }
@@ -270,6 +342,133 @@ impl Default for DiagnosticsConfig {
 
 impl Display for Diagnostic {
   fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    write!(f, "{}", self.message)
+    // TODO: this could be problematic when printing multiple errors from the same file
+    // currently, there shouldn't be any `Diagnostics` with multiple problems `FileSpan`s
+    match &self.span {
+      Some(FileSpan { file: Some(file), .. }) => write!(f, "In {} :\n{}", file, self.message),
+      _ => write!(f, "{}", self.message),
+    }
+  }
+}
+
+impl Diagnostic {
+  pub fn display_with_origin<'a>(&'a self, origin: &'a DiagnosticOrigin) -> impl std::fmt::Display + '_ {
+    DisplayFn(move |f| {
+      match origin {
+        DiagnosticOrigin::Parsing => writeln!(f, "{self}")?,
+        DiagnosticOrigin::Book => writeln!(f, "{self}")?,
+        DiagnosticOrigin::Rule(nam) => {
+          writeln!(f, "\x1b[1mIn definition '\x1b[4m{}\x1b[0m\x1b[1m':\x1b[0m", nam)?;
+          writeln!(f, "{:ERR_INDENT_SIZE$}{self}", "")?;
+        }
+        DiagnosticOrigin::Function(nam) => {
+          writeln!(f, "\x1b[1mIn function '\x1b[4m{}\x1b[0m\x1b[1m':\x1b[0m", nam)?;
+          writeln!(f, "{:ERR_INDENT_SIZE$}{self}", "")?;
+        }
+        DiagnosticOrigin::Inet(nam) => {
+          writeln!(f, "\x1b[1mIn compiled inet '\x1b[4m{}\x1b[0m\x1b[1m':\x1b[0m", nam)?;
+          writeln!(f, "{:ERR_INDENT_SIZE$}{self}", "")?;
+        }
+        DiagnosticOrigin::Readback => {
+          writeln!(f, "\x1b[1mDuring readback:\x1b[0m")?;
+          writeln!(f, "{:ERR_INDENT_SIZE$}{self}", "")?;
+        }
+      };
+      Ok(())
+    })
+  }
+}
+
+#[derive(Debug, Copy, Clone, Hash, PartialEq, PartialOrd, Ord, Eq)]
+pub struct TextLocation {
+  pub line: usize,
+  pub char: usize,
+}
+
+impl TextLocation {
+  pub fn new(line: usize, char: usize) -> Self {
+    TextLocation { line, char }
+  }
+
+  /// Transforms a `usize` byte index on `code` into a `TextLocation`.
+  pub fn from_byte_loc(code: &str, loc: usize) -> Self {
+    let code = code.as_bytes();
+    let mut line = 0;
+    let mut char = 0;
+    let mut curr_idx = 0;
+    while curr_idx < loc && curr_idx < code.len() {
+      if code[curr_idx] == b'\n' {
+        line += 1;
+        char = 0;
+      } else {
+        char += 1;
+      }
+      curr_idx += 1;
+    }
+
+    TextLocation { line, char }
+  }
+}
+
+#[derive(Debug, Copy, Clone, Hash, PartialEq, PartialOrd, Ord, Eq)]
+pub struct TextSpan {
+  pub start: TextLocation,
+  pub end: TextLocation,
+}
+
+impl TextSpan {
+  pub fn new(start: TextLocation, end: TextLocation) -> Self {
+    TextSpan { start, end }
+  }
+
+  /// Transforms a `usize` byte range on `code` into a `TextLocation`.
+  pub fn from_byte_span(code: &str, span: Range<usize>) -> Self {
+    // Will loop for way too long otherwise
+    assert!(span.start <= span.end);
+
+    let code = code.as_bytes();
+    let mut start_line = 0;
+    let mut start_char = 0;
+    let mut end_line;
+    let mut end_char;
+
+    let mut curr_idx = 0;
+    while curr_idx < span.start && curr_idx < code.len() {
+      if code[curr_idx] == b'\n' {
+        start_line += 1;
+        start_char = 0;
+      } else {
+        start_char += 1;
+      }
+      curr_idx += 1;
+    }
+
+    end_line = start_line;
+    end_char = start_char;
+    while curr_idx < span.end && curr_idx < code.len() {
+      if code[curr_idx] == b'\n' {
+        end_line += 1;
+        end_char = 0;
+      } else {
+        end_char += 1;
+      }
+      curr_idx += 1;
+    }
+
+    TextSpan::new(TextLocation::new(start_line, start_char), TextLocation::new(end_line, end_char))
+  }
+}
+
+#[derive(Debug, Clone, Hash, PartialEq, PartialOrd, Ord, Eq)]
+pub struct FileSpan {
+  pub span: TextSpan,
+  // Storing files as Strings, could be done as file IDs in the future
+  // This is currently optional, we might want to change it later
+  pub file: Option<String>,
+}
+
+impl FileSpan {
+  pub fn new(span: TextSpan, origin: Option<&str>) -> Self {
+    FileSpan { span, file: origin.map(|s| s.into()) }
   }
 }

src/fun/load_book.rs

@@ -3,7 +3,7 @@ use super::{
   Book, Name,
 };
 use crate::{
-  diagnostics::{Diagnostics, DiagnosticsConfig},
+  diagnostics::{Diagnostics, DiagnosticsConfig, FileSpan, TextSpan},
   imports::PackageLoader,
 };
 use std::path::Path;
@@ -39,11 +39,16 @@ pub fn load_to_book(
   book.load_imports(package_loader, diag)
 }
 
-pub fn do_parse_book(code: &str, origin: &Path, mut book: ParseBook) -> Result<ParseBook, String> {
+pub fn do_parse_book(code: &str, origin: &Path, mut book: ParseBook) -> Result<ParseBook, Diagnostics> {
   book.source = Name::new(origin.to_string_lossy());
-  TermParser::new(code).parse_book(book, false).map_err(|e| format!("In {} :\n{}", origin.display(), e))
+  TermParser::new(code).parse_book(book, false).map_err(|err| {
+    let mut diagnostics = Diagnostics::default();
+    let span = TextSpan::from_byte_span(code, err.span.0..err.span.1);
+    diagnostics.add_parsing_error(err, FileSpan { span, file: Some(origin.to_string_lossy().into()) });
+    diagnostics
+  })
 }
 
-pub fn do_parse_book_default(code: &str, origin: &Path) -> Result<Book, String> {
+pub fn do_parse_book_default(code: &str, origin: &Path) -> Result<Book, Diagnostics> {
   do_parse_book(code, origin, ParseBook::builtins())?.to_fun()
 }