bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Change expr foo[T] syntax to foo::<T>.

Browse source 
This preserves the old syntax for now.
This commit is contained in:
Erick Tryzelaar 2011-08-16 09:03:58 -07:00
parent 9304b7ee59
commit 014c6922e1
2 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/comp/syntax/parse/parser.rs
View file

@ -643,8 +643,8 @@ fn parse_fn_block_arg(p: &parser) -> ast::arg {
ret {mode: m, ty: t, ident: i, id: p.get_id()};
}
fn parse_seq_to_gt[T](sep: option::t[token::token], f: fn(&parser) -> T,
p: &parser) -> [T] {
fn parse_seq_to_before_gt[T](sep: option::t[token::token],
f: fn(&parser) -> T, p: &parser) -> [T] {
let first = true;
let v = ~[];
while p.peek() != token::GT &&
@ -657,11 +657,27 @@ fn parse_seq_to_gt[T](sep: option::t[token::token], f: fn(&parser) -> T,
v += ~[f(p)];
}
ret v;
}
fn parse_seq_to_gt[T](sep: option::t[token::token], f: fn(&parser) -> T,
p: &parser) -> [T] {
let v = parse_seq_to_before_gt(sep, f, p);
expect_gt(p);
ret v;
}
fn parse_seq_lt_gt[T](sep: option::t[token::token], f: fn(&parser) -> T,
p: &parser) -> spanned[[T]] {
let lo = p.get_lo_pos();
expect(p, token::LT);
let result = parse_seq_to_before_gt[T](sep, f, p);
let hi = p.get_hi_pos();
expect_gt(p);
ret spanned(lo, hi, result);
}
fn parse_seq_to_end[T](ket: token::token, sep: option::t[token::token],
f: fn(&parser) -> T , p: &parser) -> [T] {
let val = parse_seq_to_before_end(ket, sep, f, p);
@ -787,6 +803,17 @@ fn parse_path_and_ty_param_substs(p: &parser) -> ast::path {
{global: path.node.global,
idents: path.node.idents,
types: seq.node});
} else if p.peek() == token::MOD_SEP {
p.bump();
let seq = parse_seq_lt_gt(some(token::COMMA), bind parse_ty(_, false),
p);
let hi = seq.span.hi;
path =
spanned(lo, hi,
{global: path.node.global,
idents: path.node.idents,
types: seq.node});
}
ret path;
}