From b889b4c50c87db8260a57ab2628947a6e387c2a8 Mon Sep 17 00:00:00 2001
From: Nathan Graule <solarliner@gmail.com>
Date: Mon, 22 Nov 2021 11:43:09 +0100
Subject: [PATCH 1/3] feat: make errors spanned in computations

---
 computations/Cargo.toml |   3 +-
 computations/src/lib.rs | 131 ++++++++++++++++++++++++----------------
 parser/Cargo.toml       |   3 +
 parser/src/lib.rs       |  26 ++++----
 parser/src/spanned.rs   |  20 +++++-
 repl/src/main.rs        |  18 +++---
 6 files changed, 129 insertions(+), 72 deletions(-)

diff --git a/computations/Cargo.toml b/computations/Cargo.toml
index ef49a4b..a270d87 100644
--- a/computations/Cargo.toml
+++ b/computations/Cargo.toml
@@ -4,4 +4,5 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-parser = { path = "../parser" }
\ No newline at end of file
+parser = { path = "../parser" }
+thiserror = "1.0.30"
diff --git a/computations/src/lib.rs b/computations/src/lib.rs
index 2e901d4..a2bd2a0 100644
--- a/computations/src/lib.rs
+++ b/computations/src/lib.rs
@@ -1,10 +1,25 @@
 #[allow(dead_code)]
 mod trees;
 
-use parser::Sym;
+use parser::{Spanned, SpannedExt, Sym};
 use trees::{ComputationTree, Literal, UnOp};
 
 use crate::trees::{BinOp, Combinator};
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum ComputationError {
+    #[error("Expected an operator")]
+    ExpectedOperator,
+    #[error("Expression is empty")]
+    Empty,
+    #[error("Expression could not fully be computed")]
+    SymbolsRemaining,
+    #[error("Unsupported feature: {0}")]
+    UnsupportedFeature(&'static str),
+}
+
+pub type Error = Spanned<ComputationError>;
 
 // States for our state machine
 // WaitForOp -> We are waiting for an operator as the next symbol
@@ -27,12 +42,12 @@ struct Accumulator {
 impl Accumulator {
     // Build a new accumulator containing only the symbol "s" viewed
     // as a computation tree
-    fn new(s: &Sym) -> Result<Self, &'static str> {
-        Self::to_tree(s).and_then(|acc| {
-            Ok(Accumulator {
+    fn new(s: Spanned<&Sym>) -> Result<Self, Error> {
+        Self::to_tree(s).map(|acc| {
+            Accumulator {
                 state: State::WaitForOp,
                 acc,
-            })
+            }
         })
     }
 
@@ -86,8 +101,8 @@ impl Accumulator {
     }
 
     /// TODO : captures in lambdas ??
-    fn count_variables(prog: &Vec<Sym>) -> u32 {
-        prog.iter()
+    fn count_variables<'a, I: IntoIterator<Item = &'a Sym>>(prog: I) -> u32 {
+        prog.into_iter()
             .map(|s| match s {
                 Sym::Var(_) => 1,
                 _ => 0,
@@ -96,85 +111,99 @@ impl Accumulator {
     }
 
     /// Convert an arbitrary symbol to a computation tree
-    fn to_tree<'a>(s: &Sym) -> Result<ComputationTree, &'static str> {
-        match s {
+    fn to_tree<'a>(s: Spanned<&Sym>) -> Result<ComputationTree, Error> {
+        match s.value {
             Sym::CombS | Sym::CombK | Sym::CombD | Sym::CombI => {
-                Ok(ComputationTree::CombOp(Self::to_comb(s)))
+                Ok(ComputationTree::CombOp(Self::to_comb(s.value)))
             }
             Sym::Map | Sym::Eq | Sym::Add | Sym::And | Sym::Or | Sym::Filter | Sym::Reduce => {
-                Ok(ComputationTree::BinOpSym(Self::to_binary(s)))
+                Ok(ComputationTree::BinOpSym(Self::to_binary(s.value)))
+            }
+            Sym::Iota | Sym::Len | Sym::Neg => {
+                Ok(ComputationTree::UnOpSym(Self::to_unary(s.value)))
             }
-            Sym::Iota | Sym::Len | Sym::Neg => Ok(ComputationTree::UnOpSym(Self::to_unary(s))),
             Sym::Literal(n) => Ok(ComputationTree::Lit(n.clone().into())),
             Sym::Var(v) => Ok(ComputationTree::Lit(Literal::Var(v.clone()))),
-            Sym::Lambda(prog) => non_linear_check(prog).and_then(|body| {
-                Ok(ComputationTree::Lambda {
-                    vars: Self::count_variables(prog),
-                    body: Box::new(body),
-                })
+            Sym::Lambda(prog) => non_linear_check(
+                prog.iter().map(|s| &s.value).spanned(
+                    prog.iter()
+                        .map(|s| &s.span)
+                        .fold(0..0, |l, r| l.start..r.end),
+                ),
+            )
+            .map(|body| ComputationTree::Lambda {
+                vars: Self::count_variables(prog.iter().map(|s| &s.value)),
+                body: Box::new(body),
             }),
         }
     }
 
     /// Given an accumulator and a symbol, next computes a new accumulator
     /// and consume the symbol to extend the current computation tree.
-    fn next(self, s: &Sym) -> Result<Accumulator, &'static str> {
+    fn next(self, s: Spanned<&Sym>) -> Result<Accumulator, Error> {
         match self.state {
-            State::WaitForOp => match s {
+            State::WaitForOp => match s.value {
                 Sym::Map | Sym::Eq | Sym::Filter | Sym::Reduce | Sym::Add | Sym::And | Sym::Or => {
                     Ok(Accumulator {
-                        state: State::WaitForVal(Self::to_binary(s)),
+                        state: State::WaitForVal(Self::to_binary(s.value)),
                         ..self
                     })
                 }
                 Sym::Iota | Sym::Len => Ok(Accumulator {
                     state: State::WaitForOp,
                     acc: ComputationTree::UnaryOp {
-                        op: Self::to_unary(s),
+                        op: Self::to_unary(s.value),
                         lhs: Box::new(self.acc),
                     },
                 }),
-                _ => Err("Expected operator"),
+                _ => Err(ComputationError::ExpectedOperator.spanned(s.span)),
             },
-            State::WaitForVal(op) => Self::to_tree(s).and_then(|tree| {
-                Ok(Accumulator {
-                    state: State::WaitForOp,
-                    acc: ComputationTree::BinaryOp {
-                        op,
-                        lhs: Box::new(tree),
-                        rhs: Box::new(self.acc),
-                    },
-                })
+            State::WaitForVal(op) => Self::to_tree(s).map(|tree| Accumulator {
+                state: State::WaitForOp,
+                acc: ComputationTree::BinaryOp {
+                    op,
+                    lhs: Box::new(tree),
+                    rhs: Box::new(self.acc),
+                },
             }),
         }
     }
 }
 
 // Check that a sequence of symbols is well formed
-fn linear_check(prog: &[Sym]) -> Result<ComputationTree, &'static str> {
-    let first = Accumulator::new(&prog[0])?;
-    let next = &prog[1..];
-    next.iter()
-        .try_fold(first, |acc, s| acc.next(s))
-        .and_then(|a| {
-            // println!("debug {:?}", a);
-            a.finish().ok_or("Symbols remaining")
-        })
+fn linear_check<'a, I: IntoIterator<Item = Spanned<&'a Sym>>>(
+    prog: Spanned<I>,
+) -> Result<ComputationTree, Error> {
+    let mut it = prog.value.into_iter();
+    let acc = Accumulator::new(
+        it.next()
+            .ok_or(ComputationError::Empty.spanned(prog.span.clone()))?,
+    )?;
+    it.try_fold(acc, |acc, s| acc.next(s)).and_then(|a| {
+        // println!("debug {:?}", a);
+        a.finish()
+            .ok_or(ComputationError::SymbolsRemaining.spanned(prog.span))
+    })
 }
 
 // Check that a sequence of symbols is well formed (in the context of a lambda)
-fn non_linear_check(_prog: &[Sym]) -> Result<ComputationTree, &'static str> {
-    Err("TODO: Lambdas not supported")
+fn non_linear_check<'a, I: IntoIterator<Item = &'a Sym>>(
+    prog: Spanned<I>,
+) -> Result<ComputationTree, Error> {
+    Err(ComputationError::UnsupportedFeature("non_linear_check").spanned(prog.span))
 }
 
 /// Check that an ULP program is well formed and returns its associated
 /// computation tree
-pub fn check(mut prog: Vec<Sym>) -> Result<ComputationTree, &'static str> {
-    if prog.len() == 0 {
-        Err("No symbols")
+pub fn check(prog: Vec<Spanned<Sym>>) -> Result<ComputationTree, Error> {
+    let span = prog
+        .iter()
+        .map(|s| s.span.clone())
+        .fold(0..0, |l, r| l.start..r.end);
+    if prog.is_empty() {
+        Err(ComputationError::Empty.spanned(span))
     } else {
-        prog.reverse();
-        linear_check(&prog)
+        linear_check(prog.iter().map(|s| s.as_ref()).spanned(span))
     }
 }
 
@@ -194,7 +223,7 @@ mod test {
             Sym::Iota,
             Sym::Literal(Lit::Num("2".to_string())),
         ];
-        let res = check(prog);
+        let res = check(prog.into_iter().map(|s| s.spanned(0..0)).collect());
         println!("result: {:?}", res);
         assert!(res.is_ok())
     }
@@ -206,9 +235,9 @@ mod test {
             Sym::Add,
             Sym::Map,
             Sym::Iota,
-            Sym::Literal(Lit::Num("2".to_string()))
+            Sym::Literal(Lit::Num("2".to_string())),
         ];
-        let err = check(prog);
+        let err = check(prog.into_iter().map(|s| s.spanned(0..0)).collect());
         println!("result: {:?}", err);
         assert!(err.is_err())
     }
@@ -223,7 +252,7 @@ mod test {
             Sym::Iota,
             Sym::Literal(Lit::Num("2".to_string())),
         ];
-        let err = check(prog);
+        let err = check(prog.into_iter().map(|s| s.spanned(0..0)).collect());
         println!("result: {:?}", err);
         assert!(err.is_ok())
     }
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
index e256f03..338701d 100644
--- a/parser/Cargo.toml
+++ b/parser/Cargo.toml
@@ -8,3 +8,6 @@ edition = "2021"
 [dependencies]
 ariadne = "0.1.3"
 chumsky = "0.5.0"
+
+[dev-dependencies]
+insta = "1.8.0"
diff --git a/parser/src/lib.rs b/parser/src/lib.rs
index 7761f22..e57bc48 100644
--- a/parser/src/lib.rs
+++ b/parser/src/lib.rs
@@ -8,6 +8,8 @@ use report::Report;
 use report::{report_of_char_error, report_of_token_error};
 use token::lexer;
 
+pub use spanned::*;
+
 #[derive(Clone, Debug, PartialEq)]
 pub enum Lit {
     Num(String),
@@ -32,11 +34,11 @@ pub enum Sym {
     Add,
     Literal(Lit),
     Var(u32),
-    Lambda(Vec<Self>),
+    Lambda(Vec<Spanned<Self>>),
 }
 
 impl Sym {
-    pub fn lambda<I: IntoIterator<Item = Option<Self>>>(inner: I) -> Option<Self> {
+    pub fn lambda<I: IntoIterator<Item = Option<Spanned<Self>>>>(inner: I) -> Option<Self> {
         Some(Self::Lambda(inner.into_iter().collect::<Option<Vec<_>>>()?))
     }
 }
@@ -51,7 +53,7 @@ fn literal() -> impl Parser<Token, Lit, Error = Simple<Token>> {
     recursive(|lit| lit.repeated().at_least(1).delimited_by(Bracket(L), Bracket(R)).map(Lit::List).or(int))
 }
 
-fn parser() -> impl Parser<Token, Option<Vec<Sym>>, Error = Simple<Token>> {
+fn parser() -> impl Parser<Token, Option<Vec<Spanned<Sym>>>, Error = Simple<Token>> {
     use token::Dir::*;
     use Token::*;
     let var = filter_map(|span, tok| match tok {
@@ -62,7 +64,7 @@ fn parser() -> impl Parser<Token, Option<Vec<Sym>>, Error = Simple<Token>> {
     recursive(|instr| {
         instr
             .delimited_by(Brace(L), Brace(R))
-            .map(|v| Sym::lambda(v))
+            .map_with_span(|v, span| Sym::lambda(v).map(|l| l.spanned(span)))
             .or(just(Ident("K".to_string()))
                 .to(Sym::CombK)
                 .or(just(Ident("S".to_string())).to(Sym::CombS))
@@ -80,14 +82,14 @@ fn parser() -> impl Parser<Token, Option<Vec<Sym>>, Error = Simple<Token>> {
                 .or(just(Op("\\".to_string())).to(Sym::Filter))
                 .or(lit)
                 .or(var)
-                .map(Some))
+                .map_with_span(|s, span| Some(s.spanned(span))))
             .recover_with(nested_delimiters(Brace(L), Brace(R), [], |_| None))
             .repeated()
     })
     .map(|v| v.into_iter().collect::<Option<Vec<_>>>())
 }
 
-pub fn parse(src_id: impl Into<String>, input: &str) -> (Option<Vec<Sym>>, Vec<Report>) {
+pub fn parse(src_id: impl Into<String>, input: &str) -> (Option<Vec<Spanned<Sym>>>, Vec<Report>) {
     let src_id = src_id.into();
     let slen = input.len();
     let (tokens, tokerr) = lexer().then_ignore(end()).parse_recovery(input);
@@ -125,13 +127,15 @@ mod tests {
     macro_rules! assert_parse {
         ($input:expr, [$($e:expr),*]) => {
             {
-                use ariadne::Source;
                 let input = $input;
                 let (res, err) = parse("<test>", input);
-                for report in err {
-                    report.eprint(("<test>".into(), Source::from(input))).unwrap();
-                }
-                assert_eq!(res, Some(vec![$($e),*]));
+                insta::assert_display_snapshot!(err.into_iter().map(|r| {
+                    use ariadne::Source;
+                    let mut s = ::std::io::Cursor::new(Vec::new());
+                    r.write(("<test>".into(), Source::from(input)), &mut s).unwrap();
+                    String::from_utf8_lossy(&s.into_inner()).to_string()
+                }).collect::<Vec<_>>().join("\n"));
+                insta::assert_debug_snapshot!(res);
             }
         };
     }
diff --git a/parser/src/spanned.rs b/parser/src/spanned.rs
index e53bb4a..3f59f1e 100644
--- a/parser/src/spanned.rs
+++ b/parser/src/spanned.rs
@@ -1,4 +1,4 @@
-use std::ops::{Range, Deref};
+use std::{error::Error, fmt::{self, Display}, ops::{Range, Deref}};
 
 pub type Span = Range<usize>;
 
@@ -22,6 +22,24 @@ impl<T> From<Spanned<T>> for (T, Span) {
     }
 }
 
+impl<T: Display> fmt::Display for Spanned<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { 
+        write!(f, "{}:{}: {}", self.span.start, self.span.end, self.value)
+    }
+}
+
+impl<T: Error> Error for Spanned<T> {
+    fn source(&self) -> Option<&(dyn Error + 'static)> {
+        self.value.source()
+    }
+}
+
+impl<T> Spanned<T> {
+    pub fn as_ref(&self) -> Spanned<&T> {
+        (&self.value).spanned(self.span.clone())
+    }
+}
+
 pub trait SpannedExt: Sized {
     fn spanned(self, span: Span) -> Spanned<Self> {
         Spanned { span, value: self }
diff --git a/repl/src/main.rs b/repl/src/main.rs
index f984b08..8d4ca59 100644
--- a/repl/src/main.rs
+++ b/repl/src/main.rs
@@ -1,10 +1,10 @@
-use ariadne::{ReportKind, Source};
+use ariadne::{Label, ReportKind, Source};
 use computations::check;
 use parser::parse;
-use rustyline::{Editor, error::ReadlineError};
+use rustyline::{error::ReadlineError, Editor};
 use std::ops::Range;
 
-const HISTORYFILE: &'static str = "/tmp/ulp-repl.history";
+const HISTORYFILE: &str = "/tmp/ulp-repl.history";
 
 type SrcId = (String, Range<usize>);
 type Report = ariadne::Report<SrcId>;
@@ -19,21 +19,23 @@ fn main() {
                 rl.add_history_entry(&line);
                 let (ast, errors) = parse("<repl>", &line);
                 for err in errors {
-                    err.eprint(("<repl>".to_string(), Source::from(&line))).unwrap();
+                    err.eprint(("<repl>".to_string(), Source::from(&line)))
+                        .unwrap();
                 }
                 if let Some(ast) = ast {
                     match check(ast) {
                         Ok(comp) => println!("Computation {:#?}", comp),
-                        Err(err) => Report::build(ReportKind::Error, "<repl>", 0)
-                            .with_message(format!("Check error: {}", err))
+                        Err(err) => Report::build(ReportKind::Error, "<repl>", err.span.start)
+                            .with_label(Label::new(("<repl>".into(), err.span)).with_color(ariadne::Color::Red).with_message(err.value.to_string()))
+                            .with_message("Check error")
                             .with_note("The structure is correct, however ULP could not figure out how to compute the expression.")
                             .finish()
                             .eprint(("<repl>".to_string(), Source::from(&line)))
                             .unwrap(),
                     }
                 }
-            },
-            Err(ReadlineError::Interrupted) => {},
+            }
+            Err(ReadlineError::Interrupted) => {}
             Err(ReadlineError::Eof) => break,
             Err(err) => eprintln!("Fatal error: {}", err),
         }

From 81efc4edc7be771d4e1362e998b9715cff85afdb Mon Sep 17 00:00:00 2001
From: Nathan Graule <solarliner@gmail.com>
Date: Tue, 23 Nov 2021 10:34:23 +0100
Subject: [PATCH 2/3] feat: put utility types in utils crate

---
 Cargo.toml          |   2 +-
 utils/Cargo.toml    |   9 ++
 utils/src/lib.rs    | 210 ++++++++++++++++++++++++++++++++++++++++++++
 utils/src/report.rs |  39 ++++++++
 4 files changed, 259 insertions(+), 1 deletion(-)
 create mode 100644 utils/Cargo.toml
 create mode 100644 utils/src/lib.rs
 create mode 100644 utils/src/report.rs

diff --git a/Cargo.toml b/Cargo.toml
index a426954..a436f99 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,2 +1,2 @@
 [workspace]
-members = ["parser", "computations", "repl"]
+members = ["parser", "computations", "repl", "utils"]
diff --git a/utils/Cargo.toml b/utils/Cargo.toml
new file mode 100644
index 0000000..639df54
--- /dev/null
+++ b/utils/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "utils"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+ariadne = "*"
diff --git a/utils/src/lib.rs b/utils/src/lib.rs
new file mode 100644
index 0000000..d810c66
--- /dev/null
+++ b/utils/src/lib.rs
@@ -0,0 +1,210 @@
+use std::{
+    error::Error,
+    fmt,
+    ops::{Deref, Range},
+    rc::Rc,
+};
+
+pub mod report;
+
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
+pub struct Span {
+    pub start: usize,
+    pub end: usize,
+}
+
+impl From<Range<usize>> for Span {
+    fn from(r: Range<usize>) -> Self {
+        Self {
+            start: r.start,
+            end: r.end,
+        }
+    }
+}
+
+impl Into<Range<usize>> for Span {
+    fn into(self) -> Range<usize> {
+        self.start..self.end
+    }
+}
+
+impl fmt::Display for Span {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}:{}", self.start, self.end)
+    }
+}
+
+impl Span {
+    pub fn merge(self, other: Self) -> Self {
+        Self {
+            start: self.start.min(other.start),
+            end: self.end.max(other.end),
+        }
+    }
+}
+
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub struct Position {
+    pub reference: Option<Rc<str>>,
+    pub span: Span,
+}
+
+impl fmt::Display for Position {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}:{}",
+            self.reference.as_deref().unwrap_or("<unknown>"),
+            self.span
+        )
+    }
+}
+
+impl Position {
+    pub fn with_reference<S: Into<Rc<str>>>(mut self, reference: S) -> Self {
+        self.reference = Some(reference.into());
+        self
+    }
+
+    pub fn with_span<S: Into<Span>>(mut self, span: S) -> Self {
+        self.span = span.into();
+        self
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Positioned<T> {
+    pos: Position,
+    value: T,
+}
+
+impl<T: fmt::Display> fmt::Display for Positioned<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}: {}", self.pos, self.value)
+    }
+}
+
+impl<T: Error> Error for Positioned<T> {
+    fn source(&self) -> Option<&(dyn Error + 'static)> {
+        self.value.source()
+    }
+}
+
+impl Position {
+    pub fn merge(self, other: Self) -> Self {
+        Self {
+            reference: self.reference.or(other.reference),
+            span: self.span.merge(other.span),
+        }
+    }
+}
+
+impl<T> Deref for Positioned<T> {
+    type Target = T;
+    fn deref(&self) -> &Self::Target {
+        &self.value
+    }
+}
+
+impl<T> Positioned<T> {
+    pub fn map<U>(self, map: impl FnOnce(T) -> U) -> Positioned<U> {
+        Positioned {
+            pos: self.pos,
+            value: map(self.value),
+        }
+    }
+
+    pub fn as_ref(&self) -> Positioned<&T> {
+        Positioned {
+            pos: self.pos.clone(),
+            value: &self.value,
+        }
+    }
+
+    pub fn as_deref(&self) -> Positioned<&T::Target>
+    where
+        T: Deref,
+    {
+        self.as_ref().map(|r| r.deref())
+    }
+
+    pub fn into_inner(self) -> T {
+        self.value
+    }
+
+    pub fn with_reference<S: Into<Rc<str>>>(self, reference: S) -> Self {
+        Self {
+            pos: self.pos.with_reference(reference),
+            value: self.value,
+        }
+    }
+
+    pub fn with_span<S: Into<Span>>(self, span: S) -> Self {
+        Self {
+            pos: self.pos.with_span(span),
+            value: self.value,
+        }
+    }
+}
+
+impl<T> Positioned<Vec<T>> {
+    pub fn from_positioned(values: Vec<Positioned<T>>) -> Self {
+        let (pos, values): (Vec<_>, Vec<_>) = values.into_iter().map(|p| (p.pos, p.value)).unzip();
+        let pos = pos.into_iter().fold(Position::default(), Position::merge);
+        Self { pos, value: values }
+    }
+}
+
+impl<T, E> Positioned<Result<T, E>> {
+    pub fn transpose(self) -> Result<Positioned<T>, Positioned<E>> {
+        let Self { pos, value } = self;
+        value
+            .map(|t| Positioned {
+                pos: pos.clone(),
+                value: t,
+            })
+            .map_err(|e| Positioned { pos, value: e })
+    }
+}
+
+impl<T> Positioned<Option<T>> {
+    pub fn transpose(self) -> Option<Positioned<T>> {
+        let Self { pos, value } = self;
+        value.map(|value| Positioned { pos, value })
+    }
+}
+
+pub trait PositionedExt: Sized {
+    fn positioned<St: Into<Rc<str>>, Sp: Into<Span>>(
+        self,
+        span: Sp,
+        reference: St,
+    ) -> Positioned<Self> {
+        Positioned {
+            pos: Position {
+                reference: Some(reference.into()),
+                span: span.into(),
+            },
+            value: self,
+        }
+    }
+
+    fn spanned<S: Into<Span>>(self, span: S) -> Positioned<Self> {
+        Positioned {
+            pos: Position::default().with_span(span),
+            value: self,
+        }
+    }
+
+    fn referenced<S: Into<Rc<str>>>(self, reference: S) -> Positioned<Self> {
+        Positioned {
+            pos: Position {
+                reference: Some(reference.into()),
+                span: Span::default(),
+            },
+            value: self,
+        }
+    }
+}
+
+impl<T> PositionedExt for T {}
diff --git a/utils/src/report.rs b/utils/src/report.rs
new file mode 100644
index 0000000..27fe9ec
--- /dev/null
+++ b/utils/src/report.rs
@@ -0,0 +1,39 @@
+use std::{ops::Deref, rc::Rc};
+
+use ariadne::ReportKind;
+
+use crate::{Position, Positioned};
+
+pub type SourceId = Position;
+pub type Label = ariadne::Label<SourceId>;
+pub type ReportBuilder = ariadne::ReportBuilder<SourceId>;
+pub type Report = ariadne::Report<SourceId>;
+
+impl ariadne::Span for Position {
+    type SourceId = Option<Rc<str>>;
+
+    fn source(&self) -> &Self::SourceId {
+        &self.reference
+    }
+
+    fn start(&self) -> usize {
+        self.span.start
+    }
+
+    fn end(&self) -> usize {
+        self.span.end
+    }
+}
+
+impl<T: ToString> Positioned<T> {
+    pub fn into_report(self, kind: ReportKind) -> ReportBuilder {
+        Report::build(kind, self.pos.reference, self.pos.span.start)
+            .with_message(self.value.to_string())
+    }
+}
+
+impl<T: ToString> Into<Label> for Positioned<T> {
+    fn into(self) -> Label {
+        Label::new(self.pos).with_message(self.value.to_string())
+    }
+}

From 2b0343e3098756b5c9ff238bf1c4d2b447786592 Mon Sep 17 00:00:00 2001
From: Nathan Graule <solarliner@gmail.com>
Date: Wed, 24 Nov 2021 21:36:01 +0100
Subject: [PATCH 3/3] feat: Position<_> abstraction with span and file
 reference

---
 computations/Cargo.toml |   1 +
 computations/src/lib.rs |  87 ++++++++++++++++-------------
 parser/Cargo.toml       |   1 +
 parser/src/lib.rs       |  67 +++++++++++++++--------
 parser/src/report.rs    | 118 ++++++++++++++++++++--------------------
 parser/src/spanned.rs   |  49 -----------------
 parser/src/token.rs     |   7 +--
 repl/Cargo.toml         |   1 +
 repl/src/main.rs        |  22 ++++----
 utils/src/lib.rs        |  85 +++++++++++++++++------------
 utils/src/report.rs     |  10 +---
 11 files changed, 221 insertions(+), 227 deletions(-)
 delete mode 100644 parser/src/spanned.rs

diff --git a/computations/Cargo.toml b/computations/Cargo.toml
index a270d87..03e7cd6 100644
--- a/computations/Cargo.toml
+++ b/computations/Cargo.toml
@@ -6,3 +6,4 @@ edition = "2021"
 [dependencies]
 parser = { path = "../parser" }
 thiserror = "1.0.30"
+utils = { path = "../utils" }
diff --git a/computations/src/lib.rs b/computations/src/lib.rs
index a2bd2a0..0a31cf1 100644
--- a/computations/src/lib.rs
+++ b/computations/src/lib.rs
@@ -1,8 +1,9 @@
 #[allow(dead_code)]
 mod trees;
 
-use parser::{Spanned, SpannedExt, Sym};
+use parser::Sym;
 use trees::{ComputationTree, Literal, UnOp};
+use utils::{Position, Positioned, PositionedExt};
 
 use crate::trees::{BinOp, Combinator};
 use thiserror::Error;
@@ -19,7 +20,7 @@ pub enum ComputationError {
     UnsupportedFeature(&'static str),
 }
 
-pub type Error = Spanned<ComputationError>;
+pub type Error = Positioned<ComputationError>;
 
 // States for our state machine
 // WaitForOp -> We are waiting for an operator as the next symbol
@@ -42,12 +43,10 @@ struct Accumulator {
 impl Accumulator {
     // Build a new accumulator containing only the symbol "s" viewed
     // as a computation tree
-    fn new(s: Spanned<&Sym>) -> Result<Self, Error> {
-        Self::to_tree(s).map(|acc| {
-            Accumulator {
-                state: State::WaitForOp,
-                acc,
-            }
+    fn new(s: Positioned<&Sym>) -> Result<Self, Error> {
+        Self::to_tree(s).map(|acc| Accumulator {
+            state: State::WaitForOp,
+            acc,
         })
     }
 
@@ -111,7 +110,7 @@ impl Accumulator {
     }
 
     /// Convert an arbitrary symbol to a computation tree
-    fn to_tree<'a>(s: Spanned<&Sym>) -> Result<ComputationTree, Error> {
+    fn to_tree<'a>(s: Positioned<&Sym>) -> Result<ComputationTree, Error> {
         match s.value {
             Sym::CombS | Sym::CombK | Sym::CombD | Sym::CombI => {
                 Ok(ComputationTree::CombOp(Self::to_comb(s.value)))
@@ -125,10 +124,10 @@ impl Accumulator {
             Sym::Literal(n) => Ok(ComputationTree::Lit(n.clone().into())),
             Sym::Var(v) => Ok(ComputationTree::Lit(Literal::Var(v.clone()))),
             Sym::Lambda(prog) => non_linear_check(
-                prog.iter().map(|s| &s.value).spanned(
+                prog.iter().map(|s| &s.value).positioned(
                     prog.iter()
-                        .map(|s| &s.span)
-                        .fold(0..0, |l, r| l.start..r.end),
+                        .map(|s| s.pos.clone())
+                        .fold(Position::default(), Position::merge),
                 ),
             )
             .map(|body| ComputationTree::Lambda {
@@ -140,7 +139,7 @@ impl Accumulator {
 
     /// Given an accumulator and a symbol, next computes a new accumulator
     /// and consume the symbol to extend the current computation tree.
-    fn next(self, s: Spanned<&Sym>) -> Result<Accumulator, Error> {
+    fn next(self, s: Positioned<&Sym>) -> Result<Accumulator, Error> {
         match self.state {
             State::WaitForOp => match s.value {
                 Sym::Map | Sym::Eq | Sym::Filter | Sym::Reduce | Sym::Add | Sym::And | Sym::Or => {
@@ -156,7 +155,7 @@ impl Accumulator {
                         lhs: Box::new(self.acc),
                     },
                 }),
-                _ => Err(ComputationError::ExpectedOperator.spanned(s.span)),
+                _ => Err(ComputationError::ExpectedOperator.positioned(s.pos)),
             },
             State::WaitForVal(op) => Self::to_tree(s).map(|tree| Accumulator {
                 state: State::WaitForOp,
@@ -171,45 +170,44 @@ impl Accumulator {
 }
 
 // Check that a sequence of symbols is well formed
-fn linear_check<'a, I: IntoIterator<Item = Spanned<&'a Sym>>>(
-    prog: Spanned<I>,
+fn linear_check<'a, I: IntoIterator<Item = Positioned<&'a Sym>>>(
+    prog: Positioned<I>,
 ) -> Result<ComputationTree, Error> {
     let mut it = prog.value.into_iter();
     let acc = Accumulator::new(
         it.next()
-            .ok_or(ComputationError::Empty.spanned(prog.span.clone()))?,
+            .ok_or(ComputationError::Empty.positioned(prog.pos.clone()))?,
     )?;
-    it.try_fold(acc, |acc, s| acc.next(s)).and_then(|a| {
-        // println!("debug {:?}", a);
-        a.finish()
-            .ok_or(ComputationError::SymbolsRemaining.spanned(prog.span))
-    })
+    let a = it.try_fold(acc, |acc, s| acc.next(s))?;
+    a.finish()
+        .ok_or(ComputationError::SymbolsRemaining.positioned(prog.pos))
 }
 
 // Check that a sequence of symbols is well formed (in the context of a lambda)
 fn non_linear_check<'a, I: IntoIterator<Item = &'a Sym>>(
-    prog: Spanned<I>,
+    prog: Positioned<I>,
 ) -> Result<ComputationTree, Error> {
-    Err(ComputationError::UnsupportedFeature("non_linear_check").spanned(prog.span))
+    Err(ComputationError::UnsupportedFeature("non_linear_check").positioned(prog.pos))
 }
 
 /// Check that an ULP program is well formed and returns its associated
 /// computation tree
-pub fn check(prog: Vec<Spanned<Sym>>) -> Result<ComputationTree, Error> {
-    let span = prog
+pub fn check(prog: Vec<Positioned<Sym>>) -> Result<ComputationTree, Error> {
+    let pos = prog
         .iter()
-        .map(|s| s.span.clone())
-        .fold(0..0, |l, r| l.start..r.end);
+        .map(|s| s.pos.clone())
+        .fold(Position::default(), Position::merge);
     if prog.is_empty() {
-        Err(ComputationError::Empty.spanned(span))
+        Err(ComputationError::Empty.positioned(pos))
     } else {
-        linear_check(prog.iter().map(|s| s.as_ref()).spanned(span))
+        linear_check(prog.iter().map(|s| s.as_ref()).positioned(pos))
     }
 }
 
 #[cfg(test)]
 mod test {
     use parser::*;
+    use utils::PositionedExt;
 
     use crate::check;
 
@@ -223,7 +221,12 @@ mod test {
             Sym::Iota,
             Sym::Literal(Lit::Num("2".to_string())),
         ];
-        let res = check(prog.into_iter().map(|s| s.spanned(0..0)).collect());
+        let res = check(
+            prog.into_iter()
+                .enumerate()
+                .map(|(i, s)| s.spanned(i..i + 1))
+                .collect(),
+        );
         println!("result: {:?}", res);
         assert!(res.is_ok())
     }
@@ -237,9 +240,14 @@ mod test {
             Sym::Iota,
             Sym::Literal(Lit::Num("2".to_string())),
         ];
-        let err = check(prog.into_iter().map(|s| s.spanned(0..0)).collect());
-        println!("result: {:?}", err);
-        assert!(err.is_err())
+        let res = check(
+            prog.into_iter()
+                .enumerate()
+                .map(|(i, s)| s.spanned(i..i + 1))
+                .collect(),
+        );
+        println!("result: {:?}", res);
+        assert!(res.is_err())
     }
 
     #[test]
@@ -252,8 +260,13 @@ mod test {
             Sym::Iota,
             Sym::Literal(Lit::Num("2".to_string())),
         ];
-        let err = check(prog.into_iter().map(|s| s.spanned(0..0)).collect());
-        println!("result: {:?}", err);
-        assert!(err.is_ok())
+        let res = check(
+            prog.into_iter()
+                .enumerate()
+                .map(|(i, s)| s.spanned(i..i + 1))
+                .collect(),
+        );
+        println!("result: {:?}", res);
+        assert!(res.is_err())
     }
 }
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
index 338701d..d435418 100644
--- a/parser/Cargo.toml
+++ b/parser/Cargo.toml
@@ -8,6 +8,7 @@ edition = "2021"
 [dependencies]
 ariadne = "0.1.3"
 chumsky = "0.5.0"
+utils = { path = "../utils" }
 
 [dev-dependencies]
 insta = "1.8.0"
diff --git a/parser/src/lib.rs b/parser/src/lib.rs
index e57bc48..9fdfd74 100644
--- a/parser/src/lib.rs
+++ b/parser/src/lib.rs
@@ -1,14 +1,11 @@
 mod report;
-mod spanned;
 mod token;
 
 use crate::token::Token;
 use chumsky::{prelude::*, Stream};
-use report::Report;
 use report::{report_of_char_error, report_of_token_error};
 use token::lexer;
-
-pub use spanned::*;
+use utils::{report::Report, Positioned, PositionedExt, Reference};
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum Lit {
@@ -34,26 +31,32 @@ pub enum Sym {
     Add,
     Literal(Lit),
     Var(u32),
-    Lambda(Vec<Spanned<Self>>),
+    Lambda(Vec<Positioned<Self>>),
 }
 
 impl Sym {
-    pub fn lambda<I: IntoIterator<Item = Option<Spanned<Self>>>>(inner: I) -> Option<Self> {
+    pub fn lambda<I: IntoIterator<Item = Option<Positioned<Self>>>>(inner: I) -> Option<Self> {
         Some(Self::Lambda(inner.into_iter().collect::<Option<Vec<_>>>()?))
     }
 }
 
 fn literal() -> impl Parser<Token, Lit, Error = Simple<Token>> {
-    use Token::*;
     use token::Dir::*;
+    use Token::*;
     let int = filter_map(|span, tok| match tok {
         Num(n) => Ok(Lit::Num(n)),
         t => Err(Simple::expected_input_found(span, vec![], Some(t))),
     });
-    recursive(|lit| lit.repeated().at_least(1).delimited_by(Bracket(L), Bracket(R)).map(Lit::List).or(int))
+    recursive(|lit| {
+        lit.repeated()
+            .at_least(1)
+            .delimited_by(Bracket(L), Bracket(R))
+            .map(Lit::List)
+            .or(int)
+    })
 }
 
-fn parser() -> impl Parser<Token, Option<Vec<Spanned<Sym>>>, Error = Simple<Token>> {
+fn parser() -> impl Parser<Token, Option<Vec<Positioned<Sym>>>, Error = Simple<Token>> {
     use token::Dir::*;
     use Token::*;
     let var = filter_map(|span, tok| match tok {
@@ -89,7 +92,10 @@ fn parser() -> impl Parser<Token, Option<Vec<Spanned<Sym>>>, Error = Simple<Toke
     .map(|v| v.into_iter().collect::<Option<Vec<_>>>())
 }
 
-pub fn parse(src_id: impl Into<String>, input: &str) -> (Option<Vec<Spanned<Sym>>>, Vec<Report>) {
+pub fn parse(
+    src_id: impl Into<Reference>,
+    input: &str,
+) -> (Option<Vec<Positioned<Sym>>>, Vec<Report>) {
     let src_id = src_id.into();
     let slen = input.len();
     let (tokens, tokerr) = lexer().then_ignore(end()).parse_recovery(input);
@@ -102,16 +108,26 @@ pub fn parse(src_id: impl Into<String>, input: &str) -> (Option<Vec<Spanned<Sym>
             .then_ignore(end())
             .parse_recovery(Stream::from_iter(
                 slen..slen + 1,
-                tokens.into_iter().map(Into::into),
+                tokens
+                    .into_iter()
+                    .map(|tok| (tok.value, tok.pos.span.into())),
             ));
         let tokerr = tokerr
             .chain(
                 err.into_iter()
-                    .map(move |err| report_of_token_error(src_id.clone(), err)),
+                    .map(|err| report_of_token_error(src_id.clone(), err)),
             )
             .collect();
         if let Some(Some(instrs)) = instrs {
-            (Some(instrs), tokerr)
+            (
+                Some(
+                    instrs
+                        .into_iter()
+                        .map(|s| s.with_reference(src_id.clone()))
+                        .collect(),
+                ),
+                tokerr,
+            )
         } else {
             (None, tokerr)
         }
@@ -123,21 +139,24 @@ pub fn parse(src_id: impl Into<String>, input: &str) -> (Option<Vec<Spanned<Sym>
 #[cfg(test)]
 mod tests {
     use super::*;
-    use Sym::*;
+
     macro_rules! assert_parse {
-        ($input:expr, [$($e:expr),*]) => {
-            {
-                let input = $input;
-                let (res, err) = parse("<test>", input);
-                insta::assert_display_snapshot!(err.into_iter().map(|r| {
+        ($input:expr, [$($e:expr),*]) => {{
+            let input = $input;
+            let (res, err) = parse("<test>", input);
+            insta::assert_display_snapshot!(err
+                .into_iter()
+                .map(|r| {
                     use ariadne::Source;
                     let mut s = ::std::io::Cursor::new(Vec::new());
-                    r.write(("<test>".into(), Source::from(input)), &mut s).unwrap();
+                    r.write(("<test>".into(), Source::from(input)), &mut s)
+                        .unwrap();
                     String::from_utf8_lossy(&s.into_inner()).to_string()
-                }).collect::<Vec<_>>().join("\n"));
-                insta::assert_debug_snapshot!(res);
-            }
-        };
+                })
+                .collect::<Vec<_>>()
+                .join("\n"));
+            insta::assert_debug_snapshot!(res);
+        }};
     }
     #[test]
     fn test_ski() {
diff --git a/parser/src/report.rs b/parser/src/report.rs
index 414ca81..44cebd9 100644
--- a/parser/src/report.rs
+++ b/parser/src/report.rs
@@ -1,79 +1,81 @@
-use ariadne::{Color, Fmt};
+use ariadne::{Color, Fmt, ReportKind};
 use chumsky::{error::SimpleReason, prelude::Simple};
-use std::ops::Range;
+use std::rc::Rc;
 
 use crate::token::Token;
+use utils::{report::*, Position, PositionedExt, Reference};
 
-pub type SrcId = (String, Range<usize>);
-pub type Report = ariadne::Report<SrcId>;
-pub type Label = ariadne::Label<SrcId>;
-
-pub(crate) fn report_of_char_error(src_id: impl Into<String>, err: Simple<char>) -> Report {
-    let id = (src_id.into(), err.span());
-    let report = Report::build(ariadne::ReportKind::Error, id.0.clone(), err.span().start);
+pub(crate) fn report_of_char_error(src_id: impl Into<Reference>, err: Simple<char>) -> Report {
+    let pos = Position::spanned(err.span()).with_reference(src_id);
     match err.reason() {
-        SimpleReason::Unclosed { span, delimiter } => report
-            .with_message(format!(
-                "Unclosed delimiter {}",
-                delimiter.fg(Color::Yellow)
-            ))
-            .with_label(
-                Label::new((id.0.clone(), span.clone()))
-                    .with_color(Color::Blue)
-                    .with_message(format!("Unclosed delimiter is here")),
-            )
-            .finish(),
-        SimpleReason::Unexpected => report
-            .with_message(if let Some(found) = err.found() {
-                format!("Unexpected input {}", found.fg(Color::Red))
-            } else {
-                format!("Unexpected input")
-            })
-            .with_label(Label::new(id).with_color(Color::Blue).with_message(format!(
+        SimpleReason::Unclosed { span, delimiter } => {
+            format!("Unclosed delimiter {}", delimiter.fg(Color::Yellow))
+                .positioned(pos.clone())
+                .into_report(ReportKind::Error)
+                .with_label(
+                    "Unclosed delimiter is here"
+                        .positioned(pos)
+                        .into_label()
+                        .with_color(Color::Blue),
+                )
+                .finish()
+        }
+        SimpleReason::Unexpected => if let Some(found) = err.found() {
+            format!("Unexpected input {}", found.fg(Color::Red))
+        } else {
+            format!("Unexpected input")
+        }
+        .positioned(pos.clone())
+        .into_report(ReportKind::Error)
+        .with_label(
+            Label::new(pos)
+                .with_color(Color::Blue)
+                .with_message(format!(
                     "Unexpected token {}",
                     err.expected()
                         .map(|t| t.fg(Color::Cyan).to_string())
                         .collect::<Vec<_>>()
                         .join(", ")
-                )))
-            .finish(),
-        SimpleReason::Custom(msg) => report
-            .with_message(msg)
-            .finish(),
+                )),
+        )
+        .finish(),
+        SimpleReason::Custom(msg) => msg.positioned(pos).into_report(ReportKind::Error).finish(),
     }
 }
 
-pub(crate) fn report_of_token_error(src_id: impl Into<String>, err: Simple<Token>) -> Report {
-    let id = (src_id.into(), err.span());
-    let report = Report::build(ariadne::ReportKind::Error, id.0.clone(), err.span().start);
+pub(crate) fn report_of_token_error(src_id: impl Into<Reference>, err: Simple<Token>) -> Report {
+    let pos = Position::spanned(err.span()).with_reference(src_id);
     match err.reason() {
-        SimpleReason::Unclosed { span, delimiter } => report
-            .with_message(format!(
-                "Unclosed delimiter {}",
-                delimiter.fg(Color::Yellow)
-            ))
-            .with_label(
-                Label::new((id.0.clone(), span.clone()))
-                    .with_color(Color::Blue)
-                    .with_message(format!("Unclosed delimiter is here")),
-            )
-            .finish(),
-        SimpleReason::Unexpected => report
-            .with_message(if let Some(found) = err.found() {
-                format!("Unexpected input {}", found.fg(Color::Red))
-            } else {
-                format!("Unexpected input")
-            })
-            .with_label(Label::new(id).with_color(Color::Blue).with_message(format!(
+        SimpleReason::Unclosed { span, delimiter } => {
+            format!("Unclosed delimiter {}", delimiter.fg(Color::Yellow))
+                .positioned(pos.clone())
+                .into_report(ReportKind::Error)
+                .with_label(
+                    Label::new(pos)
+                        .with_color(Color::Blue)
+                        .with_message(format!("Unclosed delimiter is here")),
+                )
+                .finish()
+        }
+        SimpleReason::Unexpected => (if let Some(found) = err.found() {
+            format!("Unexpected input {}", found.fg(Color::Red))
+        } else {
+            format!("Unexpected input")
+        })
+        .positioned(pos.clone())
+        .into_report(ReportKind::Error)
+        .with_label(
+            Label::new(pos)
+                .with_color(Color::Blue)
+                .with_message(format!(
                     "Expecting one of {}",
                     err.expected()
                         .map(|v| v.fg(Color::Cyan).to_string())
                         .collect::<Vec<_>>()
                         .join(", ")
-                )))
-            .finish(),
-        SimpleReason::Custom(msg) => report
-            .with_message(msg)
-            .finish(),
+                )),
+        )
+        .finish(),
+        SimpleReason::Custom(msg) => msg.positioned(pos).into_report(ReportKind::Error).finish(),
     }
 }
diff --git a/parser/src/spanned.rs b/parser/src/spanned.rs
deleted file mode 100644
index 3f59f1e..0000000
--- a/parser/src/spanned.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use std::{error::Error, fmt::{self, Display}, ops::{Range, Deref}};
-
-pub type Span = Range<usize>;
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Spanned<T> {
-    pub span: Span,
-    pub value: T,
-}
-
-impl<T> Deref for Spanned<T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        &self.value
-    }
-}
-
-impl<T> From<Spanned<T>> for (T, Span) {
-    fn from(s: Spanned<T>) -> Self {
-        (s.value, s.span)
-    }
-}
-
-impl<T: Display> fmt::Display for Spanned<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { 
-        write!(f, "{}:{}: {}", self.span.start, self.span.end, self.value)
-    }
-}
-
-impl<T: Error> Error for Spanned<T> {
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
-        self.value.source()
-    }
-}
-
-impl<T> Spanned<T> {
-    pub fn as_ref(&self) -> Spanned<&T> {
-        (&self.value).spanned(self.span.clone())
-    }
-}
-
-pub trait SpannedExt: Sized {
-    fn spanned(self, span: Span) -> Spanned<Self> {
-        Spanned { span, value: self }
-    }
-}
-
-impl<T> SpannedExt for T {}
diff --git a/parser/src/token.rs b/parser/src/token.rs
index d9c4b98..36ef6ac 100644
--- a/parser/src/token.rs
+++ b/parser/src/token.rs
@@ -10,7 +10,7 @@ use chumsky::{
 pub use Dir::*;
 pub use Token::*;
 
-use crate::spanned::{Spanned, SpannedExt};
+use utils::{Positioned, PositionedExt};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum Dir {
@@ -44,9 +44,8 @@ impl fmt::Display for Token {
     }
 }
 
-pub(crate) fn lexer() -> impl Parser<char, Vec<Spanned<Token>>, Error = Simple<char>> {
-    let op = filter(char::is_ascii_punctuation)
-        .map(|c| Op(c.to_string()));
+pub(crate) fn lexer() -> impl Parser<char, Vec<Positioned<Token>>, Error = Simple<char>> {
+    let op = filter(char::is_ascii_punctuation).map(|c| Op(c.to_string()));
     let ident = ident().map(Ident);
     let num = int(10).map(Num);
     let parens = just('(').to(Paren(L)).or(just(')').to(Paren(R)));
diff --git a/repl/Cargo.toml b/repl/Cargo.toml
index 0cf2d2b..bcc4c89 100644
--- a/repl/Cargo.toml
+++ b/repl/Cargo.toml
@@ -10,3 +10,4 @@ ariadne = "*"
 computations = { path = "../computations" }
 parser = { path = "../parser" }
 rustyline = "9"
+utils = { path = "../utils" }
diff --git a/repl/src/main.rs b/repl/src/main.rs
index 8d4ca59..05520cb 100644
--- a/repl/src/main.rs
+++ b/repl/src/main.rs
@@ -1,15 +1,13 @@
-use ariadne::{Label, ReportKind, Source};
+use ariadne::{Color, ReportKind, Source};
 use computations::check;
 use parser::parse;
 use rustyline::{error::ReadlineError, Editor};
-use std::ops::Range;
+use utils::{PositionedExt, Reference};
 
 const HISTORYFILE: &str = "/tmp/ulp-repl.history";
 
-type SrcId = (String, Range<usize>);
-type Report = ariadne::Report<SrcId>;
-
 fn main() {
+    let reference = Reference::from("<repl>");
     let mut rl = Editor::<()>::new();
     rl.load_history(HISTORYFILE).unwrap_or(());
 
@@ -17,20 +15,20 @@ fn main() {
         match rl.readline("ULP> ") {
             Ok(line) => {
                 rl.add_history_entry(&line);
-                let (ast, errors) = parse("<repl>", &line);
+                let (ast, errors) = parse(reference.clone(), &line);
                 for err in errors {
-                    err.eprint(("<repl>".to_string(), Source::from(&line)))
-                        .unwrap();
+                    err.eprint(("<repl>".into(), Source::from(&line))).unwrap();
                 }
                 if let Some(ast) = ast {
                     match check(ast) {
                         Ok(comp) => println!("Computation {:#?}", comp),
-                        Err(err) => Report::build(ReportKind::Error, "<repl>", err.span.start)
-                            .with_label(Label::new(("<repl>".into(), err.span)).with_color(ariadne::Color::Red).with_message(err.value.to_string()))
-                            .with_message("Check error")
+                        Err(err) => "Check error"
+                            .positioned(err.pos.clone().with_reference("<repl>"))
+                            .into_report(ReportKind::Error)
+                            .with_label(err.into_label().with_color(Color::Red))
                             .with_note("The structure is correct, however ULP could not figure out how to compute the expression.")
                             .finish()
-                            .eprint(("<repl>".to_string(), Source::from(&line)))
+                            .eprint((reference.clone(), Source::from(&line)))
                             .unwrap(),
                     }
                 }
diff --git a/utils/src/lib.rs b/utils/src/lib.rs
index d810c66..02cf12a 100644
--- a/utils/src/lib.rs
+++ b/utils/src/lib.rs
@@ -43,26 +43,58 @@ impl Span {
     }
 }
 
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub struct Reference(Option<Rc<str>>);
+
+impl<'a> From<&'a str> for Reference {
+    fn from(s: &'a str) -> Self {
+        Self(Some(s.into()))
+    }
+}
+
+impl From<String> for Reference {
+    fn from(s: String) -> Self {
+        Self(Some(s.into()))
+    }
+}
+
+impl fmt::Display for Reference {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if let Some(s) = self.0.as_deref() {
+            write!(f, "{}", s)
+        } else {
+            write!(f, "<unknown>")
+        }
+    }
+}
+
+impl Reference {
+    pub fn or(self, other: Self) -> Self {
+        Self(self.0.or(other.0))
+    }
+}
+
 #[derive(Debug, Default, Clone, PartialEq, Eq)]
 pub struct Position {
-    pub reference: Option<Rc<str>>,
+    pub reference: Reference,
     pub span: Span,
 }
 
 impl fmt::Display for Position {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{}:{}",
-            self.reference.as_deref().unwrap_or("<unknown>"),
-            self.span
-        )
+        write!(f, "{}:{}", self.reference, self.span)
     }
 }
 
 impl Position {
-    pub fn with_reference<S: Into<Rc<str>>>(mut self, reference: S) -> Self {
-        self.reference = Some(reference.into());
+    pub fn spanned<S: Into<Span>>(span: S) -> Self {
+        Self {
+            span: span.into(),
+            ..Default::default()
+        }
+    }
+    pub fn with_reference<S: Into<Reference>>(mut self, reference: S) -> Self {
+        self.reference = reference.into();
         self
     }
 
@@ -74,8 +106,8 @@ impl Position {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Positioned<T> {
-    pos: Position,
-    value: T,
+    pub pos: Position,
+    pub value: T,
 }
 
 impl<T: fmt::Display> fmt::Display for Positioned<T> {
@@ -132,7 +164,7 @@ impl<T> Positioned<T> {
         self.value
     }
 
-    pub fn with_reference<S: Into<Rc<str>>>(self, reference: S) -> Self {
+    pub fn with_reference<S: Into<Reference>>(self, reference: S) -> Self {
         Self {
             pos: self.pos.with_reference(reference),
             value: self.value,
@@ -175,35 +207,16 @@ impl<T> Positioned<Option<T>> {
 }
 
 pub trait PositionedExt: Sized {
-    fn positioned<St: Into<Rc<str>>, Sp: Into<Span>>(
-        self,
-        span: Sp,
-        reference: St,
-    ) -> Positioned<Self> {
-        Positioned {
-            pos: Position {
-                reference: Some(reference.into()),
-                span: span.into(),
-            },
-            value: self,
-        }
+    fn positioned(self, pos: Position) -> Positioned<Self> {
+        Positioned { pos, value: self }
     }
 
     fn spanned<S: Into<Span>>(self, span: S) -> Positioned<Self> {
-        Positioned {
-            pos: Position::default().with_span(span),
-            value: self,
-        }
+        self.positioned(Position::spanned(span))
     }
 
-    fn referenced<S: Into<Rc<str>>>(self, reference: S) -> Positioned<Self> {
-        Positioned {
-            pos: Position {
-                reference: Some(reference.into()),
-                span: Span::default(),
-            },
-            value: self,
-        }
+    fn referenced<S: Into<Reference>>(self, reference: S) -> Positioned<Self> {
+        self.positioned(Position::default().with_reference(reference))
     }
 }
 
diff --git a/utils/src/report.rs b/utils/src/report.rs
index 27fe9ec..53f129c 100644
--- a/utils/src/report.rs
+++ b/utils/src/report.rs
@@ -1,8 +1,6 @@
-use std::{ops::Deref, rc::Rc};
-
 use ariadne::ReportKind;
 
-use crate::{Position, Positioned};
+use crate::{Position, Positioned, Reference};
 
 pub type SourceId = Position;
 pub type Label = ariadne::Label<SourceId>;
@@ -10,7 +8,7 @@ pub type ReportBuilder = ariadne::ReportBuilder<SourceId>;
 pub type Report = ariadne::Report<SourceId>;
 
 impl ariadne::Span for Position {
-    type SourceId = Option<Rc<str>>;
+    type SourceId = Reference;
 
     fn source(&self) -> &Self::SourceId {
         &self.reference
@@ -30,10 +28,8 @@ impl<T: ToString> Positioned<T> {
         Report::build(kind, self.pos.reference, self.pos.span.start)
             .with_message(self.value.to_string())
     }
-}
 
-impl<T: ToString> Into<Label> for Positioned<T> {
-    fn into(self) -> Label {
+    pub fn into_label(self) -> Label {
         Label::new(self.pos).with_message(self.value.to_string())
     }
 }