Skip to content

Commit

Permalink
auto merge of #9753 : alexcrichton/rust/macro-attrs, r=brson
Browse files Browse the repository at this point in the history
It's unclear to me why these currently aren't allowed, and my best guess is that
a long time ago we didn't strip the ast of cfg nodes before syntax expansion.
Now that this is done, I'm not certain that we should continue to prohibit this
functionality.

This is a step in the right direction towards #5605, because now we can add an
empty `std::macros` module to the documentation with a bunch of empty macros
explaining how they're supposed to be used.
  • Loading branch information
bors committed Oct 9, 2013
2 parents 6c2cdb3 + 252d17a commit 3a70df1
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 10 deletions.
3 changes: 0 additions & 3 deletions src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4561,9 +4561,6 @@ impl Parser {
|| self.look_ahead(2, |t| *t == token::LPAREN)
|| self.look_ahead(2, |t| *t == token::LBRACE)) {
// MACRO INVOCATION ITEM
if attrs.len() > 0 {
self.fatal("attrs on macros are not yet supported");
}

// item macro.
let pth = self.parse_path(NoTypesAllowed).path;
Expand Down
24 changes: 24 additions & 0 deletions src/test/run-pass/macro-with-attrs1.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// xfail-fast windows doesn't like compile-flags
// compile-flags: --cfg foo

#[feature(macro_rules)];

#[cfg(foo)]
macro_rules! foo( () => (1) )

#[cfg(not(foo))]
macro_rules! foo( () => (2) )

fn main() {
assert_eq!(foo!(), 1);
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
Expand All @@ -8,10 +8,15 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// error-pattern:attrs on macros are not yet supported
#[feature(macro_rules)];

#[cfg(foo)]
macro_rules! foo( () => (1) )

#[cfg(not(foo))]
macro_rules! foo( () => (2) )

pub fn main() {
assert_eq!(foo!(), 2);
}

// Don't know how to deal with a syntax extension appearing after an
// item attribute. Probably could use a better error message.
#[foo = "bar"]
fmt!("baz")
fn main() { }

0 comments on commit 3a70df1

Please sign in to comment.