diff options
| author | John Hodge <tpg@ucc.asn.au> | 2017-06-11 11:34:16 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2017-06-11 11:34:16 +0800 |
| commit | 52d872b36d7fda733273d70100d21b16506f1647 (patch) | |
| tree | 5f192e2650a0f15893546d484fcc6537786e6a46 /src/macro_rules/eval.cpp | |
| parent | c211c01437ce248d654b0d6ba9b739d1633cce68 (diff) | |
| download | mrust-52d872b36d7fda733273d70100d21b16506f1647.tar.gz | |
Parse - Support chaining of spans (for macro expansions)
Diffstat (limited to 'src/macro_rules/eval.cpp')
| -rw-r--r-- | src/macro_rules/eval.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/macro_rules/eval.cpp b/src/macro_rules/eval.cpp index 18ef563e..1bac45ee 100644 --- a/src/macro_rules/eval.cpp +++ b/src/macro_rules/eval.cpp @@ -618,9 +618,9 @@ bool Macro_TryPatternCap(TokenStream& lex, MacroPatEnt::Type type) switch(type) { case MacroPatEnt::PAT_TOKEN: - BUG(lex.getPosition(), ""); + BUG(lex.point_span(), ""); case MacroPatEnt::PAT_LOOP: - BUG(lex.getPosition(), ""); + BUG(lex.point_span(), ""); case MacroPatEnt::PAT_BLOCK: return LOOK_AHEAD(lex) == TOK_BRACE_OPEN || LOOK_AHEAD(lex) == TOK_INTERPOLATED_BLOCK; case MacroPatEnt::PAT_IDENT: @@ -651,7 +651,7 @@ bool Macro_TryPatternCap(TokenStream& lex, MacroPatEnt::Type type) case MacroPatEnt::PAT_ITEM: return is_token_item( LOOK_AHEAD(lex) ); } - BUG(lex.getPosition(), ""); + BUG(lex.point_span(), "Fell through"); } bool Macro_TryPattern(TokenStream& lex, const MacroPatEnt& pat) { @@ -680,9 +680,9 @@ InterpolatedFragment Macro_HandlePatternCap(TokenStream& lex, MacroPatEnt::Type switch(type) { case MacroPatEnt::PAT_TOKEN: - BUG(lex.getPosition(), "Encountered PAT_TOKEN when handling capture"); + BUG(lex.point_span(), "Encountered PAT_TOKEN when handling capture"); case MacroPatEnt::PAT_LOOP: - BUG(lex.getPosition(), "Encountered PAT_LOOP when handling capture"); + BUG(lex.point_span(), "Encountered PAT_LOOP when handling capture"); case MacroPatEnt::PAT_TT: if( GET_TOK(tok, lex) == TOK_EOF ) |