---

yaml
---
r: 79227
b: refs/heads/auto
c: 6c6d053
h: refs/heads/master
i:
  79225: 3b9af1e
  79223: e031419
v: v3

Author: jbclements

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 2f6498f7b4be2584d1164d68fc4d5ae485da2ea6
+refs/heads/auto: 6c6d053b0177ed91071128aa5a2f57539e746987
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libsyntax/ext/expand.rs

@@ -1452,10 +1452,6 @@ mod test {
         pprust::print_mod(s, &crate.module, crate.attrs);
     }
 
-    // "fn a() -> int { let b = 13; let c = b; b+c }" --> b & c should get new names, in the expr too.
-    // "macro_rules! f (($x:ident) => ($x + b)) fn a() -> int { let b = 13; f!(b)}" --> one should
-    //     be renamed, one should not.
-
     fn expand_and_resolve_and_pretty_print (crate_str : @str) -> ~str {
         let resolver = new_ident_resolver();
         let resolver_fold = fun_to_ident_folder(resolver);
@@ -1469,10 +1465,20 @@ mod test {
 
     #[test]
     fn automatic_renaming () {
+        // "fn a() -> int { let b = 13; let c = b; b+c }"
+        //    --> b & c should get new names, in the expr too.
+        // "macro_rules! f (($x:ident) => ($x + b)) fn a() -> int { let b = 13; f!(b)}"
+        //    --> one should be renamed, one should not.
+
         let teststrs =
-            ~[@"fn a() -> int { let b = 13; let c = b; b+c }",
-              @"macro_rules! f (($x:ident) => ($x + b)) fn a() -> int { let b = 13; f!(b)}"];
+            ~[// b & c should get new names throughout, in the expr too:
+                @"fn a() -> int { let b = 13; let c = b; b+c }",
+                // the use of b before the + should be renamed, the other one not:
+                @"macro_rules! f (($x:ident) => ($x + b)) fn a() -> int { let b = 13; f!(b)}",
+                // the b before the plus should not be renamed (requires marks)
+                @"macro_rules! f (($x:ident) => ({let b=9; ($x + b)})) fn a() -> int { f!(b)}"];
         for s in teststrs.iter() {
+            // we need regexps to test these!
             std::io::println(expand_and_resolve_and_pretty_print(*s));
         }
     }