Restructure macro expansion to correctly fit rustc's model

1 files changed, 9 insertions, 0 deletions

diff --git a/src/parse/expr.cpp b/src/parse/expr.cpp
index b9a3d003..12aa3d3a 100644
--- a/src/parse/expr.cpp
+++ b/src/parse/expr.cpp
@@ -640,6 +640,7 @@ bool Parse_IsTokValue(eTokenType tok_type)
     

     case TOK_MACRO:

     

+    case TOK_PIPE:

     case TOK_EXCLAM:

     case TOK_DASH:

     case TOK_STAR:

@@ -1297,3 +1298,11 @@ TokenTree Parse_TT_Block(TokenStream& lex)
     

     throw ParseError::Todo("Parse_TT_Block");

 }

+TokenTree Parse_TT_Meta(TokenStream& lex)

+{   

+    TRACE_FUNCTION;

+    TTLexer wlex(lex);

+    SET_PARSE_FLAG(wlex, no_expand_macros);

+    Parse_MetaItem(wlex);

+    return wlex.get_output();

+}