rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use new module namespace syntax.

Browse Source
This commit is contained in:
Lindsey Kuper
2011-05-13 11:00:26 -07:00
committed by Graydon Hoare
parent b6f35c6a4b
commit 814b17352c
4 changed files with 90 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
src/comp/front/parser.rs
View File

@@ -773,6 +773,63 @@ fn parse_bottom_expr(parser p) -> @ast::expr {
some(token::COMMA),
pf, hi, p);
ex = ast::expr_vec(es, mut, p.get_ann());
} else if (eat_word(p, "obj")) {
// Anonymous object
// FIXME: Can anonymous objects have ty params?
auto ty_params = parse_ty_params(p);
// Only make people type () if they're actually adding new fields
let option::t[vec[ast::obj_field]] fields =
none[vec[ast::obj_field]];
if (p.peek() == token::LPAREN) {
auto pf = parse_obj_field;
hi = p.get_hi_pos();
expect(p, token::LPAREN);
fields = some[vec[ast::obj_field]]
(parse_seq_to_end[ast::obj_field]
(token::RPAREN,
some(token::COMMA),
pf, hi, p));
}
let vec[@ast::method] meths = vec();
let option::t[ast::ident] with_obj = none[ast::ident];
expect(p, token::LBRACE);
while (p.peek() != token::RBRACE) {
alt (p.peek()) {
case (token::WITH) {
p.bump();
with_obj = some[ast::ident](parse_ident(p));
}
case (_) {
_vec::push[@ast::method](meths,
parse_method(p));
}
}
}
hi = p.get_hi_pos();
expect(p, token::RBRACE);
// fields and methods may be *additional* or *overriding* fields
// and methods if there's a with_obj, or they may be the *only*
// fields and methods if there's no with_obj.
// We don't need to pull ".node" out of fields because it's not a
// "spanned".
let ast::anon_obj ob = rec(fields=fields,
methods=meths,
with_obj=with_obj);
auto odid = rec(ty=p.next_def_id(), ctor=p.next_def_id());
ex = ast::expr_anon_obj(ob, ty_params, odid, p.get_ann());
} else if (eat_word(p, "rec")) {
expect(p, token::LPAREN);
auto fields = vec(parse_field(p));
@@ -798,71 +855,6 @@ fn parse_bottom_expr(parser p) -> @ast::expr {
}
ex = ast::expr_rec(fields, base, p.get_ann());
}
// Anonymous object
else if (eat_word(p, "obj")) {
// FIXME: Can anonymous objects have ty params?
auto ty_params = parse_ty_params(p);
// Only make people type () if they're actually adding new fields
let option.t[vec[ast::obj_field]] fields = none[vec[ast::obj_field]];
if (p.peek() == token::LPAREN) {
auto pf = parse_obj_field;
expect(p, token::LBRACE);
while (p.peek() != token::RBRACE) {
alt (p.peek()) {
case (token.WITH) {
p.bump();
with_obj = some[ast::ident](parse_ident(p));
}
case (_) {
Vec.push[@ast::method](meths,
parse_method(p));
}
}
}
hi = p.get_hi_pos();
expect(p, token::LPAREN);
fields = some[vec[ast::obj_field]]
(parse_seq_to_end[ast::obj_field]
(token::RPAREN,
some(token::COMMA),
pf, hi, p));
}
let vec[@ast::method] meths = vec();
let option.t[ast::ident] with_obj = none[ast::ident];
expect(p, token::LBRACE);
while (p.peek() != token::RBRACE) {
alt (p.peek()) {
case (token::WITH) {
with_obj = some[ast::ident](parse_ident(p));
}
case (_) {
// fall through
}
}
}
hi = p.get_hi_pos();
expect(p, token::RBRACE);
// fields and methods may be *additional* or *overriding* fields and
// methods if there's a with_obj, or they may be the *only* fields and
// methods if there's no with_obj.
// We don't need to pull ".node" out of fields because it's not a
// "spanned".
let ast::anon_obj ob = rec(fields=fields,
methods=meths,
with_obj=with_obj);
auto odid = rec(ty=p.next_def_id(), ctor=p.next_def_id());
ex = ast::expr_anon_obj(ob, ty_params, odid, ast::ann_none);
} else if (eat_word(p, "bind")) {
auto e = parse_expr_res(p, RESTRICT_NO_CALL_EXPRS);
fn parse_expr_opt(parser p) -> option::t[@ast::expr] {