aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/si.spad.pamphlet
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-12-27 02:20:07 +0000
committerdos-reis <gdr@axiomatics.org>2008-12-27 02:20:07 +0000
commitfdc64c2abcdf53d9afee4541503d1d17763ee92c (patch)
treef15a829314e96145be04e1eeeee3a16049faa572 /src/algebra/si.spad.pamphlet
parentfb209a840dc764bdfa285ad3cb7575df21a43289 (diff)
downloadopen-axiom-fdc64c2abcdf53d9afee4541503d1d17763ee92c.tar.gz
* algebra/net.spad.pamphlet (readBytes!$InputByteConduit): Set
length of buffer to count of bytes read. * algebra/si.spad.pamphlet (SingleInteger): Now formally subdomain of Integer.
Diffstat (limited to 'src/algebra/si.spad.pamphlet')
-rw-r--r--src/algebra/si.spad.pamphlet11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/algebra/si.spad.pamphlet b/src/algebra/si.spad.pamphlet
index 0a9f7095..e6991817 100644
--- a/src/algebra/si.spad.pamphlet
+++ b/src/algebra/si.spad.pamphlet
@@ -231,7 +231,7 @@ SingleInteger(): Join(IntegerNumberSystem,Logic,OpenMath) with
++ Or(n,m) returns the bit-by-bit logical {\em or} of
++ the single integers n and m.
- == add
+ == SubDomain(Integer, SMINTP(#1)$Lisp) add
seed : % := 1$Lisp -- for random()
MAXINT ==> _$ShortMaximum$Lisp
@@ -286,8 +286,8 @@ SingleInteger(): Join(IntegerNumberSystem,Logic,OpenMath) with
OMputEndObject(dev)
reducedSystem m == m pretend Matrix(Integer)
- coerce(x):OutputForm == (convert(x)@Integer)::OutputForm
- convert(x:%):Integer == x pretend Integer
+ coerce(x):OutputForm == rep(x)::OutputForm
+ convert(x:%):Integer == rep x
i:Integer * y:% == i::% * y
0 == 0$Lisp
1 == 1$Lisp
@@ -295,7 +295,7 @@ SingleInteger(): Join(IntegerNumberSystem,Logic,OpenMath) with
max() == MAXINT
min() == MININT
x = y == EQL(x,y)$Lisp
- _~ x == LOGNOT(x)$Lisp
+ ~ x == LOGNOT(x)$Lisp
not(x) == LOGNOT(x)$Lisp
_/_\(x,y) == LOGAND(x,y)$Lisp
_\_/(x,y) == LOGIOR(x,y)$Lisp
@@ -342,8 +342,7 @@ SingleInteger(): Join(IntegerNumberSystem,Logic,OpenMath) with
r
coerce(x:Integer):% ==
- (x <= max pretend Integer) and (x >= min pretend Integer) =>
- x pretend %
+ (x <= rep max) and (x >= rep min) => per x
error "integer too large to represent in a machine word"
random() ==