---

yaml
---
r: 22846
b: refs/heads/master
c: a712597
h: refs/heads/master
v: v3

Author: paulstansifer

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f6ce2bd83155a2fa3103d61229540649bfe8bc9d
+refs/heads/master: a7125971c652393af33fbc7121edfd4ecb7307eb
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/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));

trunk/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> {

trunk/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[] }
     }
 }