diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-01-02 10:09:37 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-01-02 10:09:37 +0000 |
| commit | 2b2ae9894f66dba65af62fb08b9d79b2aee2a2a8 (patch) | |
| tree | a993fb841dbecc560c217651a8504f23ed526481 /src/algebra/boolean.spad.pamphlet | |
| parent | b9a4e3cd1880e977a827a98b1cb69175e7ad1e74 (diff) | |
| download | open-axiom-2b2ae9894f66dba65af62fb08b9d79b2aee2a2a8.tar.gz | |
* interp/nrunfast.boot (evalSlotDomain): Expand to VM forms before
value argument evaluation.
(lazyMatch): Check for %llength too.
* interp/g-opt.boot ($VMsideEffectFreeOperators): Include %2bit
and %2bool.
* interp/g-util.boot: Expand them.
* interp/define.boot (compJoin): Check for %llenght too.
* algebra/boolean.spad.pamphlet: Tidy.
* algebra/domain.spad.pamphlet: Likewise.
* algebra/draw.spad.pamphlet: Likewise.
* algebra/files.spad.pamphlet: Likewise.
* algebra/list.spad.pamphlet: Likewise.
* algebra/outform.spad.pamphlet: Likewise.
* algebra/sex.spad.pamphlet: Likewise.
* algebra/sf.spad.pamphlet: Likewise.
Diffstat (limited to 'src/algebra/boolean.spad.pamphlet')
| -rw-r--r-- | src/algebra/boolean.spad.pamphlet | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet index 8833724a..d2b7ffa5 100644 --- a/src/algebra/boolean.spad.pamphlet +++ b/src/algebra/boolean.spad.pamphlet @@ -564,7 +564,7 @@ IndexedBits(mn:Integer): BitAggregate() with s.i := if v.j then t else f s::OutputForm - new(n, b) == BVEC_-MAKE_-FULL(n,TRUTH_-TO_-BIT(b)$Lisp)$Lisp + new(n, b) == BVEC_-MAKE_-FULL(n, %2bit(b)$Foreign(Builtin))$Lisp empty() == BVEC_-MAKE_-FULL(0,0)$Lisp copy v == BVEC_-COPY(v)$Lisp #v == BVEC_-SIZE(v)$Lisp @@ -574,10 +574,10 @@ IndexedBits(mn:Integer): BitAggregate() with u or v == (#v=#u => BVEC_-OR(v, u)$Lisp; map("or", v,u)) xor(v,u) == (#v=#u => BVEC_-XOR(v,u)$Lisp; map("xor",v,u)) setelt(v:%, i:Integer, f:Boolean) == - BIT_-TO_-TRUTH(BVEC_-SETELT(v, range(v, i-mn), - TRUTH_-TO_-BIT(f)$Lisp)$Lisp)$Lisp + %2bool(BVEC_-SETELT(v, range(v, i-mn), + %2bit(f)$Foreign(Builtin))$Lisp)$Foreign(Builtin) elt(v:%, i:Integer) == - BIT_-TO_-TRUTH(BVEC_-ELT(v, range(v, i-mn))$Lisp)$Lisp + %2bool(BVEC_-ELT(v, range(v, i-mn))$Lisp)$Foreign(Builtin) Not v == BVEC_-NOT(v)$Lisp And(u, v) == (#v=#u => BVEC_-AND(v,u)$Lisp; map("and",v,u)) |