wackbyte/able-script
1
0
Fork 0
forked from AbleScript/ablescript
Code Issues Pull requests Projects Releases Wiki Activity

Used checked next in require

Browse source
This commit is contained in:
Erin 2022-03-20 02:20:55 +01:00 committed by ondra05
parent 77c201476b
commit 04b44fb01e
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ablescript/src/parser.rs
View file

@ -120,11 +120,10 @@ impl<'source> Parser<'source> {
} }
/// Require next item to be equal with expected one /// Require next item to be equal with expected one
fn require(&mut self, expected: Token) -> Result<(), Error> { fn require(&mut self, required: Token) -> Result<(), Error> {
match self.lexer.next() { match self.checked_next()? {
Some(t) if t == expected => Ok(()), t if t == required => Ok(()),
Some(t) => Err(Error::new(ErrorKind::UnexpectedToken(t), self.lexer.span())), t => Err(Error::new(ErrorKind::UnexpectedToken(t), self.lexer.span())),
None => Err(Error::unexpected_eof(self.lexer.span().start)),
} }
} }
@ -176,7 +175,7 @@ impl<'source> Parser<'source> {
})), })),
start..self.lexer.span().end, start..self.lexer.span().end,
)), )),
Token::LeftBracket => match buf.take() { Token::LeftBracket => match buf.take() {
Some(buf) => Ok(Expr::new( Some(buf) => Ok(Expr::new(
self.index_flow(buf)?, self.index_flow(buf)?,