From 3a4d71443bfcdbba1d14c3d6c7088eaf24e479b8 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Fri, 22 May 2015 22:39:37 +0800
Subject: Restructure macro expansion to correctly fit rustc's model

---
 src/parse/expr.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/parse/expr.cpp')

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();
+}
-- 
cgit v1.2.3