j/Conlang
1
1
Fork 0
Code Issues 5 Pull Requests Packages Projects 2 Releases Wiki Activity

cl-parser: Misc. cleanup

Browse Source
This commit is contained in:
John 2024-04-13 03:02:54 -05:00
parent 265db668ed
commit 2c36ccc0cf
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cl-parser/src/parser.rs
View File

@ -9,6 +9,7 @@ use cl_lexer::Lexer;
use cl_token::token_type::Op; use cl_token::token_type::Op;
/// Parses a sequence of [Tokens](Token) into an [AST](cl_ast) /// Parses a sequence of [Tokens](Token) into an [AST](cl_ast)
#[derive(Debug)]
pub struct Parser<'t> { pub struct Parser<'t> {
/// Lazy tokenizer /// Lazy tokenizer
lexer: Lexer<'t>, lexer: Lexer<'t>,
@ -35,14 +36,13 @@ impl<'t> Parser<'t> {
/// Internal impl of peek and consume /// Internal impl of peek and consume
fn consume_from_lexer(&mut self, while_parsing: Parsing) -> PResult<Token> { fn consume_from_lexer(&mut self, while_parsing: Parsing) -> PResult<Token> {
loop { loop {
match self let tok = self
.lexer .lexer
.scan() .scan()
.map_err(|e| self.error(e.into(), while_parsing))? .map_err(|e| self.error(e.into(), while_parsing))?;
{ match tok.ty {
t if t.ty() == TokenKind::Invalid => continue, TokenKind::Comment | TokenKind::Invalid => continue,
t if t.ty() == TokenKind::Comment => continue, _ => break Ok(tok),
t => break Ok(t),
} }
} }
} }
@ -55,6 +55,10 @@ impl<'t> Parser<'t> {
} }
self.next.as_ref().ok_or_else(|| unreachable!()) self.next.as_ref().ok_or_else(|| unreachable!())
} }
/// Looks ahead at the next [Token]'s [TokenKind]
pub fn peek_kind(&mut self, while_parsing: Parsing) -> PResult<TokenKind> {
self.peek(while_parsing).map(|t| t.ty)
}
/// Consumes a previously peeked [Token], returning it. /// Consumes a previously peeked [Token], returning it.
/// Returns [None] when there is no peeked token. /// Returns [None] when there is no peeked token.
/// ///
@ -64,14 +68,9 @@ impl<'t> Parser<'t> {
self.loc = Loc::from(&self.lexer); self.loc = Loc::from(&self.lexer);
self.next.take() self.next.take()
} }
/// Looks ahead at the next [Token]'s [TokenKind]
pub fn peek_kind(&mut self, while_parsing: Parsing) -> PResult<TokenKind> {
self.peek(while_parsing).map(|t| t.ty())
}
/// Consumes one [Token] /// Consumes one [Token]
pub fn consume(&mut self, while_parsing: Parsing) -> PResult<Token> { pub fn consume(&mut self, while_parsing: Parsing) -> PResult<Token> {
self.loc = Loc::from(&self.lexer); match self.consume_peeked() {
match self.next.take() {
Some(token) => Ok(token), Some(token) => Ok(token),
None => self.consume_from_lexer(while_parsing), None => self.consume_from_lexer(while_parsing),
} }