about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorHuon Wilson <dbau.pp+github@gmail.com>2013-10-09 23:13:43 +1100
committerHuon Wilson <dbau.pp+github@gmail.com>2013-10-10 09:57:37 +1100
commit4e0822e2538bbff9d53c151adaf37ec1fe29de9e (patch)
treede8c351c0322b7f81cdd176e5f03a4ecd091b6e5 /src/libsyntax
parent3a70df1d3cf12eae47536a96e26c1e7e0030b75a (diff)
downloadrust-4e0822e2538bbff9d53c151adaf37ec1fe29de9e.tar.gz
rust-4e0822e2538bbff9d53c151adaf37ec1fe29de9e.zip
syntax: allow macros to expand to items with attributes.
Fixes #4471.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ext/tt/macro_rules.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs
index de0afe23668..343116df642 100644
--- a/src/libsyntax/ext/tt/macro_rules.rs
+++ b/src/libsyntax/ext/tt/macro_rules.rs
@@ -20,6 +20,7 @@ use ext::tt::macro_parser::{named_match, matched_seq, matched_nonterminal};
 use ext::tt::macro_parser::{parse, parse_or_else, success, failure};
 use parse::lexer::{new_tt_reader, reader};
 use parse::parser::Parser;
+use parse::attr::parser_attr;
 use parse::token::{get_ident_interner, special_idents, gensym_ident, ident_to_str};
 use parse::token::{FAT_ARROW, SEMI, nt_matchers, nt_tt, EOF};
 use print;
@@ -54,12 +55,14 @@ impl AnyMacro for ParserAnyMacro {
         ret
     }
     fn make_item(&self) -> Option<@ast::item> {
-        let ret = self.parser.parse_item(~[]);     // no attrs
+        let attrs = self.parser.parse_outer_attributes();
+        let ret = self.parser.parse_item(attrs);
         self.ensure_complete_parse(false);
         ret
     }
     fn make_stmt(&self) -> @ast::Stmt {
-        let ret = self.parser.parse_stmt(~[]);     // no attrs
+        let attrs = self.parser.parse_outer_attributes();
+        let ret = self.parser.parse_stmt(attrs);
         self.ensure_complete_parse(true);
         ret
     }