tests and bugfixes: fns take aliases, fixed binary arithmetic in create, eliminated wasted bit per uint
This commit is contained in:
Dave Herman
parent
ce3224652f
commit
da8b6795c7
@ -5,8 +5,12 @@ import front.token;
|
||||
import middle.trans;
|
||||
import middle.resolve;
|
||||
|
||||
import util.bits;
|
||||
|
||||
io fn main(vec[str] args) {
|
||||
|
||||
bits.test();
|
||||
|
||||
log "This is the rust 'self-hosted' compiler.";
|
||||
log "The one written in rust.";
|
||||
log "It does nothing yet, it's a placeholder.";
|
||||
|
||||
@ -5,30 +5,31 @@ import std._vec;
|
||||
// FIXME: With recursive object types, we could implement binary methods like
|
||||
// union, intersection, and difference. At that point, we could write
|
||||
// an optimizing version of this module that produces a different obj
|
||||
// for the case where nbits < 32.
|
||||
// for the case where nbits <= 32.
|
||||
|
||||
// FIXME: Almost all the functions in this module should be state fns, but the
|
||||
// effect system isn't currently working correctly.
|
||||
|
||||
state type t = rec(vec[mutable uint] storage, uint nbits);
|
||||
|
||||
// FIXME: this should be a constant once they work
|
||||
fn uint_bits() -> uint {
|
||||
ret 32u + ((1u << 32u) >> 27u) - 1u;
|
||||
ret 32u + ((1u << 32u) >> 27u);
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn create(uint nbits, bool init) -> t {
|
||||
auto elt;
|
||||
if (init) {
|
||||
elt = 1u;
|
||||
elt = ~0u;
|
||||
} else {
|
||||
elt = 0u;
|
||||
}
|
||||
|
||||
ret rec(storage = _vec.init_elt[mutable uint](nbits / uint_bits() + 1u, elt),
|
||||
ret rec(storage = _vec.init_elt[mutable uint](elt, nbits / uint_bits() + 1u),
|
||||
nbits = nbits);
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn process(fn(uint, uint) -> uint op, t v0, t v1) -> bool {
|
||||
fn process(&fn(uint, uint) -> uint op, &t v0, &t v1) -> bool {
|
||||
auto len = _vec.len[mutable uint](v1.storage);
|
||||
|
||||
check (_vec.len[mutable uint](v0.storage) == len);
|
||||
@ -54,8 +55,7 @@ fn lor(uint w0, uint w1) -> uint {
|
||||
ret w0 | w1;
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn union(t v0, t v1) -> bool {
|
||||
fn union(&t v0, &t v1) -> bool {
|
||||
auto sub = lor;
|
||||
ret process(sub, v0, v1);
|
||||
}
|
||||
@ -64,8 +64,7 @@ fn land(uint w0, uint w1) -> uint {
|
||||
ret w0 & w1;
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn intersect(t v0, t v1) -> bool {
|
||||
fn intersect(&t v0, &t v1) -> bool {
|
||||
auto sub = land;
|
||||
ret process(sub, v0, v1);
|
||||
}
|
||||
@ -74,14 +73,12 @@ fn right(uint w0, uint w1) -> uint {
|
||||
ret w1;
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn copy(t v0, t v1) -> bool {
|
||||
fn copy(&t v0, t v1) -> bool {
|
||||
auto sub = right;
|
||||
ret process(sub, v0, v1);
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn get(t v, uint i) -> bool {
|
||||
fn get(&t v, uint i) -> bool {
|
||||
check (i < v.nbits);
|
||||
|
||||
auto bits = uint_bits();
|
||||
@ -92,8 +89,7 @@ fn get(t v, uint i) -> bool {
|
||||
ret x == 1u;
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn equal(t v0, t v1) -> bool {
|
||||
fn equal(&t v0, &t v1) -> bool {
|
||||
// FIXME: when we can break or return from inside an iterator loop,
|
||||
// we can eliminate this painful while-loop
|
||||
auto len = _vec.len[mutable uint](v1.storage);
|
||||
@ -107,31 +103,27 @@ fn equal(t v0, t v1) -> bool {
|
||||
ret true;
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn clear(t v) {
|
||||
fn clear(&t v) {
|
||||
for each (uint i in _uint.range(0u, _vec.len[mutable uint](v.storage))) {
|
||||
v.storage.(i) = 0u;
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn invert(t v) {
|
||||
fn invert(&t v) {
|
||||
for each (uint i in _uint.range(0u, _vec.len[mutable uint](v.storage))) {
|
||||
v.storage.(i) = ~v.storage.(i);
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
/* v0 = v0 - v1 */
|
||||
fn difference(t v0, t v1) -> bool {
|
||||
fn difference(&t v0, &t v1) -> bool {
|
||||
invert(v1);
|
||||
auto b = intersect(v0, v1);
|
||||
invert(v1);
|
||||
ret b;
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn set(t v, uint i, bool x) {
|
||||
fn set(&t v, uint i, bool x) {
|
||||
check (i < v.nbits);
|
||||
|
||||
auto bits = uint_bits();
|
||||
@ -147,8 +139,7 @@ fn set(t v, uint i, bool x) {
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn init_to_vec(t v, uint i) -> uint {
|
||||
fn init_to_vec(&t v, uint i) -> uint {
|
||||
if (get(v, i)) {
|
||||
ret 1u;
|
||||
} else {
|
||||
@ -156,12 +147,310 @@ fn init_to_vec(t v, uint i) -> uint {
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: this should be state
|
||||
fn to_vec(t v) -> vec[uint] {
|
||||
fn to_vec(&t v) -> vec[uint] {
|
||||
auto sub = bind init_to_vec(v, _);
|
||||
ret _vec.init_fn[uint](sub, v.nbits);
|
||||
}
|
||||
|
||||
// FIXME: can we just use structural equality on to_vec?
|
||||
fn eq_vec(&t v0, &vec[uint] v1) -> bool {
|
||||
check (v0.nbits == _vec.len[uint](v1));
|
||||
auto len = v0.nbits;
|
||||
auto i = 0u;
|
||||
while (i < len) {
|
||||
auto w0 = get(v0, i);
|
||||
auto w1 = v1.(i);
|
||||
if ((!w0 && w1 != 0u) || (w0 && w1 == 0u)) {
|
||||
ret false;
|
||||
}
|
||||
i = i + 1u;
|
||||
}
|
||||
ret true;
|
||||
}
|
||||
|
||||
fn test() {
|
||||
auto act;
|
||||
auto exp;
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Tests of 0-element bit-vectors.
|
||||
|
||||
act = create(0u, false);
|
||||
exp = _vec.init_elt[uint](0u, 0u);
|
||||
// FIXME: why can't I write vec[uint]()?
|
||||
check (eq_vec(act, exp));
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Tests of 1-element bit-vectors.
|
||||
|
||||
act = create(1u, false);
|
||||
check (eq_vec(act, vec(0u)));
|
||||
|
||||
act = create(1u, true);
|
||||
check (eq_vec(act, vec(1u)));
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Tests of 10-element bit-vectors.
|
||||
|
||||
// all 0
|
||||
act = create(10u, false);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u)));
|
||||
|
||||
// all 1
|
||||
act = create(10u, true);
|
||||
check (eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u)));
|
||||
|
||||
// mixed
|
||||
act = create(10u, false);
|
||||
set(act, 0u, true);
|
||||
set(act, 1u, true);
|
||||
set(act, 2u, true);
|
||||
set(act, 3u, true);
|
||||
set(act, 4u, true);
|
||||
check (eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 0u, 0u, 0u, 0u, 0u)));
|
||||
|
||||
// mixed
|
||||
act = create(10u, false);
|
||||
set(act, 5u, true);
|
||||
set(act, 6u, true);
|
||||
set(act, 7u, true);
|
||||
set(act, 8u, true);
|
||||
set(act, 9u, true);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 1u, 1u)));
|
||||
|
||||
// mixed
|
||||
act = create(10u, false);
|
||||
set(act, 0u, true);
|
||||
set(act, 3u, true);
|
||||
set(act, 6u, true);
|
||||
set(act, 9u, true);
|
||||
check (eq_vec(act, vec(1u, 0u, 0u, 1u, 0u, 0u, 1u, 0u, 0u, 1u)));
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Tests of 31-element bit-vectors.
|
||||
|
||||
// all 0
|
||||
act = create(31u, false);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u)));
|
||||
|
||||
// all 1
|
||||
act = create(31u, true);
|
||||
check (eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u)));
|
||||
|
||||
// mixed
|
||||
act = create(31u, false);
|
||||
set(act, 0u, true);
|
||||
set(act, 1u, true);
|
||||
set(act, 2u, true);
|
||||
set(act, 3u, true);
|
||||
set(act, 4u, true);
|
||||
set(act, 5u, true);
|
||||
set(act, 6u, true);
|
||||
set(act, 7u, true);
|
||||
check (eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u)));
|
||||
|
||||
// mixed
|
||||
act = create(31u, false);
|
||||
set(act, 16u, true);
|
||||
set(act, 17u, true);
|
||||
set(act, 18u, true);
|
||||
set(act, 19u, true);
|
||||
set(act, 20u, true);
|
||||
set(act, 21u, true);
|
||||
set(act, 22u, true);
|
||||
set(act, 23u, true);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u)));
|
||||
|
||||
// mixed
|
||||
act = create(31u, false);
|
||||
set(act, 24u, true);
|
||||
set(act, 25u, true);
|
||||
set(act, 26u, true);
|
||||
set(act, 27u, true);
|
||||
set(act, 28u, true);
|
||||
set(act, 29u, true);
|
||||
set(act, 30u, true);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u)));
|
||||
|
||||
// mixed
|
||||
act = create(31u, false);
|
||||
set(act, 3u, true);
|
||||
set(act, 17u, true);
|
||||
set(act, 30u, true);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 1u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 1u)));
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Tests of 32-element bit-vectors.
|
||||
|
||||
// all 0
|
||||
act = create(32u, false);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u)));
|
||||
|
||||
// all 1
|
||||
act = create(32u, true);
|
||||
check (eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u)));
|
||||
|
||||
// mixed
|
||||
act = create(32u, false);
|
||||
set(act, 0u, true);
|
||||
set(act, 1u, true);
|
||||
set(act, 2u, true);
|
||||
set(act, 3u, true);
|
||||
set(act, 4u, true);
|
||||
set(act, 5u, true);
|
||||
set(act, 6u, true);
|
||||
set(act, 7u, true);
|
||||
check (eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u)));
|
||||
|
||||
// mixed
|
||||
act = create(32u, false);
|
||||
set(act, 16u, true);
|
||||
set(act, 17u, true);
|
||||
set(act, 18u, true);
|
||||
set(act, 19u, true);
|
||||
set(act, 20u, true);
|
||||
set(act, 21u, true);
|
||||
set(act, 22u, true);
|
||||
set(act, 23u, true);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u)));
|
||||
|
||||
// mixed
|
||||
act = create(32u, false);
|
||||
set(act, 24u, true);
|
||||
set(act, 25u, true);
|
||||
set(act, 26u, true);
|
||||
set(act, 27u, true);
|
||||
set(act, 28u, true);
|
||||
set(act, 29u, true);
|
||||
set(act, 30u, true);
|
||||
set(act, 31u, true);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u)));
|
||||
|
||||
// mixed
|
||||
act = create(32u, false);
|
||||
set(act, 3u, true);
|
||||
set(act, 17u, true);
|
||||
set(act, 30u, true);
|
||||
set(act, 31u, true);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 1u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u)));
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Tests of 33-element bit-vectors.
|
||||
|
||||
// all 0
|
||||
act = create(33u, false);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u)));
|
||||
|
||||
// all 1
|
||||
act = create(33u, true);
|
||||
check (eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
1u)));
|
||||
|
||||
// mixed
|
||||
act = create(33u, false);
|
||||
set(act, 0u, true);
|
||||
set(act, 1u, true);
|
||||
set(act, 2u, true);
|
||||
set(act, 3u, true);
|
||||
set(act, 4u, true);
|
||||
set(act, 5u, true);
|
||||
set(act, 6u, true);
|
||||
set(act, 7u, true);
|
||||
check (eq_vec(act, vec(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u)));
|
||||
|
||||
// mixed
|
||||
act = create(33u, false);
|
||||
set(act, 16u, true);
|
||||
set(act, 17u, true);
|
||||
set(act, 18u, true);
|
||||
set(act, 19u, true);
|
||||
set(act, 20u, true);
|
||||
set(act, 21u, true);
|
||||
set(act, 22u, true);
|
||||
set(act, 23u, true);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u)));
|
||||
|
||||
// mixed
|
||||
act = create(33u, false);
|
||||
set(act, 24u, true);
|
||||
set(act, 25u, true);
|
||||
set(act, 26u, true);
|
||||
set(act, 27u, true);
|
||||
set(act, 28u, true);
|
||||
set(act, 29u, true);
|
||||
set(act, 30u, true);
|
||||
set(act, 31u, true);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
|
||||
0u)));
|
||||
|
||||
// mixed
|
||||
act = create(33u, false);
|
||||
set(act, 3u, true);
|
||||
set(act, 17u, true);
|
||||
set(act, 30u, true);
|
||||
set(act, 31u, true);
|
||||
set(act, 32u, true);
|
||||
check (eq_vec(act, vec(0u, 0u, 0u, 1u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 1u, 0u, 0u, 0u, 0u, 0u, 0u,
|
||||
0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u,
|
||||
1u)));
|
||||
}
|
||||
|
||||
//
|
||||
// Local Variables:
|
||||
// mode: rust
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user