---

yaml
---
r: 8045
b: refs/heads/snap-stage3
c: 35a199c
h: refs/heads/master
i:
  8043: 2b98e5a
v: v3

Author: kevina

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 9090a5c03b3ebcaee98de53ddf13f3204ff9c5f9
+refs/heads/snap-stage3: 35a199c0361946fbab75212c3a7d23ab03520598
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/comp/syntax/codemap.rs

@@ -38,7 +38,7 @@ fn new_filemap_w_substr(filename: filename, substr: file_substr,
 fn new_filemap(filename: filename, src: @str,
                start_pos_ch: uint, start_pos_byte: uint)
     -> filemap {
-    ret new_filemap_w_substr(filename, none, src, 
+    ret new_filemap_w_substr(filename, none, src,
                              start_pos_ch, start_pos_byte);
 }
 

branches/snap-stage3/src/comp/syntax/ext/qquote.rs

@@ -43,23 +43,25 @@ fn is_space(c: char) -> bool {
     syntax::parse::lexer::is_whitespace(c)
 }
 
-fn expand_ast(ecx: ext_ctxt, _sp: span, _arg: ast::mac_arg, body: ast::mac_body)
-    -> @ast::expr 
+fn expand_ast(ecx: ext_ctxt, _sp: span, _arg:
+              ast::mac_arg, body: ast::mac_body)
+    -> @ast::expr
 {
     let body = get_mac_body(ecx,_sp,body);
-    let str = @codemap::span_to_snippet(body.span, ecx.session().parse_sess.cm);
-    let (fname, ss) = codemap::get_substr_info(ecx.session().parse_sess.cm, 
+    let cm = ecx.session().parse_sess.cm;
+    let str = @codemap::span_to_snippet(body.span, cm);
+    let (fname, ss) = codemap::get_substr_info(cm,
                                                body.span.lo, body.span.hi);
-    let {node: e, _} = parse_from_source_str(parser::parse_expr, 
-                                             fname, some(ss), str, 
-                                             ecx.session().opts.cfg, 
+    let {node: e, _} = parse_from_source_str(parser::parse_expr,
+                                             fname, some(ss), str,
+                                             ecx.session().opts.cfg,
                                              ecx.session().parse_sess);
     ret expand_qquote(ecx, e.span, some(*str), e);
 }
 
-fn expand_qquote(ecx: ext_ctxt, sp: span, maybe_str: option::t<str>, 
-                 e: @ast::expr) 
-    -> @ast::expr 
+fn expand_qquote(ecx: ext_ctxt, sp: span, maybe_str: option::t<str>,
+                 e: @ast::expr)
+    -> @ast::expr
 {
     let str = alt(maybe_str) {
       some(s) {s}