greg/just
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Parser::forbid (#712)

Browse Source
This commit is contained in:
Casey Rodarmor 2020-10-25 23:57:08 -07:00 committed by GitHub
parent bdf1c92251
commit 3643a0dff0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/parser.rs
View File

@ -230,6 +230,20 @@ impl<'tokens, 'src> Parser<'tokens, 'src> {
}
}
/// Return an error if the next token is of kind `forbidden`
fn forbid<F>(&self, forbidden: TokenKind, error: F) -> CompilationResult<'src, ()>
where
F: FnOnce(Token) -> CompilationError,
{
let next = self.next()?;
if next.kind == forbidden {
Err(error(next))
} else {
Ok(())
}
}
/// Accept a token of kind `Identifier` and parse into a `Name`
fn accept_name(&mut self) -> CompilationResult<'src, Option<Name<'src>>> {
if self.next_is(Identifier) {
@ -511,15 +525,11 @@ impl<'tokens, 'src> Parser<'tokens, 'src> {
let variadic = if kind.is_variadic() {
let variadic = self.parse_parameter(kind)?;
let next = self.next()?;
if next.kind == Identifier {
return Err(
next.error(CompilationErrorKind::ParameterFollowsVariadicParameter {
parameter: next.lexeme(),
}),
);
}
self.forbid(Identifier, |token| {
token.error(CompilationErrorKind::ParameterFollowsVariadicParameter {
parameter: token.lexeme(),
})
})?;
Some(variadic)
} else {