Span unification

src/lib/ast/tree.rs

@@ -4,7 +4,7 @@ use crate::{
     ast::NodeId,
     helpers::*,
     infer::trait_solver::TraitSolver,
-    parser::span2::Span,
+    parser::span::Span,
     resolver::ResolutionMap,
     ty::{FuncType, Type},
 };

src/lib/diagnostics/diagnostic.rs

@@ -1,7 +1,7 @@
 use std::fmt::Display;
 
 use crate::parser::Parser;
-use crate::{diagnostics::DiagnosticType, parser::span::Span, parser::span2::Span as Span2};
+use crate::{diagnostics::DiagnosticType, parser::span::Span};
 use crate::{
     hir::HirId,
     parser::SourceFile,
@@ -287,8 +287,7 @@ impl Display for DiagnosticKind {
 
 impl<'a> From<Parser<'a>> for Diagnostic {
     fn from(err: Parser<'a>) -> Self {
-        let span2 = Span2::from(err);
-        let span = Span::from(span2);
+        let span = Span::from(err);
 
         let msg = "Syntax error".to_string();
 
@@ -300,8 +299,7 @@ impl<'a> From<VerboseError<Parser<'a>>> for Diagnostic {
     fn from(err: VerboseError<Parser<'a>>) -> Self {
         let (input, _kind) = err.errors.iter().next().unwrap().clone();
 
-        let span2 = Span2::from(input);
-        let span = Span::from(span2);
+        let span = Span::from(input);
 
         let msg = err.to_string();
 
@@ -311,11 +309,10 @@ impl<'a> From<VerboseError<Parser<'a>>> for Diagnostic {
 
 impl<I> From<(I, VerboseErrorKind)> for Diagnostic
 where
-    Span2: From<I>,
+    Span: From<I>,
 {
     fn from((input, _kind): (I, VerboseErrorKind)) -> Self {
-        let span2 = Span2::from(input);
-        let span = Span::from(span2);
+        let span = Span::from(input);
 
         let msg = "Syntax error".to_string();
 

src/lib/hir/tree.rs

@@ -5,7 +5,7 @@ use crate::{
     ast_lowering::HirMap,
     hir::hir_id::*,
     infer::{trait_solver::TraitSolver, Envs},
-    parser::span2::Span,
+    parser::span::Span,
     resolver::ResolutionMap,
     ty::{FuncType, StructType, Type},
 };

src/lib/infer/constraint.rs

@@ -5,7 +5,6 @@ use crate::{
     hir::visit::*,
     hir::*,
     infer::Envs,
-    parser::Span,
     resolver::ResolutionMap,
     ty::{FuncType, PrimitiveType, Type},
 };
@@ -114,7 +113,7 @@ impl<'a> ConstraintContext<'a> {
                                         self.envs
                                             .spans
                                             .get(&call_hir_id.clone())
-                                            .unwrap_or(&Span::default())
+                                            .unwrap()
                                             .clone()
                                             .into(),
                                         call_hir_id.clone(),
@@ -187,7 +186,7 @@ impl<'a> ConstraintContext<'a> {
                     self.envs
                         .spans
                         .get(&fc.op.get_hir_id())
-                        .unwrap_or(&Span::default())
+                        .unwrap()
                         .clone()
                         .into(),
                     fc.to_func_type(self.envs.get_current_env().unwrap()).into(),

src/lib/infer/state.rs

@@ -3,7 +3,7 @@ use std::collections::{BTreeMap, HashMap};
 use crate::{
     diagnostics::{Diagnostic, Diagnostics},
     hir::*,
-    parser::span2::Span,
+    parser::span::Span,
     ty::*,
 };
 

src/lib/parser/mod.rs

@@ -39,12 +39,10 @@ pub mod default_impl_populator;
 pub mod parsing_context;
 pub mod source_file;
 pub mod span;
-pub mod span2;
 
 pub use parsing_context::ParsingCtx;
 pub use source_file::SourceFile;
-pub use span::Span as OldSpan;
-pub use span2::Span;
+pub use span::Span;
 
 #[cfg(test)]
 mod tests;
@@ -1359,5 +1357,7 @@ pub fn parse(parsing_ctx: &mut ParsingCtx) -> Result<tree::Root, Diagnostic> {
 
     parsing_ctx.return_if_error()?;
 
+    println!("ast {:#?}", ast);
+
     Ok(ast)
 }

src/lib/parser/parsing_context.rs

@@ -8,7 +8,7 @@ use colored::*;
 use crate::{
     ast::{Identifier, NodeId},
     diagnostics::{Diagnostic, DiagnosticType, Diagnostics},
-    parser::span2::Span,
+    parser::span::Span,
     Config,
 };
 
@@ -127,11 +127,11 @@ impl ParsingCtx {
         Ok(())
     }
 
-    pub fn new_span(&self, start: usize, _end: usize) -> Span {
+    pub fn new_span(&self, start: usize, end: usize) -> Span {
         Span {
             file_path: self.get_current_file().file_path,
-            offset: start,
-            ..Default::default()
+            start,
+            end,
         }
     }
 
@@ -143,7 +143,8 @@ impl ParsingCtx {
             Diagnostic::new_module_not_found(
                 Span {
                     file_path: current_file.file_path.clone(),
-                    ..Default::default()
+                    start: 0,
+                    end: 0,
                 }
                 .into(),
                 m,

src/lib/parser/span.rs

@@ -1,4 +1,4 @@
-use super::span2::Span as Span2;
+use crate::parser::Parser;
 use std::path::PathBuf;
 
 #[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
@@ -26,12 +26,12 @@ impl Span {
     }
 }
 
-impl From<Span2> for Span {
-    fn from(span: Span2) -> Self {
+impl<'a> From<Parser<'a>> for Span {
+    fn from(source: Parser<'a>) -> Self {
         Self {
-            start: span.offset,
-            end: span.txt.len() + span.offset,
-            file_path: span.file_path,
+            start: source.location_offset(),
+            end: source.to_string().len() + source.location_offset(),
+            file_path: source.extra.current_file_path().clone(),
         }
     }
 }

src/lib/resolver/resolve_ctx.rs

@@ -5,7 +5,7 @@ use crate::{
     diagnostics::Diagnostic,
     helpers::scopes::*,
     infer::trait_solver::TraitSolver,
-    parser::span2::Span as Span2,
+    parser::span::Span,
     parser::ParsingCtx,
     resolver::ResolutionMap,
 };
@@ -87,7 +87,7 @@ impl<'a> ResolveCtx<'a> {
         }
     }
 
-    pub fn get_span2(&self, node_id: NodeId) -> Span2 {
+    pub fn get_span2(&self, node_id: NodeId) -> Span {
         self.parsing_ctx.identities.get(&node_id).unwrap().clone()
     }
 }