diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-04-29 06:52:01 +1000 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-05-05 07:06:12 +1000 |
| commit | 99f5945f85342e1eff8d31507410ddd66ea94d64 (patch) | |
| tree | 6594fd89e3820be4bfa2b6d99ec0447c4fc1c1ff /compiler/rustc_codegen_llvm/src | |
| parent | ae5f67f9e8a560c66d1c4afea1750d21f1d093e7 (diff) | |
| download | rust-99f5945f85342e1eff8d31507410ddd66ea94d64.tar.gz rust-99f5945f85342e1eff8d31507410ddd66ea94d64.zip | |
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.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
0 files changed, 0 insertions, 0 deletions
