Overhaul `MacArgs::Eq`.
The value in `MacArgs::Eq` is currently represented as a `Token`.
Because of `TokenKind::Interpolated`, `Token` can be either a token or
an arbitrary AST fragment. In practice, a `MacArgs::Eq` starts out as a
literal or macro call AST fragment, and then is later lowered to a
literal token. But this is very non-obvious. `Token` is a much more
general type than what is needed.
This commit restricts things, by introducing a new type `MacArgsEqKind`
that is either an AST expression (pre-lowering) or an AST literal
(post-lowering). The downside is that the code is a bit more verbose in
a few places. The benefit is that makes it much clearer what the
possibilities are (though also shorter in some other places). Also, it
removes one use of `TokenKind::Interpolated`, taking us a step closer to
removing that variant, which will let us make `Token` impl `Copy` and
remove many "handle Interpolated" code paths in the parser.
Things to note:
- Error messages have improved. Messages like this:
```
unexpected token: `"bug" + "found"`
```
now say "unexpected expression", which makes more sense. Although
arbitrary expressions can exist within tokens thanks to
`TokenKind::Interpolated`, that's not obvious to anyone who doesn't
know compiler internals.
- In `parse_mac_args_common`, we no longer need to collect tokens for
the value expression.
2022-04-28 15:52:01 -05:00
|
|
|
error: unexpected expression: `|x| [b; x]`
|
2021-11-15 13:40:29 -06:00
|
|
|
--> $DIR/issue-90878-2.rs:1:7
|
|
|
|
|
|
|
|
|
|
|
LL | #![l=|x|[b;x ]]
|
|
|
|
|
| ^^^^^^^^^
|
|
|
|
|
|
|
|
|
|
error: cannot find attribute `l` in this scope
|
|
|
|
|
--> $DIR/issue-90878-2.rs:1:5
|
|
|
|
|
|
|
|
|
|
|
LL | #![l=|x|[b;x ]]
|
|
|
|
|
| ^
|
|
|
|
|
|
2021-11-24 16:07:13 -06:00
|
|
|
error: aborting due to 2 previous errors
|
2021-11-15 13:40:29 -06:00
|
|
|
|
