Replace FileRange with ByteRange in surface

Author: Kmeakin

fathom/src/core.rs

@@ -3,6 +3,7 @@
 use std::fmt;
 
 use crate::env::{Index, Level};
+use crate::files::FileId;
 use crate::source::{Span, StringId};
 
 pub mod binary;
@@ -12,6 +13,7 @@ pub mod semantics;
 
 /// Modules
 pub struct Module<'arena> {
+    pub file_id: FileId,
     pub items: &'arena [Item<'arena>],
 }
 

fathom/src/core/pretty.rs

@@ -11,11 +11,15 @@
 //! use codespan_reporting::term::termcolor::{BufferedStandardStream, ColorChoice};
 //! use fathom::core::pretty::Context;
 //! use fathom::core::Module;
+//! use fathom::files::FileId;
 //! use fathom::source::StringInterner;
 //!
 //! // These are created for demonstration
 //! let interner = RefCell::new(StringInterner::new());
-//! let module = Module { items: &[] };
+//! let module = Module {
+//!     file_id: FileId::default(),
+//!     items: &[],
+//! };
 //!
 //! let pp = Context::new(&interner);
 //! let doc = pp.module(&module);

fathom/src/driver.rs

@@ -8,7 +8,7 @@ use codespan_reporting::term::termcolor::{BufferedStandardStream, ColorChoice, W
 
 use crate::core::binary::{self, BufferError, ReadError};
 use crate::files::{FileId, Files};
-use crate::source::{FileRange, Span, StringInterner};
+use crate::source::{ByteRange, Span, StringInterner};
 use crate::surface::{self, elaboration};
 use crate::{core, BUG_REPORT_URL};
 
@@ -192,7 +192,7 @@ impl<'surface, 'core> Driver<'surface, 'core> {
     }
 
     pub fn elaborate_and_emit_module(&mut self, file_id: FileId, pretty_core: bool) -> Status {
-        let mut context = elaboration::Context::new(&self.interner, &self.core_scope);
+        let mut context = elaboration::Context::new(file_id, &self.interner, &self.core_scope);
 
         let surface_module = self.parse_module(file_id);
         let module = context.elab_module(&self.core_scope, &surface_module, &mut |m| {
@@ -217,7 +217,7 @@ impl<'surface, 'core> Driver<'surface, 'core> {
     }
 
     pub fn elaborate_and_emit_term(&mut self, file_id: FileId) -> Status {
-        let mut context = elaboration::Context::new(&self.interner, &self.core_scope);
+        let mut context = elaboration::Context::new(file_id, &self.interner, &self.core_scope);
 
         // Parse and elaborate the term
         let surface_term = self.parse_term(file_id);
@@ -241,7 +241,7 @@ impl<'surface, 'core> Driver<'surface, 'core> {
     }
 
     pub fn normalise_and_emit_term(&mut self, file_id: FileId) -> Status {
-        let mut context = elaboration::Context::new(&self.interner, &self.core_scope);
+        let mut context = elaboration::Context::new(file_id, &self.interner, &self.core_scope);
 
         // Parse and elaborate the term
         let surface_term = self.parse_term(file_id);
@@ -277,7 +277,8 @@ impl<'surface, 'core> Driver<'surface, 'core> {
 
         let initial_buffer = binary::Buffer::from(buffer_data);
         let mut binary_context = binary::Context::new(initial_buffer);
-        let mut elab_context = elaboration::Context::new(&self.interner, &self.core_scope);
+        let mut elab_context =
+            elaboration::Context::new(format_file_id, &self.interner, &self.core_scope);
 
         // Parse and elaborate a module if one was provided
         if let Some(file_id) = module_file_id {
@@ -294,9 +295,14 @@ impl<'surface, 'core> Driver<'surface, 'core> {
         // will need to be revisited if we need to support multiple modules, but
         // it works for now!
         let surface_format = self.parse_term(format_file_id);
-        let format = elab_context.elab_format(&self.core_scope, &surface_format, &mut |m| {
-            self.emit_diagnostic(m.to_diagnostic(&self.interner));
-        });
+        let format = elab_context.elab_format(
+            &self.core_scope,
+            format_file_id,
+            &surface_format,
+            &mut |m| {
+                self.emit_diagnostic(m.to_diagnostic(&self.interner));
+            },
+        );
 
         // Return early if we’ve seen any errors, unless `allow_errors` is enabled
         if *self.seen_errors.borrow() && !self.allow_errors {
@@ -330,20 +336,20 @@ impl<'surface, 'core> Driver<'surface, 'core> {
         Status::Ok
     }
 
-    fn parse_module(&'surface self, file_id: FileId) -> surface::Module<'surface, FileRange> {
+    fn parse_module(&'surface self, file_id: FileId) -> surface::Module<'surface, ByteRange> {
         let source = self.files.get(file_id).unwrap().source();
         let (module, messages) =
             surface::Module::parse(&self.interner, &self.surface_scope, file_id, source);
-        self.emit_diagnostics(messages.into_iter().map(|m| m.to_diagnostic()));
+        self.emit_diagnostics(messages.into_iter().map(|m| m.to_diagnostic(file_id)));
 
         module
     }
 
-    fn parse_term(&'surface self, file_id: FileId) -> surface::Term<'surface, FileRange> {
+    fn parse_term(&'surface self, file_id: FileId) -> surface::Term<'surface, ByteRange> {
         let source = self.files.get(file_id).unwrap().source();
         let (term, messages) =
             surface::Term::parse(&self.interner, &self.surface_scope, file_id, source);
-        self.emit_diagnostics(messages.into_iter().map(move |m| m.to_diagnostic()));
+        self.emit_diagnostics(messages.into_iter().map(move |m| m.to_diagnostic(file_id)));
 
         term
     }

fathom/src/files.rs

@@ -14,6 +14,12 @@ use codespan_reporting::files::{Error, SimpleFile};
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub struct FileId(NonZeroU32);
 
+impl Default for FileId {
+    fn default() -> Self {
+        Self(NonZeroU32::new(1).unwrap())
+    }
+}
+
 impl fmt::Display for FileId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Display::fmt(&self.0, f)

fathom/src/source.rs

@@ -1,9 +1,7 @@
 //! Types related to source files.
 
-use std::{
-    fmt,
-    ops::{Deref, DerefMut, Range},
-};
+use std::fmt;
+use std::ops::{Deref, DerefMut, Range};
 
 use crate::files::FileId;
 
@@ -237,47 +235,48 @@ pub type BytePos = u32;
 #[derive(Copy, Clone)]
 pub struct FileRange {
     file_id: FileId,
-    start: BytePos,
-    end: BytePos,
+    byte_range: ByteRange,
 }
 
 impl fmt::Debug for FileRange {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
             "FileRange({}, {}..{})",
-            self.file_id, self.start, self.end
+            self.file_id, self.byte_range.start, self.byte_range.end
         )
     }
 }
 
 impl FileRange {
-    pub const fn new(file_id: FileId, start: BytePos, end: BytePos) -> FileRange {
+    pub const fn new(file_id: FileId, byte_range: ByteRange) -> FileRange {
         FileRange {
             file_id,
-            start,
-            end,
+            byte_range,
         }
     }
 
     pub fn file_id(&self) -> FileId {
         self.file_id
     }
 
+    pub const fn byte_range(&self) -> ByteRange {
+        self.byte_range
+    }
+
     pub const fn start(&self) -> BytePos {
-        self.start
+        self.byte_range.start
     }
 
     pub const fn end(&self) -> BytePos {
-        self.end
+        self.byte_range.end
     }
 
     pub fn merge(&self, other: &FileRange) -> Option<FileRange> {
         if self.file_id == other.file_id {
             Some(FileRange::new(
                 self.file_id,
-                self.start.min(other.start),
-                self.end.max(other.end),
+                self.byte_range.merge(other.byte_range),
             ))
         } else {
             None
@@ -287,7 +286,7 @@ impl FileRange {
 
 impl From<FileRange> for Range<usize> {
     fn from(range: FileRange) -> Self {
-        (range.start as usize)..(range.end as usize)
+        range.byte_range.into()
     }
 }
 
@@ -321,6 +320,12 @@ impl ByteRange {
     }
 }
 
+impl From<ByteRange> for Range<usize> {
+    fn from(range: ByteRange) -> Self {
+        (range.start as usize)..(range.end as usize)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;