@@ -43,23 +43,25 @@ fn is_space(c: char) -> bool {
43
43
syntax:: parse:: lexer:: is_whitespace ( c)
44
44
}
45
45
46
- fn expand_ast ( ecx : ext_ctxt , _sp : span , _arg : ast:: mac_arg , body : ast:: mac_body )
47
- -> @ast:: expr
46
+ fn expand_ast ( ecx : ext_ctxt , _sp : span , _arg :
47
+ ast:: mac_arg , body : ast:: mac_body )
48
+ -> @ast:: expr
48
49
{
49
50
let body = get_mac_body ( ecx, _sp, body) ;
50
- let str = @codemap:: span_to_snippet ( body. span , ecx. session ( ) . parse_sess . cm ) ;
51
- let ( fname, ss) = codemap:: get_substr_info ( ecx. session ( ) . parse_sess . cm ,
51
+ let cm = ecx. session ( ) . parse_sess . cm ;
52
+ let str = @codemap:: span_to_snippet ( body. span , cm) ;
53
+ let ( fname, ss) = codemap:: get_substr_info ( cm,
52
54
body. span . lo , body. span . hi ) ;
53
- let { node: e , _} = parse_from_source_str ( parser:: parse_expr,
54
- fname, some ( ss) , str,
55
- ecx. session ( ) . opts . cfg ,
55
+ let { node: e , _} = parse_from_source_str ( parser:: parse_expr,
56
+ fname, some ( ss) , str,
57
+ ecx. session ( ) . opts . cfg ,
56
58
ecx. session ( ) . parse_sess ) ;
57
59
ret expand_qquote ( ecx, e. span , some ( * str) , e) ;
58
60
}
59
61
60
- fn expand_qquote ( ecx : ext_ctxt , sp : span , maybe_str : option:: t < str > ,
61
- e : @ast:: expr )
62
- -> @ast:: expr
62
+ fn expand_qquote ( ecx : ext_ctxt , sp : span , maybe_str : option:: t < str > ,
63
+ e : @ast:: expr )
64
+ -> @ast:: expr
63
65
{
64
66
let str = alt ( maybe_str) {
65
67
some ( s) { s}
0 commit comments