diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2012-02-03 17:39:39 -0800 |
|---|---|---|
| committer | Kevin Atkinson <kevina@cs.utah.edu> | 2012-02-03 20:54:18 -0700 |
| commit | 8fc624bc08df5cbb2a507231fe2c91cc56647ac0 (patch) | |
| tree | 51c0507ffde37aabd18b875e5f781571b9c8b582 /src/comp/syntax/ext | |
| parent | dbb13883f79cc4a1d232bd3fa97f0da0b58872bd (diff) | |
| download | rust-8fc624bc08df5cbb2a507231fe2c91cc56647ac0.tar.gz rust-8fc624bc08df5cbb2a507231fe2c91cc56647ac0.zip | |
Fix various drift issues in the qq branch.
Diffstat (limited to 'src/comp/syntax/ext')
| -rw-r--r-- | src/comp/syntax/ext/expand.rs | 3 | ||||
| -rw-r--r-- | src/comp/syntax/ext/qquote.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/comp/syntax/ext/expand.rs b/src/comp/syntax/ext/expand.rs index 20f04bf5cd5..a0bba6eee5c 100644 --- a/src/comp/syntax/ext/expand.rs +++ b/src/comp/syntax/ext/expand.rs @@ -83,7 +83,8 @@ fn expand_crate(sess: session::session, c: @crate) -> @crate { {fold_expr: bind expand_expr(exts, cx, _, _, _, afp.fold_expr) with *afp}; let f = make_fold(f_pre); - let cm = parse_expr_from_source_str("<anon>", @core_macros(), + let cm = parse_expr_from_source_str("<core-macros>", + @core_macros(), sess.opts.cfg, sess.parse_sess); diff --git a/src/comp/syntax/ext/qquote.rs b/src/comp/syntax/ext/qquote.rs index 999c2a2449c..f215d374111 100644 --- a/src/comp/syntax/ext/qquote.rs +++ b/src/comp/syntax/ext/qquote.rs @@ -248,7 +248,7 @@ fn expand_qquote<N: qq_helper> rcall = mk_call(cx,sp, ["syntax", "ext", "qquote", "replace"], [pcall, - mk_vec_e(cx,sp, vec::map(qcx.gather) {|g| + mk_vec_e(cx,sp, vec::map(copy qcx.gather) {|g| mk_call(cx,sp, ["syntax", "ext", "qquote", g.constr], [g.e])}), |