Add getters for Span and improve error handling

src/ast.rs

@@ -125,6 +125,11 @@ impl Assignment {
     pub fn expression(&self) -> &Expression {
         &self.expression
     }
+
+    /// Access the span of the assignment.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 impl_eq_hash!(Assignment; pattern, expression);
@@ -149,6 +154,11 @@ impl Expression {
     pub fn ty(&self) -> &ResolvedType {
         &self.ty
     }
+
+    /// Access the span of the expression.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 /// Variant of an expression.
@@ -192,6 +202,11 @@ impl SingleExpression {
     pub fn ty(&self) -> &ResolvedType {
         &self.ty
     }
+
+    /// Access the span of the expression.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 impl_eq_hash!(SingleExpression; inner, ty);
@@ -243,6 +258,11 @@ impl Call {
     pub fn args(&self) -> &Arc<[Expression]> {
         &self.args
     }
+
+    /// Access the span of the call.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 impl_eq_hash!(Call; name, args);
@@ -352,6 +372,11 @@ impl Match {
     pub fn right(&self) -> &MatchArm {
         &self.right
     }
+
+    /// Access the span of the match statement.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 impl_eq_hash!(Match; scrutinee, left, right);
@@ -394,6 +419,11 @@ impl Module {
     pub fn assignments(&self) -> &[ModuleAssignment] {
         &self.assignments
     }
+
+    /// Access the span of the module.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
@@ -413,6 +443,11 @@ impl ModuleAssignment {
     pub fn value(&self) -> &Value {
         &self.value
     }
+
+    /// Access the span of the module.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]

src/error.rs

@@ -221,6 +221,14 @@ impl RichError {
             file: Some(file),
         }
     }
+
+    pub fn error(&self) -> &Error {
+        &self.error
+    }
+
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 impl fmt::Display for RichError {

src/parse.rs

@@ -85,6 +85,11 @@ impl Function {
     pub fn body(&self) -> &Expression {
         &self.body
     }
+
+    /// Access the span of the function.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 impl_eq_hash!(Function; name, params, ret, body);
@@ -142,6 +147,11 @@ impl Assignment {
     pub fn expression(&self) -> &Expression {
         &self.expression
     }
+
+    /// Access the span of the expression.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 impl_eq_hash!(Assignment; pattern, ty, expression);
@@ -164,6 +174,11 @@ impl Call {
     pub fn args(&self) -> &[Expression] {
         self.args.as_ref()
     }
+
+    /// Access the span of the call.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 impl_eq_hash!(Call; name, args);
@@ -220,6 +235,11 @@ impl TypeAlias {
     pub fn ty(&self) -> &AliasedType {
         &self.ty
     }
+
+    /// Access the span of the alias.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 impl_eq_hash!(TypeAlias; name, ty);
@@ -237,6 +257,11 @@ impl Expression {
         &self.inner
     }
 
+    /// Access the span of the expression.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
+
     /// Convert the expression into a block expression.
     #[cfg(feature = "arbitrary")]
     fn into_block(self) -> Self {
@@ -275,6 +300,11 @@ impl SingleExpression {
     pub fn inner(&self) -> &SingleExpressionInner {
         &self.inner
     }
+
+    /// Access the span of the expression.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 impl_eq_hash!(SingleExpression; inner);
@@ -341,6 +371,11 @@ impl Match {
         &self.right
     }
 
+    /// Access the span of the match statement.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
+
     /// Get the type of the expression that is matched.
     pub fn scrutinee_type(&self) -> AliasedType {
         match (&self.left.pattern, &self.right.pattern) {
@@ -427,6 +462,11 @@ impl ModuleProgram {
     pub fn items(&self) -> &[ModuleItem] {
         &self.items
     }
+
+    /// Access the span of the program.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 impl_eq_hash!(ModuleProgram; items);
@@ -455,6 +495,11 @@ impl Module {
     pub fn assignments(&self) -> &[ModuleAssignment] {
         &self.assignments
     }
+
+    /// Access the span of the module.
+    pub fn span(&self) -> &Span {
+        &self.span
+    }
 }
 
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]