From a33cce2592c2f83096fd11b123396815d33b3745 Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Fri, 13 Nov 2026 21:01:56 +0100 Subject: [PATCH] Let spans be lifetime free. --- src/lexer.rs | 12 ++++++------ src/parser.rs | 1 + src/span.rs | 30 +++++++++++++----------------- 3 files changed, 20 insertions(+), 23 deletions(-) create mode 100644 src/parser.rs diff --git a/src/lexer.rs b/src/lexer.rs index 2da47e0..c284471 100644 --- a/src/lexer.rs +++ b/src/lexer.rs @@ -43,15 +43,15 @@ impl<'a> Lexer<'a> { } } - fn consume(&mut self, n: usize) -> Span<'a> { + fn consume(&mut self, n: usize) -> Span { let start = self.cursor.pos(); let end = start + n; - let span = Span::new(start, &self.input[start..end]); + let span = Span::new(start, end); self.cursor.advance_by(n); span } - fn emit(&mut self, node: Token, len: usize) -> Spanned<'a, Token> { + fn emit(&mut self, node: Token, len: usize) -> Spanned { Spanned::new(node, self.consume(len)) } @@ -123,7 +123,7 @@ impl<'a> Lexer<'a> { } impl<'a> Iterator for Lexer<'a> { - type Item = Spanned<'a, Token>; + type Item = Spanned; fn next(&mut self) -> Option { self.skip_whitespace(); @@ -232,10 +232,10 @@ mod tests { assert_eq!(lexer.next(), None); } - fn assert_next_token(lexer: &mut Lexer, node: Token, raw: &str, offset: usize) { + fn assert_next_token(lexer: &mut Lexer, node: Token, raw: &str, start: usize) { assert_eq!( lexer.next(), - Some(Spanned::new(node, Span::new(offset, raw))) + Some(Spanned::new(node, Span::new(start, start + raw.len()))) ); } } diff --git a/src/parser.rs b/src/parser.rs new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/parser.rs @@ -0,0 +1 @@ + diff --git a/src/span.rs b/src/span.rs index 1fb0145..2e67035 100644 --- a/src/span.rs +++ b/src/span.rs @@ -1,39 +1,35 @@ #[derive(Debug, PartialEq, Eq)] -pub struct Span<'a> { +pub struct Span { start: usize, - raw: &'a str, + end: usize, } -impl<'a> Span<'a> { - pub fn new(start: usize, raw: &'a str) -> Self { - Span { start, raw } +impl Span { + pub fn new(start: usize, end: usize) -> Self { + Span { start, end } } pub fn start(&self) -> usize { self.start } - pub fn raw(&self) -> &'a str { - self.raw + pub fn end(&self) -> usize { + self.end } pub fn len(&self) -> usize { - self.raw.len() - } - - pub fn end(&self) -> usize { - self.start + self.raw.len() + self.end - self.start } } #[derive(Debug, PartialEq, Eq)] -pub struct Spanned<'a, T> { +pub struct Spanned { node: T, - span: Span<'a>, + span: Span, } -impl<'a, T> Spanned<'a, T> { - pub fn new(node: T, span: Span<'a>) -> Self { +impl Spanned { + pub fn new(node: T, span: Span) -> Self { Spanned { node, span } } @@ -41,7 +37,7 @@ impl<'a, T> Spanned<'a, T> { &self.node } - pub fn span(&self) -> &Span<'a> { + pub fn span(&self) -> &Span { &self.span } }