2011-05-12 10:24:54 -05:00
|
|
|
import std::map::hashmap;
|
2011-07-05 04:48:19 -05:00
|
|
|
import syntax::ast;
|
2011-11-10 10:41:42 -06:00
|
|
|
import ast::{ty, pat};
|
|
|
|
import syntax::codemap::{span};
|
2011-07-26 09:47:13 -05:00
|
|
|
import syntax::visit;
|
2011-07-05 04:48:19 -05:00
|
|
|
import syntax::print;
|
2011-06-15 13:19:50 -05:00
|
|
|
|
2011-08-12 09:15:18 -05:00
|
|
|
type flag = hashmap<str, ()>;
|
2010-08-18 13:34:47 -05:00
|
|
|
|
2011-09-12 04:27:30 -05:00
|
|
|
fn def_eq(a: ast::def_id, b: ast::def_id) -> bool {
|
2011-07-26 07:06:02 -05:00
|
|
|
ret a.crate == b.crate && a.node == b.node;
|
2011-03-08 13:59:38 -06:00
|
|
|
}
|
|
|
|
|
2011-09-12 04:27:30 -05:00
|
|
|
fn hash_def(d: ast::def_id) -> uint {
|
2011-07-27 07:19:39 -05:00
|
|
|
let h = 5381u;
|
2011-07-26 07:06:02 -05:00
|
|
|
h = (h << 5u) + h ^ (d.crate as uint);
|
|
|
|
h = (h << 5u) + h ^ (d.node as uint);
|
2011-03-31 13:55:28 -05:00
|
|
|
ret h;
|
|
|
|
}
|
2010-10-19 16:54:10 -05:00
|
|
|
|
2012-01-05 08:35:37 -06:00
|
|
|
fn new_def_hash<V: copy>() -> std::map::hashmap<ast::def_id, V> {
|
2011-08-12 09:15:18 -05:00
|
|
|
let hasher: std::map::hashfn<ast::def_id> = hash_def;
|
|
|
|
let eqer: std::map::eqfn<ast::def_id> = def_eq;
|
2011-08-13 02:09:25 -05:00
|
|
|
ret std::map::mk_hashmap::<ast::def_id, V>(hasher, eqer);
|
2010-10-19 16:54:10 -05:00
|
|
|
}
|
|
|
|
|
2011-09-12 04:27:30 -05:00
|
|
|
fn field_expr(f: ast::field) -> @ast::expr { ret f.node.expr; }
|
2011-04-12 14:16:21 -05:00
|
|
|
|
2011-09-12 04:27:30 -05:00
|
|
|
fn field_exprs(fields: [ast::field]) -> [@ast::expr] {
|
2011-08-19 17:16:48 -05:00
|
|
|
let es = [];
|
|
|
|
for f: ast::field in fields { es += [f.node.expr]; }
|
2011-07-06 21:00:00 -05:00
|
|
|
ret es;
|
2011-04-12 14:16:21 -05:00
|
|
|
}
|
|
|
|
|
2011-12-22 16:42:52 -06:00
|
|
|
fn log_expr(e: ast::expr) {
|
2011-12-22 19:53:53 -06:00
|
|
|
log(debug, print::pprust::expr_to_str(@e));
|
2011-12-22 16:42:52 -06:00
|
|
|
}
|
Further work on typestate_check
Lots of work on typestate_check, seems to get a lot of the way
through checking the standard library.
* Added for, for_each, assign_op, bind, cast, put, check, break,
and cont. (I'm not sure break and cont are actually handled correctly.)
* Fixed side-effect bug in seq_preconds so that unioning the
preconditions of a sequence of statements or expressions
is handled correctly.
* Pass poststate correctly through a stmt_decl.
* Handle expr_ret and expr_fail properly (after execution of a ret
or fail, everything is true -- this is needed to handle ifs and alts
where one branch is a ret or fail)
* Fixed bug in set_prestate_ann where a thing that needed to be
mutated wasn't getting passed as an alias
* Fixed bug in how expr_alt was treated (zero is not the identity
for intersect, who knew, right?)
* Update logging to reflect log_err vs. log
* Fixed find_locals so as to return all local decls and exclude
function arguments.
* Make union_postconds work on an empty vector (needed to handle
empty blocks correctly)
* Added _vec.cat_options, which takes a list of option[T] to a list
of T, ignoring any Nones
* Added two test cases.
2011-04-20 14:11:01 -05:00
|
|
|
|
2011-12-22 16:42:52 -06:00
|
|
|
fn log_expr_err(e: ast::expr) {
|
2011-12-22 19:53:53 -06:00
|
|
|
log(error, print::pprust::expr_to_str(@e));
|
2011-12-22 16:42:52 -06:00
|
|
|
}
|
Further work on typestate_check
Lots of work on typestate_check, seems to get a lot of the way
through checking the standard library.
* Added for, for_each, assign_op, bind, cast, put, check, break,
and cont. (I'm not sure break and cont are actually handled correctly.)
* Fixed side-effect bug in seq_preconds so that unioning the
preconditions of a sequence of statements or expressions
is handled correctly.
* Pass poststate correctly through a stmt_decl.
* Handle expr_ret and expr_fail properly (after execution of a ret
or fail, everything is true -- this is needed to handle ifs and alts
where one branch is a ret or fail)
* Fixed bug in set_prestate_ann where a thing that needed to be
mutated wasn't getting passed as an alias
* Fixed bug in how expr_alt was treated (zero is not the identity
for intersect, who knew, right?)
* Update logging to reflect log_err vs. log
* Fixed find_locals so as to return all local decls and exclude
function arguments.
* Make union_postconds work on an empty vector (needed to handle
empty blocks correctly)
* Added _vec.cat_options, which takes a list of option[T] to a list
of T, ignoring any Nones
* Added two test cases.
2011-04-20 14:11:01 -05:00
|
|
|
|
2011-12-22 16:42:52 -06:00
|
|
|
fn log_ty_err(t: @ty) {
|
2011-12-22 19:53:53 -06:00
|
|
|
log(error, print::pprust::ty_to_str(t));
|
2011-12-22 16:42:52 -06:00
|
|
|
}
|
2011-05-14 21:02:30 -05:00
|
|
|
|
2011-12-22 16:42:52 -06:00
|
|
|
fn log_pat_err(p: @pat) {
|
2011-12-22 19:53:53 -06:00
|
|
|
log(error, print::pprust::pat_to_str(p));
|
2011-12-22 16:42:52 -06:00
|
|
|
}
|
2011-05-14 21:02:30 -05:00
|
|
|
|
2011-12-22 16:42:52 -06:00
|
|
|
fn log_block(b: ast::blk) {
|
2011-12-22 19:53:53 -06:00
|
|
|
log(debug, print::pprust::block_to_str(b));
|
2011-12-22 16:42:52 -06:00
|
|
|
}
|
Further work on typestate_check
Lots of work on typestate_check, seems to get a lot of the way
through checking the standard library.
* Added for, for_each, assign_op, bind, cast, put, check, break,
and cont. (I'm not sure break and cont are actually handled correctly.)
* Fixed side-effect bug in seq_preconds so that unioning the
preconditions of a sequence of statements or expressions
is handled correctly.
* Pass poststate correctly through a stmt_decl.
* Handle expr_ret and expr_fail properly (after execution of a ret
or fail, everything is true -- this is needed to handle ifs and alts
where one branch is a ret or fail)
* Fixed bug in set_prestate_ann where a thing that needed to be
mutated wasn't getting passed as an alias
* Fixed bug in how expr_alt was treated (zero is not the identity
for intersect, who knew, right?)
* Update logging to reflect log_err vs. log
* Fixed find_locals so as to return all local decls and exclude
function arguments.
* Make union_postconds work on an empty vector (needed to handle
empty blocks correctly)
* Added _vec.cat_options, which takes a list of option[T] to a list
of T, ignoring any Nones
* Added two test cases.
2011-04-20 14:11:01 -05:00
|
|
|
|
2011-12-22 16:42:52 -06:00
|
|
|
fn log_block_err(b: ast::blk) {
|
2011-12-22 19:53:53 -06:00
|
|
|
log(error, print::pprust::block_to_str(b));
|
2011-12-22 16:42:52 -06:00
|
|
|
}
|
2011-04-12 14:16:21 -05:00
|
|
|
|
2011-12-22 16:42:52 -06:00
|
|
|
fn log_item_err(i: @ast::item) {
|
2011-12-22 19:53:53 -06:00
|
|
|
log(error, print::pprust::item_to_str(i));
|
2011-12-22 16:42:52 -06:00
|
|
|
}
|
|
|
|
fn log_stmt(st: ast::stmt) {
|
2011-12-22 19:53:53 -06:00
|
|
|
log(debug, print::pprust::stmt_to_str(st));
|
2011-12-22 16:42:52 -06:00
|
|
|
}
|
Further work on typestate_check
Lots of work on typestate_check, seems to get a lot of the way
through checking the standard library.
* Added for, for_each, assign_op, bind, cast, put, check, break,
and cont. (I'm not sure break and cont are actually handled correctly.)
* Fixed side-effect bug in seq_preconds so that unioning the
preconditions of a sequence of statements or expressions
is handled correctly.
* Pass poststate correctly through a stmt_decl.
* Handle expr_ret and expr_fail properly (after execution of a ret
or fail, everything is true -- this is needed to handle ifs and alts
where one branch is a ret or fail)
* Fixed bug in set_prestate_ann where a thing that needed to be
mutated wasn't getting passed as an alias
* Fixed bug in how expr_alt was treated (zero is not the identity
for intersect, who knew, right?)
* Update logging to reflect log_err vs. log
* Fixed find_locals so as to return all local decls and exclude
function arguments.
* Make union_postconds work on an empty vector (needed to handle
empty blocks correctly)
* Added _vec.cat_options, which takes a list of option[T] to a list
of T, ignoring any Nones
* Added two test cases.
2011-04-20 14:11:01 -05:00
|
|
|
|
2011-12-22 16:42:52 -06:00
|
|
|
fn log_stmt_err(st: ast::stmt) {
|
2011-12-22 19:53:53 -06:00
|
|
|
log(error, print::pprust::stmt_to_str(st));
|
2011-12-22 16:42:52 -06:00
|
|
|
}
|
Further work on typestate_check
Lots of work on typestate_check, seems to get a lot of the way
through checking the standard library.
* Added for, for_each, assign_op, bind, cast, put, check, break,
and cont. (I'm not sure break and cont are actually handled correctly.)
* Fixed side-effect bug in seq_preconds so that unioning the
preconditions of a sequence of statements or expressions
is handled correctly.
* Pass poststate correctly through a stmt_decl.
* Handle expr_ret and expr_fail properly (after execution of a ret
or fail, everything is true -- this is needed to handle ifs and alts
where one branch is a ret or fail)
* Fixed bug in set_prestate_ann where a thing that needed to be
mutated wasn't getting passed as an alias
* Fixed bug in how expr_alt was treated (zero is not the identity
for intersect, who knew, right?)
* Update logging to reflect log_err vs. log
* Fixed find_locals so as to return all local decls and exclude
function arguments.
* Make union_postconds work on an empty vector (needed to handle
empty blocks correctly)
* Added _vec.cat_options, which takes a list of option[T] to a list
of T, ignoring any Nones
* Added two test cases.
2011-04-20 14:11:01 -05:00
|
|
|
|
2011-09-12 04:27:30 -05:00
|
|
|
fn has_nonlocal_exits(b: ast::blk) -> bool {
|
2011-07-27 07:19:39 -05:00
|
|
|
let has_exits = @mutable false;
|
2011-09-12 04:27:30 -05:00
|
|
|
fn visit_expr(flag: @mutable bool, e: @ast::expr) {
|
2011-07-27 07:19:39 -05:00
|
|
|
alt e.node {
|
2012-01-19 00:37:22 -06:00
|
|
|
ast::expr_break { *flag = true; }
|
|
|
|
ast::expr_cont { *flag = true; }
|
2011-07-27 07:19:39 -05:00
|
|
|
_ { }
|
2011-06-15 13:19:50 -05:00
|
|
|
}
|
|
|
|
}
|
2011-07-27 07:19:39 -05:00
|
|
|
let v =
|
|
|
|
visit::mk_simple_visitor(@{visit_expr: bind visit_expr(has_exits, _)
|
|
|
|
with *visit::default_simple_visitor()});
|
2011-07-26 09:47:13 -05:00
|
|
|
visit::visit_block(b, (), v);
|
2011-05-26 19:16:54 -05:00
|
|
|
ret *has_exits;
|
Support all expression forms in typestate
Added support for self_method, cont, chan, port, recv, send, be,
do_while, spawn, and ext; handled break and cont correctly.
(However, there are no non-xfailed test cases for ext or spawn in
stage0 currently.)
Although the standard library compiles and all test cases pass with
typestate enabled, I left typestate checking disabled as rustc
terminates abnormally when building the standard library if so,
even though it does generate code correctly.
2011-04-21 19:39:04 -05:00
|
|
|
}
|
2011-05-14 21:02:30 -05:00
|
|
|
|
2011-09-12 04:27:30 -05:00
|
|
|
fn local_rhs_span(l: @ast::local, def: span) -> span {
|
2011-07-27 07:19:39 -05:00
|
|
|
alt l.node.init { some(i) { ret i.expr.span; } _ { ret def; } }
|
2011-05-18 17:38:38 -05:00
|
|
|
}
|
|
|
|
|
2012-02-03 02:53:37 -06:00
|
|
|
fn is_main_name(path: middle::ast_map::path) -> bool {
|
2012-03-08 17:24:27 -06:00
|
|
|
// FIXME: path should be a constrained type, so we know
|
|
|
|
// the call to last doesn't fail
|
|
|
|
vec::last(path) == middle::ast_map::path_name("main")
|
2011-07-13 19:26:06 -05:00
|
|
|
}
|
2011-07-22 05:03:10 -05:00
|
|
|
|
2010-08-18 13:34:47 -05:00
|
|
|
//
|
|
|
|
// Local Variables:
|
|
|
|
// mode: rust
|
|
|
|
// fill-column: 78;
|
|
|
|
// indent-tabs-mode: nil
|
|
|
|
// c-basic-offset: 4
|
|
|
|
// buffer-file-coding-system: utf-8-unix
|
|
|
|
// End:
|
|
|
|
//
|