Skip to content

Typestate #389

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

Closed
wants to merge 10 commits into from
Closed

Typestate #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
764e9c1
Fix an error message that reversed the expected and actual number of …
catamorphism May 17, 2011
6cfe082
Beginning of Operation Eliminate Folds
catamorphism May 17, 2011
2a024e3
Remove dead file (typestate_check is now a bunch of modules under mid…
catamorphism May 18, 2011
1cd5db9
Tell Makefile to look an extra level deep for dependencies
catamorphism May 18, 2011
a74ed07
add a bunch more logging things
catamorphism May 18, 2011
c9bd1ac
Make trans use span_err for the dreaded "ty_var in trans::type_of" error
catamorphism May 18, 2011
c4f9ab9
Add a set_all function in bitv that's the inverse of clear
catamorphism May 18, 2011
c37b70a
Add visit_fn_pre and visit_fn_post fields to visitors
catamorphism May 18, 2011
941b6ec
Rewrite tstate.annotate to use walk instead of fold
catamorphism May 18, 2011
96048ae
remove now-unused ts field from ann
catamorphism May 18, 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
2 changes: 1 addition & 1 deletion Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/lib/,*.rc *.rs */*.rs))

COMPILER_CRATE := $(S)src/comp/rustc.rc
COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
rustc.rc *.rs */*.rs))
rustc.rc *.rs */*.rs */*/*.rs))

######################################################################
# Main target dependency variables
Expand Down
3 changes: 1 addition & 2 deletions src/comp/front/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ type ty_param = ident;
// Annotations added during successive passes.
type ann = rec(uint id,
middle::ty::t ty,
option::t[vec[middle::ty::t]] tps,
option::t[@ts_ann] ts);
option::t[vec[middle::ty::t]] tps);

tag def {
def_fn(def_id);
Expand Down
5 changes: 2 additions & 3 deletions src/comp/front/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,10 @@ fn new_parser(session::session sess,
fn get_chpos() -> uint {ret rdr.get_chpos();}

fn get_ann() -> ast::ann {
// TODO: Remove ty, tps, and ts. ty and tps should be unused
// TODO: Remove ty and tps, which should be unused
// by now.
auto rv = rec(id=next_ann_var, ty=0u,
tps=none[vec[middle::ty::t]],
ts=none[@middle::tstate::ann::ts_ann]);
tps=none[vec[middle::ty::t]]);
next_ann_var += 1u;
ret rv;
}
Expand Down
Loading