Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Typestate 4 #339

Closed
wants to merge 7 commits into from
Closed

Typestate 4 #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
85567e2
Further work on typestate_check
catamorphism Apr 20, 2011
30df202
Support all expression forms in typestate
catamorphism Apr 22, 2011
4e4debe
Fixed bug in typeck that wasn't filling in anns for stmts
catamorphism Apr 22, 2011
f721849
Change err to span_err for "expected value but found type" error
catamorphism Apr 22, 2011
5377fd7
Fix bug in handling of expr_alt (postcond for alts was being intersec…
catamorphism Apr 22, 2011
3772d37
Make typeck.ast_ty_to_ty print out an error message instead of just f…
catamorphism Apr 22, 2011
d908ec5
Make rustc's typestate pass happy by adding a fail in a case that
catamorphism Apr 23, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/comp/middle/trans.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1953,6 +1953,13 @@ fn make_drop_glue(@block_ctxt cx, ValueRef v0, ty.t t) {
ty.type_is_nil(cx.fcx.lcx.ccx.tystore, t)) {
rslt = res(cx, C_nil());
}
else {
// task, native_fn, var, local, param, bound_param
cx.fcx.lcx.ccx.sess.bug
("unexpected type in trans.make_drop_glue: " +
ty.ty_to_str(cx.fcx.lcx.ccx.tystore, t));
fail;
}
}
}

Expand Down
84 changes: 50 additions & 34 deletions src/comp/middle/typeck.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ fn substitute_ty_params(&@crate_ctxt ccx,


// Returns the type parameter count and the type for the given definition.
fn ty_param_count_and_ty_for_def(@fn_ctxt fcx, &ast.def defn)
fn ty_param_count_and_ty_for_def(@fn_ctxt fcx, &ast.span sp, &ast.def defn)
-> ty_param_count_and_ty {
alt (defn) {
case (ast.def_arg(?id)) {
Expand Down Expand Up @@ -153,7 +153,7 @@ fn ty_param_count_and_ty_for_def(@fn_ctxt fcx, &ast.def defn)
}

case (ast.def_ty(_)) {
fcx.ccx.sess.err("expected value but found type");
fcx.ccx.sess.span_err(sp, "expected value but found type");
fail;
}

Expand Down Expand Up @@ -205,23 +205,28 @@ fn instantiate_path(@fn_ctxt fcx, &ast.path pth, &ty_param_count_and_ty tpt,
// Parses the programmer's textual representation of a type into our internal
// notion of a type. `getter` is a function that returns the type
// corresponding to a definition ID.
fn ast_ty_to_ty(@ty.type_store tystore,
fn ast_ty_to_ty(session.session sess,
@ty.type_store tystore,
ty_getter getter,
&@ast.ty ast_ty) -> ty.t {
fn ast_arg_to_arg(@ty.type_store tystore,
fn ast_arg_to_arg(session.session sess,
@ty.type_store tystore,
ty_getter getter,
&rec(ast.mode mode, @ast.ty ty) arg)
-> rec(ast.mode mode, ty.t ty) {
ret rec(mode=arg.mode, ty=ast_ty_to_ty(tystore, getter, arg.ty));
ret rec(mode=arg.mode, ty=ast_ty_to_ty(sess, tystore,
getter, arg.ty));
}

fn ast_mt_to_mt(@ty.type_store tystore,
fn ast_mt_to_mt(session.session sess,
@ty.type_store tystore,
ty_getter getter,
&ast.mt mt) -> ty.mt {
ret rec(ty=ast_ty_to_ty(tystore, getter, mt.ty), mut=mt.mut);
ret rec(ty=ast_ty_to_ty(sess, tystore, getter, mt.ty), mut=mt.mut);
}

fn instantiate(@ty.type_store tystore,
fn instantiate(session.session sess,
@ty.type_store tystore,
ty_getter getter,
ast.def_id id,
vec[@ast.ty] args) -> ty.t {
Expand All @@ -240,7 +245,8 @@ fn ast_ty_to_ty(@ty.type_store tystore,
auto bound_ty = bind_params_in_type(tystore, params_opt_and_ty._1);
let vec[ty.t] param_bindings = vec();
for (@ast.ty ast_ty in args) {
param_bindings += vec(ast_ty_to_ty(tystore, getter, ast_ty));
param_bindings += vec(ast_ty_to_ty(sess, tystore,
getter, ast_ty));
}
ret ty.substitute_type_params(tystore, param_bindings, bound_ty);
}
Expand All @@ -258,66 +264,73 @@ fn ast_ty_to_ty(@ty.type_store tystore,
case (ast.ty_char) { typ = ty.mk_char(tystore); }
case (ast.ty_str) { typ = ty.mk_str(tystore); }
case (ast.ty_box(?mt)) {
typ = ty.mk_box(tystore, ast_mt_to_mt(tystore, getter, mt));
typ = ty.mk_box(tystore, ast_mt_to_mt(sess, tystore, getter, mt));
}
case (ast.ty_vec(?mt)) {
typ = ty.mk_vec(tystore, ast_mt_to_mt(tystore, getter, mt));
typ = ty.mk_vec(tystore, ast_mt_to_mt(sess, tystore, getter, mt));
}

case (ast.ty_port(?t)) {
typ = ty.mk_port(tystore, ast_ty_to_ty(tystore, getter, t));
typ = ty.mk_port(tystore, ast_ty_to_ty(sess, tystore, getter, t));
}

case (ast.ty_chan(?t)) {
typ = ty.mk_chan(tystore, ast_ty_to_ty(tystore, getter, t));
typ = ty.mk_chan(tystore, ast_ty_to_ty(sess, tystore, getter, t));
}

case (ast.ty_tup(?fields)) {
let vec[ty.mt] flds = vec();
for (ast.mt field in fields) {
_vec.push[ty.mt](flds, ast_mt_to_mt(tystore, getter, field));
_vec.push[ty.mt](flds, ast_mt_to_mt(sess, tystore,
getter, field));
}
typ = ty.mk_tup(tystore, flds);
}
case (ast.ty_rec(?fields)) {
let vec[field] flds = vec();
for (ast.ty_field f in fields) {
auto tm = ast_mt_to_mt(tystore, getter, f.mt);
auto tm = ast_mt_to_mt(sess, tystore, getter, f.mt);
_vec.push[field](flds, rec(ident=f.ident, mt=tm));
}
typ = ty.mk_rec(tystore, flds);
}

case (ast.ty_fn(?proto, ?inputs, ?output)) {
auto f = bind ast_arg_to_arg(tystore, getter, _);
auto f = bind ast_arg_to_arg(sess, tystore, getter, _);
auto i = _vec.map[ast.ty_arg, arg](f, inputs);
auto out_ty = ast_ty_to_ty(tystore, getter, output);
auto out_ty = ast_ty_to_ty(sess, tystore, getter, output);
typ = ty.mk_fn(tystore, proto, i, out_ty);
}

case (ast.ty_path(?path, ?def)) {
check (def != none[ast.def]);
alt (option.get[ast.def](def)) {
case (ast.def_ty(?id)) {
typ = instantiate(tystore, getter, id, path.node.types);
typ = instantiate(sess, tystore, getter,
id, path.node.types);
}
case (ast.def_native_ty(?id)) { typ = getter(id)._1; }
case (ast.def_obj(?id)) {
typ = instantiate(tystore, getter, id, path.node.types);
typ = instantiate(sess, tystore, getter,
id, path.node.types);
}
case (ast.def_ty_arg(?id)) { typ = ty.mk_param(tystore, id); }
case (_) { fail; }
case (_) {
sess.span_err(ast_ty.span,
"found type name used as a variable");
fail;
}
}

cname = some(path_to_str(path));
}

case (ast.ty_obj(?meths)) {
let vec[ty.method] tmeths = vec();
auto f = bind ast_arg_to_arg(tystore, getter, _);
auto f = bind ast_arg_to_arg(sess, tystore, getter, _);
for (ast.ty_method m in meths) {
auto ins = _vec.map[ast.ty_arg, arg](f, m.inputs);
auto out = ast_ty_to_ty(tystore, getter, m.output);
auto out = ast_ty_to_ty(sess, tystore, getter, m.output);
_vec.push[ty.method](tmeths,
rec(proto=m.proto,
ident=m.ident,
Expand Down Expand Up @@ -345,7 +358,7 @@ fn ast_ty_to_ty_crate(@crate_ctxt ccx, &@ast.ty ast_ty) -> ty.t {
ret ty.lookup_item_type(ccx.sess, ccx.tystore, ccx.type_cache, id);
}
auto f = bind getter(ccx, _);
ret ast_ty_to_ty(ccx.tystore, f, ast_ty);
ret ast_ty_to_ty(ccx.sess, ccx.tystore, f, ast_ty);
}


Expand Down Expand Up @@ -422,12 +435,12 @@ mod Collect {

fn ty_of_arg(@ctxt cx, &ast.arg a) -> arg {
auto f = bind getter(cx, _);
ret rec(mode=a.mode, ty=ast_ty_to_ty(cx.tystore, f, a.ty));
ret rec(mode=a.mode, ty=ast_ty_to_ty(cx.sess, cx.tystore, f, a.ty));
}

fn ty_of_method(@ctxt cx, &@ast.method m) -> method {
auto get = bind getter(cx, _);
auto convert = bind ast_ty_to_ty(cx.tystore, get, _);
auto convert = bind ast_ty_to_ty(cx.sess, cx.tystore, get, _);
auto f = bind ty_of_arg(cx, _);
auto inputs = _vec.map[ast.arg,arg](f, m.node.meth.decl.inputs);
auto output = convert(m.node.meth.decl.output);
Expand Down Expand Up @@ -458,7 +471,7 @@ mod Collect {
let vec[arg] t_inputs = vec();
for (ast.obj_field f in obj_info.fields) {
auto g = bind getter(cx, _);
auto t_field = ast_ty_to_ty(cx.tystore, g, f.ty);
auto t_field = ast_ty_to_ty(cx.sess, cx.tystore, g, f.ty);
_vec.push[arg](t_inputs, rec(mode=ast.alias, ty=t_field));
}

Expand All @@ -471,7 +484,7 @@ mod Collect {
fn ty_of_item(@ctxt cx, @ast.item it) -> ty.ty_param_count_and_ty {

auto get = bind getter(cx, _);
auto convert = bind ast_ty_to_ty(cx.tystore, get, _);
auto convert = bind ast_ty_to_ty(cx.sess, cx.tystore, get, _);

alt (it.node) {

Expand Down Expand Up @@ -537,7 +550,7 @@ mod Collect {
case (ast.native_item_fn(?ident, ?lname, ?fn_decl,
?params, ?def_id, _)) {
auto get = bind getter(cx, _);
auto convert = bind ast_ty_to_ty(cx.tystore, get, _);
auto convert = bind ast_ty_to_ty(cx.sess, cx.tystore, get, _);
auto f = bind ty_of_arg(cx, _);
ret ty_of_native_fn_decl(cx, convert, f, fn_decl, abi, params,
def_id);
Expand Down Expand Up @@ -585,7 +598,7 @@ mod Collect {

let vec[arg] args = vec();
for (ast.variant_arg va in variant.node.args) {
auto arg_ty = ast_ty_to_ty(cx.tystore, f, va.ty);
auto arg_ty = ast_ty_to_ty(cx.sess, cx.tystore, f, va.ty);
args += vec(rec(mode=ast.alias, ty=arg_ty));
}
auto tag_t = ty.mk_tag(cx.tystore, tag_id, ty_param_tys);
Expand Down Expand Up @@ -735,7 +748,7 @@ mod Collect {
}
auto g = bind getter(e.cx, _);
for (ast.obj_field fld in ob.fields) {
let ty.t fty = ast_ty_to_ty(e.cx.tystore, g, fld.ty);
let ty.t fty = ast_ty_to_ty(e.cx.sess, e.cx.tystore, g, fld.ty);
let ast.obj_field f = rec(ann=triv_ann(fty)
with fld
);
Expand Down Expand Up @@ -1827,7 +1840,7 @@ fn check_expr(&@fn_ctxt fcx, @ast.expr expr) -> @ast.expr {
check (defopt != none[ast.def]);
auto defn = option.get[ast.def](defopt);

auto tpt = ty_param_count_and_ty_for_def(fcx, defn);
auto tpt = ty_param_count_and_ty_for_def(fcx, expr.span, defn);

if (ty.def_has_ty_params(defn)) {
auto ann = instantiate_path(fcx, pth, tpt, expr.span);
Expand Down Expand Up @@ -2620,23 +2633,26 @@ fn check_stmt(&@fn_ctxt fcx, &@ast.stmt stmt) -> @ast.stmt {
case (ast.decl_local(_)) {
auto decl_1 = check_decl_local(fcx, decl);
ret @fold.respan[ast.stmt_](stmt.span,
ast.stmt_decl(decl_1, a));
ast.stmt_decl(decl_1, plain_ann(fcx.ccx.tystore)));
}

case (ast.decl_item(_)) {
// Ignore for now. We'll return later.
ret @fold.respan[ast.stmt_](stmt.span,
ast.stmt_decl(decl, plain_ann(fcx.ccx.tystore)));
}
}

ret stmt;
// ret stmt;
}

case (ast.stmt_expr(?expr,?a)) {
auto expr_t = check_expr(fcx, expr);
expr_t = Pushdown.pushdown_expr(fcx,
expr_ty(fcx.ccx.tystore, expr_t),
expr_t);
ret @fold.respan[ast.stmt_](stmt.span, ast.stmt_expr(expr_t, a));
ret @fold.respan[ast.stmt_](stmt.span,
ast.stmt_expr(expr_t, plain_ann(fcx.ccx.tystore)));
}
}

Expand Down
Loading