Let spans be lifetime free.
This commit is contained in:
+6
-6
@@ -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 start = self.cursor.pos();
|
||||||
let end = start + n;
|
let end = start + n;
|
||||||
let span = Span::new(start, &self.input[start..end]);
|
let span = Span::new(start, end);
|
||||||
self.cursor.advance_by(n);
|
self.cursor.advance_by(n);
|
||||||
span
|
span
|
||||||
}
|
}
|
||||||
|
|
||||||
fn emit(&mut self, node: Token, len: usize) -> Spanned<'a, Token> {
|
fn emit(&mut self, node: Token, len: usize) -> Spanned<Token> {
|
||||||
Spanned::new(node, self.consume(len))
|
Spanned::new(node, self.consume(len))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -123,7 +123,7 @@ impl<'a> Lexer<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> Iterator for Lexer<'a> {
|
impl<'a> Iterator for Lexer<'a> {
|
||||||
type Item = Spanned<'a, Token>;
|
type Item = Spanned<Token>;
|
||||||
|
|
||||||
fn next(&mut self) -> Option<Self::Item> {
|
fn next(&mut self) -> Option<Self::Item> {
|
||||||
self.skip_whitespace();
|
self.skip_whitespace();
|
||||||
@@ -232,10 +232,10 @@ mod tests {
|
|||||||
assert_eq!(lexer.next(), None);
|
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!(
|
assert_eq!(
|
||||||
lexer.next(),
|
lexer.next(),
|
||||||
Some(Spanned::new(node, Span::new(offset, raw)))
|
Some(Spanned::new(node, Span::new(start, start + raw.len())))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
|
||||||
+13
-17
@@ -1,39 +1,35 @@
|
|||||||
#[derive(Debug, PartialEq, Eq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
pub struct Span<'a> {
|
pub struct Span {
|
||||||
start: usize,
|
start: usize,
|
||||||
raw: &'a str,
|
end: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> Span<'a> {
|
impl Span {
|
||||||
pub fn new(start: usize, raw: &'a str) -> Self {
|
pub fn new(start: usize, end: usize) -> Self {
|
||||||
Span { start, raw }
|
Span { start, end }
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn start(&self) -> usize {
|
pub fn start(&self) -> usize {
|
||||||
self.start
|
self.start
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn raw(&self) -> &'a str {
|
pub fn end(&self) -> usize {
|
||||||
self.raw
|
self.end
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn len(&self) -> usize {
|
pub fn len(&self) -> usize {
|
||||||
self.raw.len()
|
self.end - self.start
|
||||||
}
|
|
||||||
|
|
||||||
pub fn end(&self) -> usize {
|
|
||||||
self.start + self.raw.len()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Eq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
pub struct Spanned<'a, T> {
|
pub struct Spanned<T> {
|
||||||
node: T,
|
node: T,
|
||||||
span: Span<'a>,
|
span: Span,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, T> Spanned<'a, T> {
|
impl<T> Spanned<T> {
|
||||||
pub fn new(node: T, span: Span<'a>) -> Self {
|
pub fn new(node: T, span: Span) -> Self {
|
||||||
Spanned { node, span }
|
Spanned { node, span }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,7 +37,7 @@ impl<'a, T> Spanned<'a, T> {
|
|||||||
&self.node
|
&self.node
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn span(&self) -> &Span<'a> {
|
pub fn span(&self) -> &Span {
|
||||||
&self.span
|
&self.span
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user