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

Partial implementation of resources

Browse source 
Non-copyability is not enforced yet, and something is still flaky with
dropping of the internal value, so don't actually use them yet. I'm
merging this in so that I don't have to keep merging against new
patches.
This commit is contained in:
Marijn Haverbeke 2011-06-24 18:10:40 +02:00
parent 781a265b88
commit 61fc12d0d0
12 changed files with 198 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/comp/front/parser.rs
View file

@ -139,6 +139,7 @@ fn bad_expr_word_table() -> hashmap[str, ()] {
words.insert("be", ());
words.insert("fail", ());
words.insert("type", ());
words.insert("res", ());
words.insert("check", ());
words.insert("assert", ());
words.insert("claim", ());
@ -1656,7 +1657,6 @@ fn parse_ty_params(&parser p) -> vec[ast::ty_param] {
}
fn parse_fn_decl(&parser p, ast::purity purity) -> ast::fn_decl {
auto pf = parse_arg;
let util::common::spanned[vec[ast::arg]] inputs =
parse_seq(token::LPAREN, token::RPAREN, some(token::COMMA), parse_arg,
p);
@ -1765,10 +1765,9 @@ fn parse_item_obj(&parser p, ast::layer lyr, vec[ast::attribute] attrs) ->
auto lo = p.get_last_lo_pos();
auto ident = parse_value_ident(p);
auto ty_params = parse_ty_params(p);
auto pf = parse_obj_field;
let util::common::spanned[vec[ast::obj_field]] fields =
parse_seq[ast::obj_field](token::LPAREN, token::RPAREN,
some(token::COMMA), pf, p);
some(token::COMMA), parse_obj_field, p);
let vec[@ast::method] meths = [];
let option::t[@ast::method] dtor = none;
expect(p, token::LBRACE);
@ -1784,6 +1783,27 @@ fn parse_item_obj(&parser p, ast::layer lyr, vec[ast::attribute] attrs) ->
p.get_id()), attrs);
}
fn parse_item_res(&parser p, ast::layer lyr, vec[ast::attribute] attrs) ->
@ast::item {
auto lo = p.get_last_lo_pos();
auto ident = parse_value_ident(p);
auto ty_params = parse_ty_params(p);
expect(p, token::LPAREN);
auto t = parse_ty(p);
auto arg_ident = parse_value_ident(p);
expect(p, token::RPAREN);
auto dtor = parse_block(p);
auto decl = rec(inputs=[rec(mode=ast::alias(false), ty=t, ident=arg_ident,
id=p.get_id())],
output=@spanned(lo, lo, ast::ty_nil),
purity=ast::impure_fn,
cf=ast::return,
constraints=[]);
auto f = rec(decl=decl, proto=ast::proto_fn, body=dtor);
ret mk_item(p, lo, dtor.span.hi, ident,
ast::item_res(f, p.get_id(), ty_params, p.get_id()), attrs);
}
fn parse_mod_items(&parser p, token::token term,
vec[ast::attribute] first_item_attrs) -> ast::_mod {
auto view_items = if (vec::len(first_item_attrs) == 0u) {
@ -2028,6 +2048,8 @@ fn parse_item(&parser p, vec[ast::attribute] attrs) -> parsed_item {
ret got_item(parse_item_tag(p, attrs));
} else if (eat_word(p, "obj")) {
ret got_item(parse_item_obj(p, lyr, attrs));
} else if (eat_word(p, "res")) {
ret got_item(parse_item_res(p, lyr, attrs));
} else { ret no_item; }
}