From a7125971c652393af33fbc7121edfd4ecb7307eb Mon Sep 17 00:00:00 2001 From: Paul Stansifer Date: Fri, 27 Jul 2012 11:19:21 -0700 Subject: [PATCH] Rename `#mod` -> `#module` to not collide with the keyword. --- src/libsyntax/ext/base.rs | 2 +- src/libsyntax/ext/expand.rs | 7 +++++-- src/test/run-pass/syntax-extension-source-utils.rs | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index b35bd9a17e9..4a2bdf4cde5 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -103,7 +103,7 @@ fn syntax_expander_table() -> hashmap<~str, syntax_extension> { builtin(ext::source_util::expand_include_str)); syntax_expanders.insert(~"include_bin", builtin(ext::source_util::expand_include_bin)); - syntax_expanders.insert(~"mod", + syntax_expanders.insert(~"module", builtin(ext::source_util::expand_mod)); syntax_expanders.insert(~"proto", builtin_item_tt(ext::pipes::expand_proto)); diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index caa5fd417a8..38d6477a2f9 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -162,8 +162,8 @@ fn expand_mod_items(exts: hashmap<~str, syntax_extension>, cx: ext_ctxt, ret {items: new_items with module}; } -// Support for item-position macro invocations, exactly the same -// logic as for expression-position macro invocations. + +// When we enter a module, record it, for the sake of `module!` fn expand_item(exts: hashmap<~str, syntax_extension>, cx: ext_ctxt, &&it: @ast::item, fld: ast_fold, orig: fn@(&&@ast::item, ast_fold) -> option<@ast::item>) @@ -191,6 +191,9 @@ fn expand_item(exts: hashmap<~str, syntax_extension>, } } + +// Support for item-position macro invocations, exactly the same +// logic as for expression-position macro invocations. fn expand_item_mac(exts: hashmap<~str, syntax_extension>, cx: ext_ctxt, &&it: @ast::item, fld: ast_fold) -> option<@ast::item> { diff --git a/src/test/run-pass/syntax-extension-source-utils.rs b/src/test/run-pass/syntax-extension-source-utils.rs index 1ed41491fc3..582b1d9a7d3 100644 --- a/src/test/run-pass/syntax-extension-source-utils.rs +++ b/src/test/run-pass/syntax-extension-source-utils.rs @@ -3,7 +3,7 @@ mod m1 { mod m2 { - fn where_am_i() -> ~str { #mod[] } + fn where_am_i() -> ~str { #module[] } } }