Rollup merge of #139653 - nnethercote:fix-139495, r=petrochenkov
Handle a negated literal in `eat_token_lit`. Fixes #139495. r? `@petrochenkov`
This commit is contained in:
commit
2f873f96e2
3 changed files with 29 additions and 4 deletions
|
@ -2166,10 +2166,15 @@ impl<'a> Parser<'a> {
|
||||||
let expr = self
|
let expr = self
|
||||||
.eat_metavar_seq(mv_kind, |this| this.parse_expr())
|
.eat_metavar_seq(mv_kind, |this| this.parse_expr())
|
||||||
.expect("metavar seq expr");
|
.expect("metavar seq expr");
|
||||||
let ast::ExprKind::Lit(token_lit) = expr.kind else {
|
if let ast::ExprKind::Lit(token_lit) = expr.kind {
|
||||||
panic!("didn't reparse an expr");
|
|
||||||
};
|
|
||||||
Some(token_lit)
|
Some(token_lit)
|
||||||
|
} else if let ast::ExprKind::Unary(UnOp::Neg, inner) = &expr.kind
|
||||||
|
&& let ast::Expr { kind: ast::ExprKind::Lit(_), .. } = **inner
|
||||||
|
{
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
panic!("unexpected reparsed expr: {:?}", expr.kind);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
|
|
7
tests/ui/macros/reparse-expr-issue-139495.rs
Normal file
7
tests/ui/macros/reparse-expr-issue-139495.rs
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
macro_rules! m {
|
||||||
|
($abi : expr) => { extern $abi } //~ ERROR expected expression, found keyword `extern`
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
m!(-2)
|
||||||
|
}
|
13
tests/ui/macros/reparse-expr-issue-139495.stderr
Normal file
13
tests/ui/macros/reparse-expr-issue-139495.stderr
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
error: expected expression, found keyword `extern`
|
||||||
|
--> $DIR/reparse-expr-issue-139495.rs:2:22
|
||||||
|
|
|
||||||
|
LL | ($abi : expr) => { extern $abi }
|
||||||
|
| ^^^^^^ expected expression
|
||||||
|
...
|
||||||
|
LL | m!(-2)
|
||||||
|
| ------ in this macro invocation
|
||||||
|
|
|
||||||
|
= note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||||
|
|
||||||
|
error: aborting due to 1 previous error
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue