2011-07-13 19:26:06 -05:00
|
|
|
import std::str;
|
2011-05-12 10:24:54 -05:00
|
|
|
import std::map;
|
|
|
|
import std::map::hashmap;
|
2011-05-17 13:41:41 -05:00
|
|
|
import std::uint;
|
|
|
|
import std::int;
|
2011-06-26 21:18:30 -05:00
|
|
|
import std::option;
|
2011-05-12 10:24:54 -05:00
|
|
|
import std::option::none;
|
2011-05-18 17:38:38 -05:00
|
|
|
import std::option::some;
|
2011-07-05 04:48:19 -05:00
|
|
|
import syntax::ast;
|
|
|
|
import ast::ty;
|
|
|
|
import ast::pat;
|
|
|
|
import syntax::codemap::codemap;
|
|
|
|
import syntax::codemap::span;
|
|
|
|
import ast::lit;
|
|
|
|
import ast::path;
|
2011-07-26 09:47:13 -05:00
|
|
|
import syntax::visit;
|
2011-07-12 12:59:18 -05:00
|
|
|
import std::ioivec::stdout;
|
|
|
|
import std::ioivec::str_writer;
|
|
|
|
import std::ioivec::string_writer;
|
2011-07-05 04:48:19 -05:00
|
|
|
import syntax::print;
|
|
|
|
import print::pprust::print_block;
|
|
|
|
import print::pprust::print_item;
|
|
|
|
import print::pprust::print_expr;
|
|
|
|
import print::pprust::print_path;
|
|
|
|
import print::pprust::print_decl;
|
|
|
|
import print::pprust::print_fn;
|
|
|
|
import print::pprust::print_type;
|
|
|
|
import print::pprust::print_literal;
|
|
|
|
import print::pp::mk_printer;
|
2011-06-15 13:19:50 -05:00
|
|
|
|
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
|
|
|
type flag = hashmap[str, ()];
|
2010-08-18 13:34:47 -05:00
|
|
|
|
2011-07-27 07:19:39 -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-07-27 07:19:39 -05:00
|
|
|
fn hash_def(d: &ast::def_id) -> uint {
|
|
|
|
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
|
|
|
|
2011-07-29 20:38:22 -05:00
|
|
|
fn new_def_hash[@V]() -> std::map::hashmap[ast::def_id, V] {
|
2011-07-27 07:19:39 -05:00
|
|
|
let hasher: std::map::hashfn[ast::def_id] = hash_def;
|
|
|
|
let eqer: std::map::eqfn[ast::def_id] = def_eq;
|
2011-06-15 13:19:50 -05:00
|
|
|
ret std::map::mk_hashmap[ast::def_id, V](hasher, eqer);
|
2010-10-19 16:54:10 -05:00
|
|
|
}
|
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn elt_expr(e: &ast::elt) -> @ast::expr { ret e.expr; }
|
2011-04-07 20:15:56 -05:00
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn elt_exprs(elts: &ast::elt[]) -> (@ast::expr)[] {
|
|
|
|
let es = ~[];
|
|
|
|
for e: ast::elt in elts { es += ~[e.expr]; }
|
2011-07-06 21:00:00 -05:00
|
|
|
ret es;
|
2011-04-07 20:15:56 -05:00
|
|
|
}
|
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn field_expr(f: &ast::field) -> @ast::expr { ret f.node.expr; }
|
2011-04-12 14:16:21 -05:00
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn field_exprs(fields: &ast::field[]) -> (@ast::expr)[] {
|
|
|
|
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-07-27 07:19:39 -05:00
|
|
|
fn log_expr(e: &ast::expr) { log print::pprust::expr_to_str(@e); }
|
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-07-27 07:19:39 -05:00
|
|
|
fn log_expr_err(e: &ast::expr) { log_err print::pprust::expr_to_str(@e); }
|
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-07-27 07:19:39 -05:00
|
|
|
fn log_ty_err(t: &ty) { log_err print::pprust::ty_to_str(t); }
|
2011-05-14 21:02:30 -05:00
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn log_pat_err(p: &@pat) { log_err print::pprust::pat_to_str(p); }
|
2011-05-14 21:02:30 -05:00
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn log_block(b: &ast::blk) { log print::pprust::block_to_str(b); }
|
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-07-27 07:19:39 -05:00
|
|
|
fn log_block_err(b: &ast::blk) { log_err print::pprust::block_to_str(b); }
|
2011-04-12 14:16:21 -05:00
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn log_item_err(i: &@ast::item) { log_err print::pprust::item_to_str(i); }
|
2011-04-22 13:08:47 -05:00
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn log_fn(f: &ast::_fn, name: str, params: &ast::ty_param[]) {
|
2011-07-05 04:48:19 -05:00
|
|
|
log print::pprust::fun_to_str(f, name, params);
|
2011-04-22 13:08:47 -05:00
|
|
|
}
|
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn log_fn_err(f: &ast::_fn, name: str, params: &ast::ty_param[]) {
|
2011-07-05 04:48:19 -05:00
|
|
|
log_err print::pprust::fun_to_str(f, name, params);
|
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-07-27 07:19:39 -05:00
|
|
|
fn log_stmt(st: &ast::stmt) { log print::pprust::stmt_to_str(st); }
|
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-07-27 07:19:39 -05:00
|
|
|
fn log_stmt_err(st: &ast::stmt) { log_err print::pprust::stmt_to_str(st); }
|
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-07-27 07:19:39 -05:00
|
|
|
fn has_nonlocal_exits(b: &ast::blk) -> bool {
|
|
|
|
let has_exits = @mutable false;
|
|
|
|
fn visit_expr(flag: @mutable bool, e: &@ast::expr) {
|
|
|
|
alt e.node {
|
|
|
|
ast::expr_break. { *flag = true; }
|
|
|
|
ast::expr_cont. { *flag = true; }
|
|
|
|
_ { }
|
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-07-27 07:19:39 -05:00
|
|
|
fn local_rhs_span(l: &@ast::local, def: &span) -> span {
|
|
|
|
alt l.node.init { some(i) { ret i.expr.span; } _ { ret def; } }
|
2011-05-18 17:38:38 -05:00
|
|
|
}
|
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn lit_eq(l: &@ast::lit, m: &@ast::lit) -> bool {
|
|
|
|
alt l.node {
|
|
|
|
ast::lit_str(s, kind_s) {
|
|
|
|
alt m.node {
|
|
|
|
ast::lit_str(t, kind_t) { ret s == t && kind_s == kind_t; }
|
|
|
|
_ { ret false; }
|
2011-06-01 20:10:10 -05:00
|
|
|
}
|
2011-07-27 07:19:39 -05:00
|
|
|
}
|
|
|
|
ast::lit_char(c) {
|
|
|
|
alt m.node { ast::lit_char(d) { ret c == d; } _ { ret false; } }
|
|
|
|
}
|
|
|
|
ast::lit_int(i) {
|
|
|
|
alt m.node { ast::lit_int(j) { ret i == j; } _ { ret false; } }
|
|
|
|
}
|
|
|
|
ast::lit_uint(i) {
|
|
|
|
alt m.node { ast::lit_uint(j) { ret i == j; } _ { ret false; } }
|
|
|
|
}
|
|
|
|
ast::lit_mach_int(_, i) {
|
|
|
|
alt m.node {
|
|
|
|
ast::lit_mach_int(_, j) { ret i == j; }
|
|
|
|
_ { ret false; }
|
2011-06-01 20:10:10 -05:00
|
|
|
}
|
2011-07-27 07:19:39 -05:00
|
|
|
}
|
|
|
|
ast::lit_float(s) {
|
|
|
|
alt m.node { ast::lit_float(t) { ret s == t; } _ { ret false; } }
|
|
|
|
}
|
|
|
|
ast::lit_mach_float(_, s) {
|
|
|
|
alt m.node {
|
|
|
|
ast::lit_mach_float(_, t) { ret s == t; }
|
|
|
|
_ { ret false; }
|
2011-06-01 20:10:10 -05:00
|
|
|
}
|
2011-07-27 07:19:39 -05:00
|
|
|
}
|
|
|
|
ast::lit_nil. {
|
|
|
|
alt m.node { ast::lit_nil. { ret true; } _ { ret false; } }
|
|
|
|
}
|
|
|
|
ast::lit_bool(b) {
|
|
|
|
alt m.node { ast::lit_bool(c) { ret b == c; } _ { ret false; } }
|
|
|
|
}
|
2011-06-01 20:10:10 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
tag call_kind { kind_call; kind_spawn; kind_bind; }
|
2011-07-11 19:26:40 -05:00
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn call_kind_str(c: call_kind) -> str {
|
|
|
|
alt c {
|
|
|
|
kind_call. { "Call" }
|
|
|
|
kind_spawn. { "Spawn" }
|
|
|
|
kind_bind. { "Bind" }
|
2011-07-11 19:26:40 -05:00
|
|
|
}
|
|
|
|
}
|
2011-07-11 09:47:24 -05:00
|
|
|
|
2011-07-27 07:19:39 -05:00
|
|
|
fn is_main_name(path: &str[]) -> bool {
|
2011-07-13 19:26:06 -05:00
|
|
|
str::eq(option::get(std::ivec::last(path)), "main")
|
|
|
|
}
|
2011-07-22 05:03:10 -05:00
|
|
|
|
|
|
|
// FIXME mode this to std::float when editing the stdlib no longer
|
|
|
|
// requires a snapshot
|
|
|
|
fn float_to_str(num: float, digits: uint) -> str {
|
|
|
|
let accum = if num < 0.0 { num = -num; "-" }
|
|
|
|
else { "" };
|
|
|
|
let trunc = num as uint;
|
|
|
|
let frac = num - (trunc as float);
|
|
|
|
accum += uint::str(trunc);
|
|
|
|
if frac == 0.0 || digits == 0u { ret accum; }
|
|
|
|
accum += ".";
|
|
|
|
while digits > 0u && frac > 0.0 {
|
|
|
|
frac *= 10.0;
|
|
|
|
let digit = frac as uint;
|
|
|
|
accum += uint::str(digit);
|
|
|
|
frac -= digit as float;
|
|
|
|
digits -= 1u;
|
|
|
|
}
|
|
|
|
ret accum;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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
|
2011-03-25 17:07:27 -05:00
|
|
|
// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
|
2010-08-18 13:34:47 -05:00
|
|
|
// End:
|
|
|
|
//
|