mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc: Accept <T> for type parameters in type and item declarations

Browse Source
This commit is contained in:
Patrick Walton 2011-08-15 11:01:03 -07:00
parent 3fd3f35699
commit 91d83f5547
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/comp/syntax/parse/parser.rs
View File

@ -423,13 +423,18 @@ fn parse_type_constraints(p: &parser) -> [@ast::ty_constr] {
fn parse_ty_postfix(orig_t: ast::ty_, p: &parser) -> @ast::ty {
let lo = p.get_lo_pos();
if p.peek() == token::LBRACKET {
if p.peek() == token::LBRACKET || p.peek() == token::LT {
let end;
if p.peek() == token::LBRACKET {
end = token::RBRACKET;
} else {
end = token::GT;
}
// This is explicit type parameter instantiation.
p.bump();
let seq =
parse_seq_to_end(token::RBRACKET, some(token::COMMA),
parse_ty, p);
let seq = parse_seq_to_end(end, some(token::COMMA), parse_ty, p);
alt orig_t {
ast::ty_path(pth, ann) {
@ -1725,6 +1730,11 @@ fn parse_ty_params(p: &parser) -> [ast::ty_param] {
parse_seq(token::LBRACKET, token::RBRACKET, some(token::COMMA),
parse_ty_param, p).node;
}
if p.peek() == token::LT {
ty_params =
parse_seq(token::LT, token::GT, some(token::COMMA),
parse_ty_param, p).node;
}
ret ty_params;
}