File tree 4 files changed +8
-9
lines changed
4 files changed +8
-9
lines changed Original file line number Diff line number Diff line change 1
1
import codemap:: span;
2
2
import ast:: * ;
3
3
4
+ fn spanned < T : copy > ( lo : uint , hi : uint , t : T ) -> spanned < T > {
5
+ ret respan ( mk_sp ( lo, hi) , t) ;
6
+ }
7
+
4
8
fn respan < T : copy > ( sp : span , t : T ) -> spanned < T > {
5
9
ret { node : t, span : sp} ;
6
10
}
Original file line number Diff line number Diff line change 1
1
import either:: { either, left, right} ;
2
+ import ast_util:: spanned;
2
3
import common:: { parse_seq,
3
4
seq_sep,
4
5
expect,
5
- parse_ident,
6
- spanned} ;
6
+ parse_ident} ;
7
7
import parser:: { parse_lit,
8
8
parse_syntax_ext_naked} ;
9
9
Original file line number Diff line number Diff line change 1
1
import std:: map:: { hashmap} ;
2
- import ast :: spanned;
2
+ import ast_util :: spanned;
3
3
import parser:: parser;
4
4
5
5
fn token_to_str ( reader : reader , token : token:: token ) -> str {
@@ -27,10 +27,6 @@ fn expect(p: parser, t: token::token) {
27
27
}
28
28
}
29
29
30
- fn spanned < T : copy > ( lo : uint , hi : uint , node : T ) -> spanned < T > {
31
- ret { node : node, span : ast_util:: mk_sp ( lo, hi) } ;
32
- }
33
-
34
30
fn parse_ident ( p : parser ) -> ast:: ident {
35
31
alt p. token {
36
32
token:: IDENT ( i, _) { p. bump ( ) ; ret p. get_str ( i) ; }
Original file line number Diff line number Diff line change @@ -4,8 +4,7 @@ import std::map::{hashmap, str_hash};
4
4
import token :: { can_begin_expr, is_ident, is_plain_ident} ;
5
5
import codemap :: { span, fss_none} ;
6
6
import util:: interner;
7
- import ast:: spanned;
8
- import ast_util :: { mk_sp, ident_to_path} ;
7
+ import ast_util :: { spanned, mk_sp, ident_to_path} ;
9
8
import lexer:: reader;
10
9
import prec :: { op_spec, as_prec} ;
11
10
import attr :: { parse_outer_attrs_or_ext,
You can’t perform that action at this time.
0 commit comments