diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-07-22 00:33:05 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-07-22 00:33:05 +0000 |
| commit | c1da0d2561b27741a6feb73336b0712f5ddc7e97 (patch) | |
| tree | 72afdd59d1591eb5278ca74254bdc6aa58f6e2fe /src/algebra | |
| parent | 108ea45edebe23267cc7f4d8620f034fd1b39b81 (diff) | |
| download | open-axiom-c1da0d2561b27741a6feb73336b0712f5ddc7e97.tar.gz | |
* algebra/data.spad.pamphlet (Byte) [~]: Tidy.
(SystemNonNegativeInteger) [~]: Likewise.
* interp/g-util.boot: Better expansion of byte operations.
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/data.spad.pamphlet | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/algebra/data.spad.pamphlet b/src/algebra/data.spad.pamphlet index 39576863..06a73cf8 100644 --- a/src/algebra/data.spad.pamphlet +++ b/src/algebra/data.spad.pamphlet @@ -43,7 +43,7 @@ Byte(): Public == Private where import %bge: (%,%) -> Boolean from Foreign Builtin import %bitand: (%,%) -> % from Foreign Builtin import %bitior: (%,%) -> % from Foreign Builtin - import %bitnot: % -> % from Foreign Builtin + import %bcompl: % -> % from Foreign Builtin byte(x: NonNegativeInteger): % == per x sample = 0$Foreign(Builtin) @@ -64,7 +64,7 @@ Byte(): Public == Private where bitior(x,y) == %bitior(x,y) x /\ y == bitand(x,y) x \/ y == bitior(x,y) - ~ x == %bitnot x + ~ x == %bcompl x @ @@ -200,13 +200,13 @@ SystemNonNegativeInteger(N: PositiveInteger): Public == Private where import %bitnot: % -> % from Foreign Builtin min == per 0 - max == per((shift(1,N)-1)::NonNegativeInteger) + max == per((shift(1,N)-1) : NonNegativeInteger) sample == min bitand(x,y) == %bitand(x,y) bitior(x,y) == %bitior(x,y) x /\ y == bitand(x,y) x \/ y == bitior(x,y) - ~ x == %bitnot x + ~ x == per((shift(1,N) + rep %bitnot x) : NonNegativeInteger) @ |