diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-30 20:06:08 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-30 20:06:08 +0000 |
| commit | b34d97dda5ce8c88d31412d11b1ad67da058480e (patch) | |
| tree | 55222ea664797f046a2e7a8f807d36fb59438419 /src/algebra/si.spad.pamphlet | |
| parent | ded226fca8f3a75d33602a7fbbc941c55e985fdf (diff) | |
| download | open-axiom-b34d97dda5ce8c88d31412d11b1ad67da058480e.tar.gz | |
* interp/c-util.boot (middleEndExpand): Tidy.
* interp/g-util.boot (expandToVMForm): Likewise.
(expandStore): Refine store to pair components.
* algebra/any.spad.pamphlet (Scope): Use builtin operators.
(Environment): Likewise.
* algebra/domain.spad.pamphlet (FunctionDescriptor): Likewise.
(ConstructorCall): Likewise.
(FunctorData): Likewise.
(OperatorSignature): Likewise.
(Category): Likewise.
(Domain): Likewise.
* algebra/integer.spad.pamphlet (Integer): Likewise.
(NonNegativeInteger): Likewise.
* algebra/outform.spad.pamphlet: Likewise.
* algebra/si.spad.pamphlet (SingleInteger): Likewise.
* algebra/syntax.spad.pamphlet (Syntax): Likewise.
Diffstat (limited to 'src/algebra/si.spad.pamphlet')
| -rw-r--r-- | src/algebra/si.spad.pamphlet | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/algebra/si.spad.pamphlet b/src/algebra/si.spad.pamphlet index 4e93667d..2321b60d 100644 --- a/src/algebra/si.spad.pamphlet +++ b/src/algebra/si.spad.pamphlet @@ -271,7 +271,7 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,BooleanLogic,Logic,OpenM base() == 2$Lisp max() == MAXINT min() == MININT - x = y == EQL(x,y)$Lisp + x = y == %ieq(x,y)$Foreign(Builtin) ~ x == LOGNOT(x)$Lisp not(x) == LOGNOT(x)$Lisp x /\ y == LOGAND(x,y)$Lisp @@ -284,19 +284,20 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,BooleanLogic,Logic,OpenM xor(x,y) == LOGXOR(x,y)$Lisp x < y == QSLESSP(x,y)$Lisp x > y == QSGREATERP(x,y)$Lisp - x <= y == (x <= y)$Lisp - x >= y == (x >= y)$Lisp + x <= y == %ile(x,y)$Foreign(Builtin) + x >= y == %ige(x,y)$Foreign(Builtin) inc x == QSADD1(x)$Lisp dec x == QSSUB1(x)$Lisp - x == QSMINUS(x)$Lisp x + y == QSPLUS(x,y)$Lisp x:% - y:% == QSDIFFERENCE(x,y)$Lisp x:% * y:% == QSTIMES(x,y)$Lisp - x:% ** n:NonNegativeInteger == ((EXPT(x, n)$Lisp) pretend Integer)::% + x:% ** n:NonNegativeInteger == + (%ipow(x, n)$Foreign(Builtin) pretend Integer)::% x quo y == QSQUOTIENT(x,y)$Lisp x rem y == QSREMAINDER(x,y)$Lisp divide(x, y) == CONS(QSQUOTIENT(x,y)$Lisp,QSREMAINDER(x,y)$Lisp)$Lisp - gcd(x,y) == GCD(x,y)$Lisp + gcd(x,y) == %igcd(x,y)$Foreign(Builtin) abs(x) == QSABSVAL(x)$Lisp odd?(x) == QSODDP(x)$Lisp zero?(x) == QSZEROP(x)$Lisp |