diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2011-07-08 21:50:09 -0700 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2011-07-08 22:25:57 -0700 |
| commit | be6febb46d541ebe8cb0f3e0585ffb8bafb39762 (patch) | |
| tree | 284305938a65c53283cfe290933b87575e125a3b /src/comp | |
| parent | 7060f4c89c76f9f715b706b81545c7a082d7c50c (diff) | |
| download | rust-be6febb46d541ebe8cb0f3e0585ffb8bafb39762.tar.gz rust-be6febb46d541ebe8cb0f3e0585ffb8bafb39762.zip | |
Minor refactoring
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/middle/tstate/ann.rs | 8 | ||||
| -rw-r--r-- | src/comp/middle/tstate/bitvectors.rs | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/comp/middle/tstate/ann.rs b/src/comp/middle/tstate/ann.rs index 0618bae7e3e..1827d4cc3d1 100644 --- a/src/comp/middle/tstate/ann.rs +++ b/src/comp/middle/tstate/ann.rs @@ -108,8 +108,12 @@ fn require_and_preserve(uint i, &pre_and_post p) { fn set_in_postcond(uint i, &pre_and_post p) -> bool { // sets the ith bit in p's post - auto was_set = tritv_get(p.postcondition, i); - tritv_set(i, p.postcondition, ttrue); + ret set_in_postcond_(i, p.postcondition); +} + +fn set_in_postcond_(uint i, &postcond p) -> bool { + auto was_set = tritv_get(p, i); + tritv_set(i, p, ttrue); ret was_set != ttrue; } diff --git a/src/comp/middle/tstate/bitvectors.rs b/src/comp/middle/tstate/bitvectors.rs index b48489a2d40..03e3932756f 100644 --- a/src/comp/middle/tstate/bitvectors.rs +++ b/src/comp/middle/tstate/bitvectors.rs @@ -81,7 +81,11 @@ fn bit_num(&fn_ctxt fcx, &constr_ c) -> uint { } fn promises(&fn_ctxt fcx, &poststate p, &constr_ c) -> bool { - ret tritv_get(p, bit_num(fcx, c)) == ttrue; + ret promises_(bit_num(fcx, c), p); +} + +fn promises_(uint n, &poststate p) -> bool { + ret tritv_get(p, n) == ttrue; } // v "happens after" u |