diff options
Diffstat (limited to 'src/parse')
| -rw-r--r-- | src/parse/mod.rs | 371 | ||||
| -rw-r--r-- | src/parse/parser.rs | 110 | ||||
| -rw-r--r-- | src/parse/scanner.rs | 2 | ||||
| -rw-r--r-- | src/parse/tokens.rs | 36 |
4 files changed, 271 insertions, 248 deletions
diff --git a/src/parse/mod.rs b/src/parse/mod.rs index 2f34357c..395090af 100644 --- a/src/parse/mod.rs +++ b/src/parse/mod.rs @@ -46,55 +46,55 @@ fn tree(p: &mut Parser) -> SynTree { /// Parse a syntax node. fn node(p: &mut Parser, at_start: bool) -> Option<Spanned<SynNode>> { - let token = p.eat()?; - let span = token.span; - Some(match token.v { + let start = p.pos(); + let node = match p.eat()? { // Spaces. Token::Space(newlines) => { if newlines < 2 { - SynNode::Space.span_with(span) + SynNode::Space } else { - SynNode::Parbreak.span_with(span) + SynNode::Parbreak } } - Token::Text(text) => SynNode::Text(text.into()).span_with(span), + Token::Text(text) => SynNode::Text(text.into()), // Comments. Token::LineComment(_) | Token::BlockComment(_) => return None, // Markup. - Token::Star => SynNode::ToggleBolder.span_with(span), - Token::Underscore => SynNode::ToggleItalic.span_with(span), - Token::Backslash => SynNode::Linebreak.span_with(span), + Token::Star => SynNode::ToggleBolder, + Token::Underscore => SynNode::ToggleItalic, + Token::Backslash => SynNode::Linebreak, Token::Hashtag => { if at_start { - heading(p, span.start).map(SynNode::Heading) + SynNode::Heading(heading(p, start)) } else { - SynNode::Text(p.get(span).into()).span_with(span) + SynNode::Text(p.eaten_from(start).into()) } } - Token::Raw(token) => raw(p, token, span).map(SynNode::Raw), - Token::UnicodeEscape(token) => unicode_escape(p, token, span).map(SynNode::Text), + Token::Raw(token) => SynNode::Raw(raw(p, token)), + Token::UnicodeEscape(token) => SynNode::Text(unicode_escape(p, token, start)), // Functions. Token::LeftBracket => { - p.jump(span.start); - bracket_call(p).map(Expr::Call).map(SynNode::Expr) + p.jump(start); + SynNode::Expr(Expr::Call(bracket_call(p))) } // Bad tokens. - _ => { - p.diag_unexpected(token); + token => { + p.diag_unexpected(token.span_with(start .. p.pos())); return None; } - }) + }; + Some(node.span_with(start .. p.pos())) } /// Parse a heading. -fn heading(p: &mut Parser, start: Pos) -> Spanned<NodeHeading> { +fn heading(p: &mut Parser, start: Pos) -> NodeHeading { // Parse the section depth. let count = p.eat_while(|c| c == Token::Hashtag); - let span = (start, p.pos()); + let span = Span::new(start, p.pos()); let level = (count.min(5) as u8).span_with(span); if count > 5 { p.diag(warning!(span, "section depth larger than 6 has no effect")); @@ -109,26 +109,23 @@ fn heading(p: &mut Parser, start: Pos) -> Spanned<NodeHeading> { } } - NodeHeading { level, contents }.span_with((start, p.pos())) + NodeHeading { level, contents } } /// Parse a raw block. -fn raw(p: &mut Parser, token: TokenRaw, span: Span) -> Spanned<NodeRaw> { +fn raw(p: &mut Parser, token: TokenRaw) -> NodeRaw { let raw = resolve::resolve_raw(token.text, token.backticks); if !token.terminated { - p.diag(error!(span.end, "expected backtick(s)")); + p.diag(error!(p.pos(), "expected backtick(s)")); } - raw.span_with(span) + raw } /// Parse a unicode escape sequence. -fn unicode_escape( - p: &mut Parser, - token: TokenUnicodeEscape, - span: Span, -) -> Spanned<String> { +fn unicode_escape(p: &mut Parser, token: TokenUnicodeEscape, start: Pos) -> String { + let span = Span::new(start, p.pos()); let text = if let Some(c) = resolve::resolve_hex(token.sequence) { c.to_string() } else { @@ -142,29 +139,28 @@ fn unicode_escape( p.diag(error!(span.end, "expected closing brace")); } - text.span_with(span) + text } /// Parse a bracketed function call. -fn bracket_call(p: &mut Parser) -> Spanned<ExprCall> { - let before_bracket = p.pos(); +fn bracket_call(p: &mut Parser) -> ExprCall { p.start_group(Group::Bracket); p.push_mode(TokenMode::Header); // One header is guaranteed, but there may be more (through chaining). let mut outer = vec![]; - let mut inner = bracket_subheader(p); + let mut inner = p.span(|p| bracket_subheader(p)); - while p.eat_if(Token::Chain).is_some() { + while p.eat_if(Token::Chain) { outer.push(inner); - inner = bracket_subheader(p); + inner = p.span(|p| bracket_subheader(p)); } p.pop_mode(); p.end_group(); if p.peek() == Some(Token::LeftBracket) { - let expr = bracket_body(p).map(Lit::Content).map(Expr::Lit); + let expr = p.span(|p| Expr::Lit(Lit::Content(bracket_body(p)))); inner.span.expand(expr.span); inner.v.args.0.push(LitDictEntry { key: None, expr }); } @@ -177,26 +173,26 @@ fn bracket_call(p: &mut Parser) -> Spanned<ExprCall> { inner = top; } - inner.v.span_with((before_bracket, p.pos())) + inner.v } /// Parse one subheader of a bracketed function call. -fn bracket_subheader(p: &mut Parser) -> Spanned<ExprCall> { +fn bracket_subheader(p: &mut Parser) -> ExprCall { p.start_group(Group::Subheader); - let before_name = p.pos(); + let start = p.pos(); p.skip_white(); - let name = ident(p).unwrap_or_else(|| { + let name = p.span(|p| ident(p)).transpose().unwrap_or_else(|| { if p.eof() { - p.diag_expected_at("function name", before_name); + p.diag_expected_at("function name", start); } else { p.diag_expected("function name"); } - Ident(String::new()).span_with(before_name) + Ident(String::new()).span_with(start) }); p.skip_white(); - let args = if p.eat_if(Token::Colon).is_some() { + let args = if p.eat_if(Token::Colon) { dict_contents(p).0 } else { // Ignore the rest if there's no colon. @@ -207,16 +203,110 @@ fn bracket_subheader(p: &mut Parser) -> Spanned<ExprCall> { LitDict::new() }; - ExprCall { name, args }.span_with(p.end_group()) + p.end_group(); + ExprCall { name, args } } /// Parse the body of a bracketed function call. -fn bracket_body(p: &mut Parser) -> Spanned<SynTree> { +fn bracket_body(p: &mut Parser) -> SynTree { p.start_group(Group::Bracket); p.push_mode(TokenMode::Body); let tree = tree(p); p.pop_mode(); - tree.span_with(p.end_group()) + p.end_group(); + tree +} + +/// Parse a parenthesized function call. +fn paren_call(p: &mut Parser, name: Spanned<Ident>) -> ExprCall { + p.start_group(Group::Paren); + let args = dict_contents(p).0; + p.end_group(); + ExprCall { name, args } +} + +/// Parse the contents of a dictionary. +fn dict_contents(p: &mut Parser) -> (LitDict, bool) { + let mut dict = LitDict::new(); + let mut comma_and_keyless = true; + + loop { + p.skip_white(); + if p.eof() { + break; + } + + let entry = if let Some(entry) = dict_entry(p) { + entry + } else { + p.diag_expected("value"); + continue; + }; + + if let Some(key) = &entry.key { + comma_and_keyless = false; + p.deco(Decoration::DictKey.span_with(key.span)); + } + + let behind = entry.expr.span.end; + dict.0.push(entry); + + p.skip_white(); + if p.eof() { + break; + } + + if !p.eat_if(Token::Comma) { + p.diag_expected_at("comma", behind); + } + + comma_and_keyless = false; + } + + let coercable = comma_and_keyless && !dict.0.is_empty(); + (dict, coercable) +} + +/// Parse a single entry in a dictionary. +fn dict_entry(p: &mut Parser) -> Option<LitDictEntry> { + if let Some(ident) = p.span(|p| ident(p)).transpose() { + p.skip_white(); + match p.peek() { + // Key-value pair. + Some(Token::Equals) => { + p.eat_assert(Token::Equals); + p.skip_white(); + if let Some(expr) = expr(p) { + Some(LitDictEntry { + key: Some(ident.map(|id| DictKey::Str(id.0))), + expr, + }) + } else { + None + } + } + + // Function call. + Some(Token::LeftParen) => Some(LitDictEntry { + key: None, + expr: { + let start = ident.span.start; + let call = paren_call(p, ident); + Expr::Call(call).span_with(start .. p.pos()) + }, + }), + + // Just an identifier. + _ => Some(LitDictEntry { + key: None, + expr: ident.map(|id| Expr::Lit(Lit::Ident(id))), + }), + } + } else if let Some(expr) = expr(p) { + Some(LitDictEntry { key: None, expr }) + } else { + None + } } /// Parse an expression: `term (+ term)*`. @@ -248,7 +338,7 @@ fn binops( loop { p.skip_white(); - if let Some(op) = p.eat_map(op) { + if let Some(op) = p.span(|p| p.eat_map(op)).transpose() { p.skip_white(); if let Some(rhs) = operand(p) { @@ -275,87 +365,91 @@ fn binops( /// Parse a factor of the form `-?value`. fn factor(p: &mut Parser) -> Option<Spanned<Expr>> { - if let Some(op) = p.eat_map(|token| match token { + let op = |token| match token { Token::Hyphen => Some(UnOp::Neg), _ => None, - }) { - p.skip_white(); - if let Some(expr) = factor(p) { - let span = op.span.join(expr.span); - let expr = Expr::Unary(ExprUnary { op, expr: expr.map(Box::new) }); - Some(expr.span_with(span)) + }; + + p.span(|p| { + if let Some(op) = p.span(|p| p.eat_map(op)).transpose() { + p.skip_white(); + if let Some(expr) = factor(p) { + Some(Expr::Unary(ExprUnary { op, expr: expr.map(Box::new) })) + } else { + p.diag(error!(op.span, "missing factor")); + None + } } else { - p.diag(error!(op.span, "missing factor")); - None + value(p) } - } else { - value(p) - } + }) + .transpose() } /// Parse a value. -fn value(p: &mut Parser) -> Option<Spanned<Expr>> { - let Spanned { v: token, span } = p.eat()?; - Some(match token { +fn value(p: &mut Parser) -> Option<Expr> { + let start = p.pos(); + Some(match p.eat()? { // Bracketed function call. Token::LeftBracket => { - p.jump(span.start); - let call = bracket_call(p); - let span = call.span; - let node = call.map(Expr::Call).map(SynNode::Expr); - Expr::Lit(Lit::Content(vec![node])).span_with(span) + p.jump(start); + let node = p.span(|p| SynNode::Expr(Expr::Call(bracket_call(p)))); + Expr::Lit(Lit::Content(vec![node])) } // Content expression. Token::LeftBrace => { - p.jump(span.start); - content(p).map(Lit::Content).map(Expr::Lit) + p.jump(start); + Expr::Lit(Lit::Content(content(p))) } // Dictionary or just a parenthesized expression. Token::LeftParen => { - p.jump(span.start); + p.jump(start); parenthesized(p) } // Function or just ident. Token::Ident(id) => { - let ident = Ident(id.into()).span_with(span); + let ident = Ident(id.into()); + let after = p.pos(); p.skip_white(); if p.peek() == Some(Token::LeftParen) { - paren_call(p, ident).map(Expr::Call) + let name = ident.span_with(start .. after); + Expr::Call(paren_call(p, name)) } else { - ident.map(Lit::Ident).map(Expr::Lit) + Expr::Lit(Lit::Ident(ident)) } } // Atomic values. - Token::Bool(b) => Expr::Lit(Lit::Bool(b)).span_with(span), - Token::Number(f) => Expr::Lit(Lit::Float(f)).span_with(span), - Token::Length(l) => Expr::Lit(Lit::Length(l)).span_with(span), - Token::Hex(hex) => color(p, hex, span).map(Lit::Color).map(Expr::Lit), - Token::Str(token) => string(p, token, span).map(Lit::Str).map(Expr::Lit), + Token::Bool(b) => Expr::Lit(Lit::Bool(b)), + Token::Number(f) => Expr::Lit(Lit::Float(f)), + Token::Length(l) => Expr::Lit(Lit::Length(l)), + Token::Hex(hex) => Expr::Lit(Lit::Color(color(p, hex, start))), + Token::Str(token) => Expr::Lit(Lit::Str(string(p, token))), // No value. _ => { - p.jump(span.start); + p.jump(start); return None; } }) } // Parse a content expression: `{...}`. -fn content(p: &mut Parser) -> Spanned<SynTree> { +fn content(p: &mut Parser) -> SynTree { p.start_group(Group::Brace); p.push_mode(TokenMode::Body); let tree = tree(p); p.pop_mode(); - tree.span_with(p.end_group()) + p.end_group(); + tree } /// Parse a parenthesized expression: `(a + b)`, `(1, key="value"). -fn parenthesized(p: &mut Parser) -> Spanned<Expr> { +fn parenthesized(p: &mut Parser) -> Expr { p.start_group(Group::Paren); let (dict, coercable) = dict_contents(p); let expr = if coercable { @@ -363,99 +457,12 @@ fn parenthesized(p: &mut Parser) -> Spanned<Expr> { } else { Expr::Lit(Lit::Dict(dict)) }; - expr.span_with(p.end_group()) -} - -/// Parse a parenthesized function call. -fn paren_call(p: &mut Parser, name: Spanned<Ident>) -> Spanned<ExprCall> { - p.start_group(Group::Paren); - let args = dict_contents(p).0; - let span = name.span.join(p.end_group()); - ExprCall { name, args }.span_with(span) -} - -/// Parse the contents of a dictionary. -fn dict_contents(p: &mut Parser) -> (LitDict, bool) { - let mut dict = LitDict::new(); - let mut comma_and_keyless = true; - - loop { - p.skip_white(); - if p.eof() { - break; - } - - let entry = if let Some(entry) = dict_entry(p) { - entry - } else { - p.diag_expected("value"); - continue; - }; - - if let Some(key) = &entry.key { - comma_and_keyless = false; - p.deco(Decoration::DictKey.span_with(key.span)); - } - - let behind = entry.expr.span.end; - dict.0.push(entry); - - p.skip_white(); - if p.eof() { - break; - } - - if p.eat_if(Token::Comma).is_none() { - p.diag_expected_at("comma", behind); - } - - comma_and_keyless = false; - } - - let coercable = comma_and_keyless && !dict.0.is_empty(); - (dict, coercable) -} - -/// Parse a single entry in a dictionary. -fn dict_entry(p: &mut Parser) -> Option<LitDictEntry> { - if let Some(ident) = ident(p) { - p.skip_white(); - match p.peek() { - // Key-value pair. - Some(Token::Equals) => { - p.eat_assert(Token::Equals); - p.skip_white(); - if let Some(expr) = expr(p) { - Some(LitDictEntry { - key: Some(ident.map(|id| DictKey::Str(id.0))), - expr, - }) - } else { - None - } - } - - // Function call. - Some(Token::LeftParen) => Some(LitDictEntry { - key: None, - expr: paren_call(p, ident).map(Expr::Call), - }), - - // Just an identifier. - _ => Some(LitDictEntry { - key: None, - expr: ident.map(|id| Expr::Lit(Lit::Ident(id))), - }), - } - } else if let Some(expr) = expr(p) { - Some(LitDictEntry { key: None, expr }) - } else { - None - } + p.end_group(); + expr } /// Parse an identifier. -fn ident(p: &mut Parser) -> Option<Spanned<Ident>> { +fn ident(p: &mut Parser) -> Option<Ident> { p.eat_map(|token| match token { Token::Ident(id) => Some(Ident(id.into())), _ => None, @@ -463,23 +470,21 @@ fn ident(p: &mut Parser) -> Option<Spanned<Ident>> { } /// Parse a color. -fn color(p: &mut Parser, hex: &str, span: Span) -> Spanned<RgbaColor> { - RgbaColor::from_str(hex) - .unwrap_or_else(|_| { - // Heal color by assuming black. - p.diag(error!(span, "invalid color")); - RgbaColor::new_healed(0, 0, 0, 255) - }) - .span_with(span) +fn color(p: &mut Parser, hex: &str, start: Pos) -> RgbaColor { + RgbaColor::from_str(hex).unwrap_or_else(|_| { + // Heal color by assuming black. + p.diag(error!(start .. p.pos(), "invalid color")); + RgbaColor::new_healed(0, 0, 0, 255) + }) } /// Parse a string. -fn string(p: &mut Parser, token: TokenStr, span: Span) -> Spanned<String> { +fn string(p: &mut Parser, token: TokenStr) -> String { if !token.terminated { - p.diag_expected_at("quote", span.end); + p.diag_expected_at("quote", p.pos()); } - resolve::resolve_string(token.string).span_with(span) + resolve::resolve_string(token.string) } #[cfg(test)] diff --git a/src/parse/parser.rs b/src/parse/parser.rs index 9d5eb0a9..d34730c8 100644 --- a/src/parse/parser.rs +++ b/src/parse/parser.rs @@ -2,15 +2,16 @@ use std::fmt::{self, Debug, Formatter}; use super::{Scanner, TokenMode, Tokens}; use crate::diagnostic::Diagnostic; -use crate::syntax::{Decoration, Pos, Span, Spanned, Token}; +use crate::syntax::{Decoration, Pos, Span, SpanWith, Spanned, Token}; use crate::Feedback; /// A convenient token-based parser. pub struct Parser<'s> { tokens: Tokens<'s>, - peeked: Option<Spanned<Token<'s>>>, + peeked: Option<Token<'s>>, modes: Vec<TokenMode>, - groups: Vec<(Pos, Group)>, + groups: Vec<Group>, + pos: Pos, f: Feedback, } @@ -22,6 +23,7 @@ impl<'s> Parser<'s> { peeked: None, modes: vec![], groups: vec![], + pos: Pos::ZERO, f: Feedback::new(), } } @@ -39,12 +41,14 @@ impl<'s> Parser<'s> { /// Eat the next token and add a diagnostic that it was not the expected /// `thing`. pub fn diag_expected(&mut self, thing: &str) { + let before = self.pos(); if let Some(found) = self.eat() { + let after = self.pos(); self.diag(error!( - found.span, + before .. after, "expected {}, found {}", thing, - found.v.name(), + found.name(), )); } else { self.diag_expected_at(thing, self.pos()); @@ -89,25 +93,24 @@ impl<'s> Parser<'s> { /// # Panics /// This panics if the next token does not start the given group. pub fn start_group(&mut self, group: Group) { - let start = self.pos(); match group { Group::Paren => self.eat_assert(Token::LeftParen), Group::Bracket => self.eat_assert(Token::LeftBracket), Group::Brace => self.eat_assert(Token::LeftBrace), Group::Subheader => {} } - self.groups.push((start, group)); + self.groups.push(group); } /// Ends the parsing of a group and returns the span of the whole group. /// /// # Panics /// This panics if no group was started. - pub fn end_group(&mut self) -> Span { + pub fn end_group(&mut self) { // Check that we are indeed at the end of the group. debug_assert_eq!(self.peek(), None, "unfinished group"); - let (start, group) = self.groups.pop().expect("unstarted group"); + let group = self.groups.pop().expect("unstarted group"); let end = match group { Group::Paren => Some(Token::RightParen), Group::Bracket => Some(Token::RightBracket), @@ -119,14 +122,12 @@ impl<'s> Parser<'s> { // This `peek()` can't be used directly because it hides the end of // group token. To circumvent this, we drop down to `self.peeked`. self.peek(); - if self.peeked.map(|s| s.v) == Some(token) { - self.peeked = None; + if self.peeked == Some(token) { + self.bump(); } else { self.diag(error!(self.pos(), "expected {}", token.name())); } } - - Span::new(start, self.pos()) } /// Skip whitespace tokens. @@ -136,34 +137,43 @@ impl<'s> Parser<'s> { }); } + /// Execute `f` and return the result alongside the span of everything `f` + /// ate. + pub fn span<T>(&mut self, f: impl FnOnce(&mut Self) -> T) -> Spanned<T> { + let start = self.pos; + f(self).span_with(start .. self.pos) + } + /// Consume the next token. - pub fn eat(&mut self) -> Option<Spanned<Token<'s>>> { + pub fn eat(&mut self) -> Option<Token<'s>> { self.peek()?; - self.peeked.take() + self.bump() } /// Consume the next token if it is the given one. - pub fn eat_if(&mut self, t: Token) -> Option<Spanned<Token<'s>>> { - if self.peek()? == t { self.peeked.take() } else { None } + pub fn eat_if(&mut self, t: Token) -> bool { + if self.peek() == Some(t) { + self.bump(); + true + } else { + false + } } /// Consume the next token if the closure maps it a to `Some`-variant. - pub fn eat_map<T>( - &mut self, - mut f: impl FnMut(Token<'s>) -> Option<T>, - ) -> Option<Spanned<T>> { + pub fn eat_map<T>(&mut self, f: impl FnOnce(Token<'s>) -> Option<T>) -> Option<T> { let token = self.peek()?; - if let Some(t) = f(token) { - self.peeked.take().map(|spanned| spanned.map(|_| t)) - } else { - None + let out = f(token); + if out.is_some() { + self.bump(); } + out } /// Consume the next token, debug-asserting that it is the given one. pub fn eat_assert(&mut self, t: Token) { let next = self.eat(); - debug_assert_eq!(next.map(|s| s.v), Some(t)); + debug_assert_eq!(next, Some(t)); } /// Consume tokens while the condition is true. @@ -182,7 +192,7 @@ impl<'s> Parser<'s> { if f(t) { break; } - self.peeked = None; + self.bump(); count += 1; } count @@ -191,11 +201,11 @@ impl<'s> Parser<'s> { /// Peek at the next token without consuming it. pub fn peek(&mut self) -> Option<Token<'s>> { let token = match self.peeked { - Some(token) => token.v, + Some(token) => token, None => { let token = self.tokens.next()?; self.peeked = Some(token); - token.v + token } }; @@ -207,7 +217,7 @@ impl<'s> Parser<'s> { _ => return Some(token), }; - if self.groups.iter().rev().any(|&(_, g)| g == group) { + if self.groups.contains(&group) { None } else { Some(token) @@ -217,7 +227,7 @@ impl<'s> Parser<'s> { /// Checks whether the next token fulfills a condition. /// /// Returns `false` if there is no next token. - pub fn check(&mut self, f: impl FnMut(Token<'s>) -> bool) -> bool { + pub fn check(&mut self, f: impl FnOnce(Token<'s>) -> bool) -> bool { self.peek().map(f).unwrap_or(false) } @@ -229,30 +239,52 @@ impl<'s> Parser<'s> { /// The position in the string at which the last token ends and next token /// will start. pub fn pos(&self) -> Pos { - self.peeked.map(|s| s.span.start).unwrap_or_else(|| self.tokens.pos()) + self.pos } /// Jump to a position in the source string. pub fn jump(&mut self, pos: Pos) { self.tokens.jump(pos); - self.peeked = None; + self.bump(); } - /// Returns the part of the source string that is spanned by the given span. - pub fn get(&self, span: Span) -> &'s str { - self.scanner().get(span.start.to_usize() .. span.end.to_usize()) + /// Slice a part out of the source string. + pub fn get(&self, span: impl Into<Span>) -> &'s str { + self.tokens.scanner().get(span.into().to_range()) + } + + /// The full source string up to the current index. + pub fn eaten(&self) -> &'s str { + self.tokens.scanner().get(.. self.pos.to_usize()) + } + + /// The source string from `start` to the current index. + pub fn eaten_from(&self, start: Pos) -> &'s str { + self.tokens.scanner().get(start.to_usize() .. self.pos.to_usize()) + } + + /// The remaining source string after the current index. + pub fn rest(&self) -> &'s str { + self.tokens.scanner().get(self.pos.to_usize() ..) } /// The underlying scanner. pub fn scanner(&self) -> Scanner<'s> { - self.tokens.scanner() + let mut scanner = self.tokens.scanner().clone(); + scanner.jump(self.pos.to_usize()); + scanner + } + + /// Set the position to the tokenizer's position and take the peeked token. + fn bump(&mut self) -> Option<Token<'s>> { + self.pos = self.tokens.pos(); + self.peeked.take() } } impl Debug for Parser<'_> { fn fmt(&self, f: &mut Formatter) -> fmt::Result { - let s = self.scanner(); - write!(f, "Parser({}|{})", s.eaten(), s.rest()) + write!(f, "Parser({}|{})", self.eaten(), self.rest()) } } diff --git a/src/parse/scanner.rs b/src/parse/scanner.rs index 38c8736f..b7107979 100644 --- a/src/parse/scanner.rs +++ b/src/parse/scanner.rs @@ -100,7 +100,7 @@ impl<'s> Scanner<'s> { /// Checks whether the next char fulfills a condition. /// /// Returns `false` if there is no next char. - pub fn check(&self, f: impl FnMut(char) -> bool) -> bool { + pub fn check(&self, f: impl FnOnce(char) -> bool) -> bool { self.peek().map(f).unwrap_or(false) } diff --git a/src/parse/tokens.rs b/src/parse/tokens.rs index 354aae7d..77e7e92e 100644 --- a/src/parse/tokens.rs +++ b/src/parse/tokens.rs @@ -5,7 +5,7 @@ use std::fmt::{self, Debug, Formatter}; use super::{is_newline, Scanner}; use crate::length::Length; use crate::syntax::token::*; -use crate::syntax::{is_ident, Pos, Span, SpanWith, Spanned}; +use crate::syntax::{is_ident, Pos}; use TokenMode::*; @@ -53,18 +53,18 @@ impl<'s> Tokens<'s> { } /// The underlying scanner. - pub fn scanner(&self) -> Scanner<'s> { - self.s.clone() + pub fn scanner(&self) -> &Scanner<'s> { + &self.s } } impl<'s> Iterator for Tokens<'s> { - type Item = Spanned<Token<'s>>; + type Item = Token<'s>; /// Parse the next token in the source code. fn next(&mut self) -> Option<Self::Item> { let start = self.s.index(); - let token = match self.s.eat()? { + Some(match self.s.eat()? { // Whitespace with fast path for just a single space. ' ' if !self.s.check(|c| c.is_whitespace()) => Token::Space(0), c if c.is_whitespace() => { @@ -109,10 +109,7 @@ impl<'s> Iterator for Tokens<'s> { // Expressions or just plain text. _ => self.read_text_or_expr(start), - }; - - let end = self.s.index(); - Some(token.span_with(Span::new(start, end))) + }) } } @@ -298,7 +295,7 @@ fn parse_percent(text: &str) -> Option<f64> { mod tests { use super::*; use crate::length::Length; - use crate::parse::tests::{check, s}; + use crate::parse::tests::check; use Token::{ BlockComment as BC, Bool, Chain, Hex, Hyphen as Min, Ident as Id, @@ -317,13 +314,11 @@ mod tests { Token::UnicodeEscape(TokenUnicodeEscape { sequence, terminated }) } - macro_rules! t { ($($tts:tt)*) => {test!(@spans=false, $($tts)*)} } - macro_rules! ts { ($($tts:tt)*) => {test!(@spans=true, $($tts)*)} } - macro_rules! test { - (@spans=$spans:expr, $mode:expr, $src:expr => $($token:expr),*) => { - let exp = vec![$(Into::<Spanned<Token>>::into($token)),*]; + macro_rules! t { + ($mode:expr, $src:expr => $($token:expr),*) => { + let exp = vec![$($token),*]; let found = Tokens::new($src, $mode).collect::<Vec<_>>(); - check($src, exp, found, $spans); + check($src, exp, found, false); } } @@ -479,13 +474,4 @@ mod tests { t!(Header, "(5 - 1) / 2.1" => LP, Num(5.0), S(0), Min, S(0), Num(1.0), RP, S(0), Slash, S(0), Num(2.1)); } - - #[test] - fn tokenize_with_spans() { - ts!(Body, "hello" => s(0, 5, T("hello"))); - ts!(Body, "ab\r\nc" => s(0, 2, T("ab")), s(2, 4, S(1)), s(4, 5, T("c"))); - ts!(Body, "// ab\r\n\nf" => s(0, 5, LC(" ab")), s(5, 8, S(2)), s(8, 9, T("f"))); - ts!(Body, "/*b*/_" => s(0, 5, BC("b")), s(5, 6, Underscore)); - ts!(Header, "a=10" => s(0, 1, Id("a")), s(1, 2, Equals), s(2, 4, Num(10.0))); - } } |