---

yaml
---
r: 79341
b: refs/heads/try
c: a42e36a
h: refs/heads/master
i:
  79339: aea9009
v: v3

Author: jbclements

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e6de6b7da8ee88bf84b0e217900051334be08da
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 60fba4d7d677ec098e6a43014132fe99f7547363
-refs/heads/try: d1d7b199ec883aecbaa305784aed0cecf6adf9a0
+refs/heads/try: a42e36a816e600c5c40e2044bf06ee1625d4ebd6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -1462,10 +1462,14 @@ mod test {
         pprust::print_mod(s, &crate.module, crate.attrs);
     }
 
-    //fn expand_and_resolve(crate_str: @str) -> ast::crate {
-        //let (crate_ast,ps) = string_to_crate_and_sess(crate_str);
+    fn expand_crate_str(crate_str: @str) -> @ast::Crate {
+        let (crate_ast,ps) = string_to_crate_and_sess(crate_str);
         // the cfg argument actually does matter, here...
-        //let expanded_ast = expand_crate(ps,~[],crate_ast);
+        expand_crate(ps,~[],crate_ast)
+    }
+
+    //fn expand_and_resolve(crate_str: @str) -> ast::crate {
+        //let expanded_ast = expand_crate_str(crate_str);
         // std::io::println(fmt!("expanded: %?\n",expanded_ast));
         //mtwt_resolve_crate(expanded_ast)
     //}