---

yaml
---
r: 11013
b: refs/heads/master
c: 485e489
h: refs/heads/master
i:
  11011: 98a3808
v: v3

Author: kevina

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 98450d0dade3c9a1b91a3384426cc4e824b82052
+refs/heads/master: 485e489ba2cb025bb84606396b1cea3023c8c99c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/comp/rustc.rc

@@ -74,6 +74,7 @@ mod syntax {
     mod ext {
         mod base;
         mod expand;
+        mod qquote;
         mod build;
 
         mod fmt;

trunk/src/comp/syntax/ext/expand.rs

@@ -8,6 +8,7 @@ import vec;
 import syntax::ast::{crate, expr_, expr_mac, mac_invoc, mac_qq};
 import syntax::fold::*;
 import syntax::ext::base::*;
+import syntax::ext::qquote::expand_qquote;
 import syntax::parse::parser::parse_expr_from_source_str;
 
 import codemap::span;
@@ -53,13 +54,6 @@ fn expand_expr(exts: hashmap<str, syntax_extension>, cx: ext_ctxt,
         };
 }
 
-fn expand_qquote(cx: ext_ctxt, sp: span, e: @ast::expr) -> ast::expr_ {
-    import syntax::ext::build::*;
-    let str = codemap::span_to_snippet(sp, cx.session().parse_sess.cm);
-    let expr = mk_str(cx, e.span, str);
-    ret expr.node;
-}
-
 // FIXME: this is a terrible kludge to inject some macros into the default
 // compilation environment. When the macro-definition system is substantially
 // more mature, these should move from here, into a compiled part of libcore

trunk/src/comp/syntax/ext/qquote.rs

@@ -0,0 +1,38 @@
+import driver::session;
+
+import option::{none, some};
+
+import syntax::ast::{crate, expr_, expr_mac, mac_invoc, mac_qq};
+import syntax::fold::*;
+import syntax::ext::base::*;
+import syntax::ext::build::*;
+import syntax::parse::parser::parse_expr_from_source_str;
+
+import codemap::span;
+
+fn expand_qquote(cx: ext_ctxt, sp: span, _e: @ast::expr) -> ast::expr_ {
+    let str = codemap::span_to_snippet(sp, cx.session().parse_sess.cm);
+    let session_call = bind mk_call_(cx,sp,
+                                     mk_access(cx,sp,["ext_cx"], "session"),
+                                     []);
+    let call = mk_call(cx,sp,
+                       ["syntax", "parse", "parser",
+                        "parse_expr_from_source_str"],
+                       [mk_str(cx,sp, "<anon>"),
+                        mk_unary(cx,sp, ast::box(ast::imm),
+                                 mk_str(cx,sp, str)),
+                        mk_access_(cx,sp,
+                                   mk_access_(cx,sp, session_call(), "opts"),
+                                   "cfg"),
+                        mk_access_(cx,sp, session_call(), "parse_sess")]
+                      );
+    ret call.node;
+}
+
+// Local Variables:
+// mode: rust
+// fill-column: 78;
+// indent-tabs-mode: nil
+// c-basic-offset: 4
+// buffer-file-coding-system: utf-8-unix
+// End: