squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rename #mod -> #module to not collide with the keyword.

Browse source
This commit is contained in:
Paul Stansifer 2012-07-27 11:19:21 -07:00
parent f6ce2bd831
commit a7125971c6
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libsyntax/ext/base.rs
View file

@ -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));

7
src/libsyntax/ext/expand.rs
View file

@ -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> {

2
src/test/run-pass/syntax-extension-source-utils.rs
View file

@ -3,7 +3,7 @@
mod m1 {
mod m2 {
fn where_am_i() -> ~str { #mod[] }
fn where_am_i() -> ~str { #module[] }
}
}