bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Continue parsing function after finding ... arg

Browse source 
When encountering a variadic argument in a function definition that
doesn't accept it, if immediately after there's a closing paren,
continue parsing as normal. Otherwise keep current behavior of emitting
error and stopping.
This commit is contained in:
Esteban Küber 2018-02-11 22:10:35 -08:00
parent d0f1f42816
commit f7cabc6550
3 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/libsyntax/parse/parser.rs
View file

@ -4859,19 +4859,30 @@ impl<'a> Parser<'a> {
|p| {
if p.token == token::DotDotDot {
p.bump();
variadic = true;
if allow_variadic {
if p.token != token::CloseDelim(token::Paren) {
let span = p.span;
p.span_err(span,
"`...` must be last in argument list for variadic function");
}
Ok(None)
} else {
let span = p.span;
p.span_err(span,
"only foreign functions are allowed to be variadic");
let span = p.prev_span;
if p.token == token::CloseDelim(token::Paren) {
// continue parsing to present any further errors
p.struct_span_err(
span,
"only foreign functions are allowed to be variadic"
).emit();
Ok(Some(dummy_arg(span)))
} else {
// this function definition looks beyond recovery, stop parsing
p.span_err(span,
"only foreign functions are allowed to be variadic");
Ok(None)
}
}
variadic = true;
Ok(None)
} else {
match p.parse_arg_general(named_args) {
Ok(arg) => Ok(Some(arg)),