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 | |
| 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.
69 files changed, 501 insertions, 473 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7cc24a09..f93ba384 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,24 @@ 2010-05-30 Gabriel Dos Reis <gdr@cs.tamu.edu> + * 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. + +2010-05-30 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/i-coerce.boot (getSubDomainPredicate): Use compileInteractive. 2010-05-29 Gabriel Dos Reis <gdr@cs.tamu.edu> diff --git a/src/algebra/any.spad.pamphlet b/src/algebra/any.spad.pamphlet index e2dcca10..758b47f6 100644 --- a/src/algebra/any.spad.pamphlet +++ b/src/algebra/any.spad.pamphlet @@ -413,7 +413,7 @@ Scope(): Public == Private where import Contour Rep == List Contour empty() == - per NIL$Lisp + per %nil$Foreign(Builtin) contours s == rep s @@ -428,10 +428,10 @@ Scope(): Public == Private where CONS(LIST(b)$Lisp,s)$Lisp currentScope() == - CAR(_$e$Lisp)$Lisp + %head(_$e$Lisp)$Foreign(Builtin) currentCategoryFrame() == - CAR(_$CategoryFrame$Lisp)$Lisp + %head(_$CategoryFrame$Lisp)$Foreign(Builtin) coerce s == (contours s)::OutputForm @@ -478,7 +478,7 @@ Environment(): Public == Private where Private == add Rep == List Scope empty() == - per NIL$Lisp + per %nil$Foreign(Builtin) scopes e == rep e diff --git a/src/algebra/domain.spad.pamphlet b/src/algebra/domain.spad.pamphlet index 19fde086..4e42fd6f 100644 --- a/src/algebra/domain.spad.pamphlet +++ b/src/algebra/domain.spad.pamphlet @@ -52,7 +52,7 @@ FunctionDescriptor(): Public == Private where ++ \spad{signature(x)} returns the signature of function ++ described by \spad{x}. Private == add - signature x == CAR(x)$Lisp + signature x == %head(x)$Foreign(Builtin) x = y == EQUAL(x,y)$Lisp coerce x == (x : Syntax)::OutputForm @@ -164,11 +164,14 @@ ConstructorCall(C: ConstructorCategory): Public == Private where ++ arguments used to invoke the constructor. Private == add + import %head: % -> C from Foreign Builtin + import %tail: % -> List Syntax from Foreign Builtin + constructor x == - CAR(x)$Lisp + %head x arguments x == - CDR(x)$Lisp + %tail x x = y == EQUAL(x,y)$Lisp @@ -243,7 +246,7 @@ FunctorData(): Public == Private where ++ \spad{lookupFunction x} returns the name of the lookup ++ function associated with the functor data \spad{x}. Private == add - domainTemplate x == CAR(x)$Foreign(Builtin) + domainTemplate x == %head(x)$Foreign(Builtin) attributeData x == CADDR(x)$Foreign(Builtin) part3Data(x: %): SExpression == CADDDR(x)$Foreign(Builtin) @@ -333,7 +336,7 @@ OperatorSignature(): Public == Private where ++ operator name `op', and signature `sig'. Private == add construct(o,s) == LIST(o,s)$Lisp - name x == CAR(x)$Lisp + name x == %head(x)$Foreign(Builtin) signature x == CADR(x)$Lisp x = y == EQUAL(x,y)$Lisp arity x == (#source signature x)::Arity @@ -386,17 +389,17 @@ Category(): Public == Private where ++ extended by the category `c'. Private == add constructor x == - CAR(devaluate(x)$Lisp)$Lisp + %head(devaluate(x)$Lisp)$Foreign(Builtin) exportedOperators c == - [CAR(x)$Lisp@OperatorSignature + [%head(x)$Foreign(Builtin)@OperatorSignature for x in getCategoryExports(c)$Lisp@List(Syntax)] principalAncestors c == getCategoryPrincipalAncestors(c)$Lisp parents c == - [CAR(x)$Lisp@ConstructorCall(CategoryConstructor) + [%head(x)$Foreign(Builtin)@ConstructorCall(CategoryConstructor) for x in getCategoryParents(c)$Lisp@List(Syntax)] coerce x == @@ -434,7 +437,7 @@ Domain(): Public == Private where Private == add constructor x == - CAR(devaluate(x)$Lisp)$Lisp + %head(devaluate(x)$Lisp)$Foreign(Builtin) coerce x == outputDomainConstructor(x)$Lisp diff --git a/src/algebra/integer.spad.pamphlet b/src/algebra/integer.spad.pamphlet index c2bcb16f..2ca80be3 100644 --- a/src/algebra/integer.spad.pamphlet +++ b/src/algebra/integer.spad.pamphlet @@ -174,29 +174,30 @@ Integer: Join(IntegerNumberSystem, ConvertibleTo String, OpenMath) with Record(mat:Matrix(Integer), vec:Vector(Integer)) == [m pretend Matrix(Integer), vec pretend Vector(Integer)] - abs(x) == ABS(x)$Lisp + abs(x) == %iabs(x)$Foreign(Builtin) random() == random()$Lisp random(x) == RANDOM(x)$Lisp - x = y == EQL(x,y)$Lisp - x < y == (x<y)$Lisp - x > y == (x > y)$Lisp -- Don't rely on default; help the inliner - x <= y == (x <= y)$Lisp -- Ditto - x >= y == (x >= y)$Lisp -- Ditto + x = y == %ieq(x,y)$Foreign(Builtin) + x < y == %ilt(x,y)$Foreign(Builtin) + x > y == %igt(x,y)$Foreign(Builtin) + x <= y == %ile(x,y)$Foreign(Builtin) + x >= y == %ige(x,y)$Foreign(Builtin) - x == (-x)$Lisp - x + y == (x+y)$Lisp - x - y == (x-y)$Lisp - x * y == (x*y)$Lisp - (m:Integer) * (y:%) == (m*y)$Lisp -- for subsumption problem - x ** n == EXPT(x,n)$Lisp - odd? x == ODDP(x)$Lisp - max(x,y) == MAX(x,y)$Lisp - min(x,y) == MIN(x,y)$Lisp + x + y == %iadd(x,y)$Foreign(Builtin) + x - y == %isub(x,y)$Foreign(Builtin) + x * y == %imul(x,y)$Foreign(Builtin) + (m:Integer) * (y:%) == + %imul(m,y)$Foreign(Builtin) -- for subsumption problem + x ** n == %ipow(x,n)$Foreign(Builtin) + odd? x == %iodd?(x)$Foreign(Builtin) + max(x,y) == %imax(x,y)$Foreign(Builtin) + min(x,y) == %imin(x,y)$Foreign(Builtin) divide(x,y) == DIVIDE2(x,y)$Lisp x quo y == QUOTIENT2(x,y)$Lisp x rem y == REMAINDER2(x,y)$Lisp shift(x, y) == ASH(x,y)$Lisp recip(x) == if one? x or x=-1 then x else "failed" - gcd(x,y) == GCD(x,y)$Lisp + gcd(x,y) == %igcd(x,y)$Foreign(Builtin) UCA ==> Record(unit:%,canonical:%,associate:%) unitNormal x == x < 0 => [-1,-x,-1]$UCA @@ -271,7 +272,7 @@ NonNegativeInteger: Join(OrderedAbelianMonoidSup,Monoid) with == SubDomain(Integer,#1 >= 0) add x,y:% - sup(x,y) == MAX(x,y)$Lisp + sup(x,y) == %imax(x,y)$Foreign(Builtin) shift(x:%, n:Integer):% == ASH(x,n)$Lisp subtractIfCan(x, y) == c:Integer := rep x - rep y diff --git a/src/algebra/outform.spad.pamphlet b/src/algebra/outform.spad.pamphlet index 8ad69b52..b951f6c4 100644 --- a/src/algebra/outform.spad.pamphlet +++ b/src/algebra/outform.spad.pamphlet @@ -486,8 +486,8 @@ OutputForm(): SetCategory with -- uniformize integrals, products, etc as plexes. cons ==> CONS$Lisp - car ==> CAR$Lisp - cdr ==> CDR$Lisp + car ==> %head$Foreign(Builtin) + cdr ==> %tail$Foreign(Builtin) format: String := "~G" doubleFloatFormat(s:String): String == 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 diff --git a/src/algebra/strap/ABELGRP.lsp b/src/algebra/strap/ABELGRP.lsp index 35bde847..db5ae7cf 100644 --- a/src/algebra/strap/ABELGRP.lsp +++ b/src/algebra/strap/ABELGRP.lsp @@ -4,8 +4,8 @@ (DEFPARAMETER |AbelianGroup;AL| 'NIL) (DEFUN |AbelianGroup;| () - (LET ((#0=#:G1398 - (|sublisV| (PAIR '(#1=#:G1397) (LIST '(|Integer|))) + (LET ((#0=#:G1399 + (|sublisV| (PAIR '(#1=#:G1398) (LIST '(|Integer|))) (|Join| (|CancellationAbelianMonoid|) (|LeftLinearSet| '#1#) (|mkCategory| '|domain| diff --git a/src/algebra/strap/ABELMON.lsp b/src/algebra/strap/ABELMON.lsp index 6a82ed1d..cfdd1b16 100644 --- a/src/algebra/strap/ABELMON.lsp +++ b/src/algebra/strap/ABELMON.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |AbelianMonoid;AL| 'NIL) (DEFUN |AbelianMonoid;| () - (LET ((#0=#:G1397 + (LET ((#0=#:G1398 (|Join| (|AbelianSemiGroup|) (|mkCategory| '|domain| '(((|Zero| ($) |constant|) T) diff --git a/src/algebra/strap/ABELSG.lsp b/src/algebra/strap/ABELSG.lsp index ace6b216..46363f44 100644 --- a/src/algebra/strap/ABELSG.lsp +++ b/src/algebra/strap/ABELSG.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |AbelianSemiGroup;AL| 'NIL) (DEFUN |AbelianSemiGroup;| () - (LET ((#0=#:G1396 + (LET ((#0=#:G1397 (|Join| (|SetCategory|) (|mkCategory| '|domain| '(((+ ($ $ $)) T) diff --git a/src/algebra/strap/ALAGG.lsp b/src/algebra/strap/ALAGG.lsp index 330c0726..662bc48d 100644 --- a/src/algebra/strap/ALAGG.lsp +++ b/src/algebra/strap/ALAGG.lsp @@ -6,12 +6,12 @@ (DEFPARAMETER |AssociationListAggregate;AL| 'NIL) (DEFUN |AssociationListAggregate;| (|t#1| |t#2|) - (LET ((#0=#:G1398 + (LET ((#0=#:G1399 (|sublisV| (PAIR '(|t#1| |t#2|) (LIST (|devaluate| |t#1|) (|devaluate| |t#2|))) (|sublisV| - (PAIR '(#1=#:G1397) + (PAIR '(#1=#:G1398) (LIST '(|Record| (|:| |key| |t#1|) (|:| |entry| |t#2|)))) (COND @@ -35,9 +35,9 @@ (|devaluate| |t#2|))) #0#)) -(DEFUN |AssociationListAggregate| (&REST #0=#:G1401 &AUX #1=#:G1399) +(DEFUN |AssociationListAggregate| (&REST #0=#:G1402 &AUX #1=#:G1400) (DSETQ #1# #0#) - (LET ((#2=#:G1400 + (LET ((#2=#:G1401 (|assoc| (|devaluateList| #1#) |AssociationListAggregate;AL|))) (COND diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp index 2910174e..050afcf3 100644 --- a/src/algebra/strap/BOOLEAN.lsp +++ b/src/algebra/strap/BOOLEAN.lsp @@ -153,7 +153,7 @@ (DEFUN |Boolean| () (PROG () (RETURN - (PROG (#0=#:G1423) + (PROG (#0=#:G1424) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|Boolean|) |Boolean|) diff --git a/src/algebra/strap/CABMON.lsp b/src/algebra/strap/CABMON.lsp index d007aa1c..0772044a 100644 --- a/src/algebra/strap/CABMON.lsp +++ b/src/algebra/strap/CABMON.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |CancellationAbelianMonoid;AL| 'NIL) (DEFUN |CancellationAbelianMonoid;| () - (LET ((#0=#:G1396 + (LET ((#0=#:G1397 (|Join| (|AbelianMonoid|) (|mkCategory| '|domain| '(((|subtractIfCan| ((|Union| $ "failed") $ $)) diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp index 42f0396f..95bc03af 100644 --- a/src/algebra/strap/CHAR.lsp +++ b/src/algebra/strap/CHAR.lsp @@ -124,11 +124,11 @@ (DEFUN |CHAR;index;Pi$;7| (|n| $) (CODE-CHAR - (LET ((#0=#:G1404 (- |n| 1))) + (LET ((#0=#:G1405 (- |n| 1))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)))) (DEFUN |CHAR;lookup;$Pi;8| (|c| $) - (LET ((#0=#:G1406 (+ 1 (CHAR-CODE |c|)))) + (LET ((#0=#:G1407 (+ 1 (CHAR-CODE |c|)))) (|check-subtype| (> #0# 0) '(|PositiveInteger|) #0#))) (DEFUN |CHAR;char;Nni$;9| (|n| $) @@ -188,7 +188,7 @@ (DEFUN |Character| () (PROG () (RETURN - (PROG (#0=#:G1426) + (PROG (#0=#:G1427) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|Character|) diff --git a/src/algebra/strap/CLAGG-.lsp b/src/algebra/strap/CLAGG-.lsp index 528c7762..b83cf1da 100644 --- a/src/algebra/strap/CLAGG-.lsp +++ b/src/algebra/strap/CLAGG-.lsp @@ -45,7 +45,7 @@ (LENGTH (SPADCALL |c| (|getShellEntry| $ 9)))) (DEFUN |CLAGG-;count;MANni;2| (|f| |c| $) - (PROG (|x| #0=#:G1428 #1=#:G1402 #2=#:G1400 #3=#:G1401) + (PROG (|x| #0=#:G1429 #1=#:G1403 #2=#:G1401 #3=#:G1402) (RETURN (SEQ (PROGN (LETT #3# NIL |CLAGG-;count;MANni;2|) @@ -75,7 +75,7 @@ (COND (#3# #2#) ('T 0))))))) (DEFUN |CLAGG-;any?;MAB;3| (|f| |c| $) - (PROG (|x| #0=#:G1429 #1=#:G1407 #2=#:G1405 #3=#:G1406) + (PROG (|x| #0=#:G1430 #1=#:G1408 #2=#:G1406 #3=#:G1407) (RETURN (SEQ (PROGN (LETT #3# NIL |CLAGG-;any?;MAB;3|) @@ -103,7 +103,7 @@ (COND (#3# #2#) ('T NIL))))))) (DEFUN |CLAGG-;every?;MAB;4| (|f| |c| $) - (PROG (|x| #0=#:G1430 #1=#:G1411 #2=#:G1409 #3=#:G1410) + (PROG (|x| #0=#:G1431 #1=#:G1412 #2=#:G1410 #3=#:G1411) (RETURN (SEQ (PROGN (LETT #3# NIL |CLAGG-;every?;MAB;4|) diff --git a/src/algebra/strap/CLAGG.lsp b/src/algebra/strap/CLAGG.lsp index eab9160d..44c9ad25 100644 --- a/src/algebra/strap/CLAGG.lsp +++ b/src/algebra/strap/CLAGG.lsp @@ -6,7 +6,7 @@ (DEFPARAMETER |Collection;AL| 'NIL) (DEFUN |Collection;| (|t#1|) - (LET ((#0=#:G1396 + (LET ((#0=#:G1397 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|Collection;CAT|) @@ -73,8 +73,8 @@ (|setShellEntry| #0# 0 (LIST '|Collection| (|devaluate| |t#1|))) #0#)) -(DEFUN |Collection| (#0=#:G1397) - (LET ((#1=#:G1398 (|assoc| (|devaluate| #0#) |Collection;AL|))) +(DEFUN |Collection| (#0=#:G1398) + (LET ((#1=#:G1399 (|assoc| (|devaluate| #0#) |Collection;AL|))) (COND (#1# (CDR #1#)) (T (PROGN diff --git a/src/algebra/strap/COMRING.lsp b/src/algebra/strap/COMRING.lsp index 0db745eb..d7eeb604 100644 --- a/src/algebra/strap/COMRING.lsp +++ b/src/algebra/strap/COMRING.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |CommutativeRing;AL| 'NIL) (DEFUN |CommutativeRing;| () - (LET ((#0=#:G1396 + (LET ((#0=#:G1397 (|Join| (|Ring|) (|BiModule| '$ '$) (|mkCategory| '|package| NIL '(((|commutative| "*") T)) 'NIL NIL)))) diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index 6f405951..a3eca772 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -459,7 +459,7 @@ ((EQL (FLOAT-RADIX 0.0) 2) (FLOAT-DIGITS 0.0)) ((EQL (FLOAT-RADIX 0.0) 16) (* 4 (FLOAT-DIGITS 0.0))) ('T - (LET ((#0=#:G1424 + (LET ((#0=#:G1425 (FIX (SPADCALL (FLOAT-DIGITS 0.0) (|DFLOAT;log2;2$;40| (FLOAT (FLOAT-RADIX 0.0) @@ -662,14 +662,14 @@ (DEFUN |DFLOAT;retract;$F;80| (|x| $) (|DFLOAT;rationalApproximation;$2NniF;87| |x| - (LET ((#0=#:G1503 (- (FLOAT-DIGITS 0.0) 1))) + (LET ((#0=#:G1504 (- (FLOAT-DIGITS 0.0) 1))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (FLOAT-RADIX 0.0) $)) (DEFUN |DFLOAT;retractIfCan;$U;81| (|x| $) (CONS 0 (|DFLOAT;rationalApproximation;$2NniF;87| |x| - (LET ((#0=#:G1511 (- (FLOAT-DIGITS 0.0) 1))) + (LET ((#0=#:G1512 (- (FLOAT-DIGITS 0.0) 1))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (FLOAT-RADIX 0.0) $))) @@ -698,7 +698,7 @@ (FLOAT-SIGN 1.0 |x|)) (DEFUN |DFLOAT;manexp| (|x| $) - (PROG (|s| #0=#:G1528 |me| |two53|) + (PROG (|s| #0=#:G1529 |me| |two53|) (RETURN (SEQ (EXIT (COND ((ZEROP |x|) (CONS 0 0)) @@ -733,7 +733,7 @@ (DEFUN |DFLOAT;rationalApproximation;$2NniF;87| (|f| |d| |b| $) (PROG (|#G109| |nu| |ex| BASE |de| |tol| |#G110| |q| |r| |p2| |q2| - #0=#:G1538 |#G111| |#G112| |p0| |p1| |#G113| |#G114| + #0=#:G1539 |#G111| |#G112| |p0| |p1| |#G113| |#G114| |q0| |q1| |#G115| |#G116| |s| |t|) (RETURN (SEQ (EXIT (SEQ (LETT |#G109| (|DFLOAT;manexp| |f| $) @@ -756,7 +756,7 @@ ('T (SEQ (LETT |de| (EXPT BASE - (LET ((#1=#:G1539 (- |ex|))) + (LET ((#1=#:G1540 (- |ex|))) (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#))) |DFLOAT;rationalApproximation;$2NniF;87|) @@ -846,7 +846,7 @@ #0# (EXIT #0#))))) (DEFUN |DFLOAT;**;$F$;88| (|x| |r| $) - (PROG (|n| |d| #0=#:G1549) + (PROG (|n| |d| #0=#:G1550) (RETURN (SEQ (EXIT (COND ((ZEROP |x|) @@ -908,7 +908,7 @@ (DEFUN |DoubleFloat| () (PROG () (RETURN - (PROG (#0=#:G1561) + (PROG (#0=#:G1562) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|DoubleFloat|) diff --git a/src/algebra/strap/DIFRING.lsp b/src/algebra/strap/DIFRING.lsp index c19b4ed8..2d5ab93c 100644 --- a/src/algebra/strap/DIFRING.lsp +++ b/src/algebra/strap/DIFRING.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |DifferentialRing;AL| 'NIL) (DEFUN |DifferentialRing;| () - (LET ((#0=#:G1396 + (LET ((#0=#:G1397 (|Join| (|Ring|) (|mkCategory| '|domain| '(((|differentiate| ($ $)) T) ((D ($ $)) T) diff --git a/src/algebra/strap/DIVRING.lsp b/src/algebra/strap/DIVRING.lsp index 89d83592..3f98dc82 100644 --- a/src/algebra/strap/DIVRING.lsp +++ b/src/algebra/strap/DIVRING.lsp @@ -4,9 +4,9 @@ (DEFPARAMETER |DivisionRing;AL| 'NIL) (DEFUN |DivisionRing;| () - (LET ((#0=#:G1399 + (LET ((#0=#:G1400 (|sublisV| - (PAIR '(#1=#:G1398) (LIST '(|Fraction| (|Integer|)))) + (PAIR '(#1=#:G1399) (LIST '(|Fraction| (|Integer|)))) (|Join| (|EntireRing|) (|Algebra| '#1#) (|mkCategory| '|domain| '(((** ($ $ (|Integer|))) T) diff --git a/src/algebra/strap/ENTIRER.lsp b/src/algebra/strap/ENTIRER.lsp index 0b7c5750..7b021105 100644 --- a/src/algebra/strap/ENTIRER.lsp +++ b/src/algebra/strap/ENTIRER.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |EntireRing;AL| 'NIL) (DEFUN |EntireRing;| () - (LET ((#0=#:G1396 + (LET ((#0=#:G1397 (|Join| (|Ring|) (|BiModule| '$ '$) (|mkCategory| '|package| NIL '((|noZeroDivisors| T)) 'NIL NIL)))) diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp index adf7a481..182e6cb0 100644 --- a/src/algebra/strap/EUCDOM-.lsp +++ b/src/algebra/strap/EUCDOM-.lsp @@ -224,7 +224,7 @@ (|getShellEntry| $ 33)))))))))))))))) (DEFUN |EUCDOM-;principalIdeal;LR;9| (|l| $) - (PROG (|uca| |v| |u| #0=#:G1517 |vv| #1=#:G1518) + (PROG (|uca| |v| |u| #0=#:G1518 |vv| #1=#:G1519) (RETURN (SEQ (COND ((SPADCALL |l| NIL (|getShellEntry| $ 42)) @@ -281,7 +281,7 @@ (QVELT |u| 2)))))))))) (DEFUN |EUCDOM-;expressIdealMember;LSU;10| (|l| |z| $) - (PROG (#0=#:G1519 #1=#:G1520 |pid| |q| #2=#:G1521 |v| #3=#:G1522) + (PROG (#0=#:G1520 #1=#:G1521 |pid| |q| #2=#:G1522 |v| #3=#:G1523) (RETURN (SEQ (COND ((SPADCALL |z| (|spadConstant| $ 19) @@ -346,9 +346,9 @@ (EXIT (NREVERSE0 #2#))))))))))))))) (DEFUN |EUCDOM-;multiEuclidean;LSU;11| (|l| |z| $) - (PROG (|n| |l1| |l2| #0=#:G1396 #1=#:G1523 #2=#:G1504 #3=#:G1502 - #4=#:G1503 #5=#:G1397 #6=#:G1524 #7=#:G1507 #8=#:G1505 - #9=#:G1506 |u| |v1| |v2|) + (PROG (|n| |l1| |l2| #0=#:G1397 #1=#:G1524 #2=#:G1505 #3=#:G1503 + #4=#:G1504 #5=#:G1398 #6=#:G1525 #7=#:G1508 #8=#:G1506 + #9=#:G1507 |u| |v1| |v2|) (RETURN (SEQ (LETT |n| (LENGTH |l|) |EUCDOM-;multiEuclidean;LSU;11|) (EXIT (COND diff --git a/src/algebra/strap/EUCDOM.lsp b/src/algebra/strap/EUCDOM.lsp index ecceaa38..b9413824 100644 --- a/src/algebra/strap/EUCDOM.lsp +++ b/src/algebra/strap/EUCDOM.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |EuclideanDomain;AL| 'NIL) (DEFUN |EuclideanDomain;| () - (LET ((#0=#:G1413 + (LET ((#0=#:G1414 (|Join| (|PrincipalIdealDomain|) (|mkCategory| '|domain| '(((|sizeLess?| ((|Boolean|) $ $)) T) diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp index 1aa363e0..7fecd7b2 100644 --- a/src/algebra/strap/FFIELDC-.lsp +++ b/src/algebra/strap/FFIELDC-.lsp @@ -124,7 +124,7 @@ (EXIT |e|))))) (DEFUN |FFIELDC-;primitive?;SB;9| (|a| $) - (PROG (|explist| |q| |exp| #0=#:G1512 |equalone|) + (PROG (|explist| |q| |exp| #0=#:G1513 |equalone|) (RETURN (SEQ (COND ((SPADCALL |a| (|getShellEntry| $ 16)) NIL) @@ -157,7 +157,7 @@ (EXIT (NOT |equalone|))))))))) (DEFUN |FFIELDC-;order;SPi;10| (|e| $) - (PROG (|lof| |rec| #0=#:G1513 |primeDivisor| |j| #1=#:G1514 |a| + (PROG (|lof| |rec| #0=#:G1514 |primeDivisor| |j| #1=#:G1515 |a| |goon| |ord|) (RETURN (SEQ (COND @@ -222,7 +222,7 @@ (EXIT |ord|)))))))) (DEFUN |FFIELDC-;discreteLog;SNni;11| (|b| $) - (PROG (|faclist| |gen| |groupord| |f| #0=#:G1515 |fac| |t| #1=#:G1516 + (PROG (|faclist| |gen| |groupord| |f| #0=#:G1516 |fac| |t| #1=#:G1517 |exp| |exptable| |n| |end| |i| |rho| |found| |disc1| |c| |mult| |disclog| |a|) (RETURN @@ -377,8 +377,8 @@ (EXIT |disclog|)))))))))))) (DEFUN |FFIELDC-;discreteLog;2SU;12| (|logbase| |b| $) - (PROG (|groupord| |faclist| |f| #0=#:G1517 |fac| |primroot| |t| - #1=#:G1518 |exp| |rhoHelp| #2=#:G1498 |rho| |disclog| + (PROG (|groupord| |faclist| |f| #0=#:G1518 |fac| |primroot| |t| + #1=#:G1519 |exp| |rhoHelp| #2=#:G1499 |rho| |disclog| |mult| |a|) (RETURN (SEQ (EXIT (COND @@ -506,7 +506,7 @@ (SPADCALL |f| (|getShellEntry| $ 98))) (DEFUN |FFIELDC-;factorSquareFreePolynomial| (|f| $) - (PROG (|flist| |u| #0=#:G1519 #1=#:G1508 #2=#:G1506 #3=#:G1507) + (PROG (|flist| |u| #0=#:G1520 #1=#:G1509 #2=#:G1507 #3=#:G1508) (RETURN (SEQ (COND ((SPADCALL |f| (|spadConstant| $ 99) diff --git a/src/algebra/strap/FFIELDC.lsp b/src/algebra/strap/FFIELDC.lsp index 91dc1f86..9b7237a5 100644 --- a/src/algebra/strap/FFIELDC.lsp +++ b/src/algebra/strap/FFIELDC.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |FiniteFieldCategory;AL| 'NIL) (DEFUN |FiniteFieldCategory;| () - (LET ((#0=#:G1404 + (LET ((#0=#:G1405 (|Join| (|FieldOfPrimeCharacteristic|) (|Finite|) (|StepThrough|) (|DifferentialRing|) (|mkCategory| '|domain| diff --git a/src/algebra/strap/FPS-.lsp b/src/algebra/strap/FPS-.lsp index ed9f96a4..50471189 100644 --- a/src/algebra/strap/FPS-.lsp +++ b/src/algebra/strap/FPS-.lsp @@ -12,7 +12,7 @@ (|getShellEntry| $ 10))) (DEFUN |FPS-;digits;Pi;2| ($) - (LET ((#0=#:G1401 + (LET ((#0=#:G1402 (MAX 1 (QUOTIENT2 (SPADCALL 4004 diff --git a/src/algebra/strap/FPS.lsp b/src/algebra/strap/FPS.lsp index 3d7e42bb..1d84e2f8 100644 --- a/src/algebra/strap/FPS.lsp +++ b/src/algebra/strap/FPS.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |FloatingPointSystem;AL| 'NIL) (DEFUN |FloatingPointSystem;| () - (LET ((#0=#:G1396 + (LET ((#0=#:G1397 (|Join| (|RealNumberSystem|) (|mkCategory| '|domain| '(((|float| ($ (|Integer|) (|Integer|))) T) diff --git a/src/algebra/strap/GCDDOM-.lsp b/src/algebra/strap/GCDDOM-.lsp index 89fa1dac..af8bb4ba 100644 --- a/src/algebra/strap/GCDDOM-.lsp +++ b/src/algebra/strap/GCDDOM-.lsp @@ -43,7 +43,7 @@ (|getShellEntry| $ 19))) (DEFUN |GCDDOM-;gcdPolynomial;3Sup;4| (|p1| |p2| $) - (PROG (|e2| |e1| |c1| |p| |c2| #0=#:G1417) + (PROG (|e2| |e1| |c1| |p| |c2| #0=#:G1418) (RETURN (SEQ (COND ((SPADCALL |p1| (|getShellEntry| $ 24)) diff --git a/src/algebra/strap/GCDDOM.lsp b/src/algebra/strap/GCDDOM.lsp index cf17f4a6..d1dbce16 100644 --- a/src/algebra/strap/GCDDOM.lsp +++ b/src/algebra/strap/GCDDOM.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |GcdDomain;AL| 'NIL) (DEFUN |GcdDomain;| () - (LET ((#0=#:G1402 + (LET ((#0=#:G1403 (|Join| (|IntegralDomain|) (|mkCategory| '|domain| '(((|gcd| ($ $ $)) T) diff --git a/src/algebra/strap/HOAGG-.lsp b/src/algebra/strap/HOAGG-.lsp index 96d009a0..d5cf82f5 100644 --- a/src/algebra/strap/HOAGG-.lsp +++ b/src/algebra/strap/HOAGG-.lsp @@ -45,7 +45,7 @@ (LENGTH (SPADCALL |c| (|getShellEntry| $ 15)))) (DEFUN |HOAGG-;any?;MAB;3| (|f| |c| $) - (PROG (|x| #0=#:G1427 #1=#:G1405 #2=#:G1403 #3=#:G1404) + (PROG (|x| #0=#:G1428 #1=#:G1406 #2=#:G1404 #3=#:G1405) (RETURN (SEQ (PROGN (LETT #3# NIL |HOAGG-;any?;MAB;3|) @@ -73,7 +73,7 @@ (COND (#3# #2#) ('T NIL))))))) (DEFUN |HOAGG-;every?;MAB;4| (|f| |c| $) - (PROG (|x| #0=#:G1428 #1=#:G1410 #2=#:G1408 #3=#:G1409) + (PROG (|x| #0=#:G1429 #1=#:G1411 #2=#:G1409 #3=#:G1410) (RETURN (SEQ (PROGN (LETT #3# NIL |HOAGG-;every?;MAB;4|) @@ -101,7 +101,7 @@ (COND (#3# #2#) ('T T))))))) (DEFUN |HOAGG-;count;MANni;5| (|f| |c| $) - (PROG (|x| #0=#:G1429 #1=#:G1414 #2=#:G1412 #3=#:G1413) + (PROG (|x| #0=#:G1430 #1=#:G1415 #2=#:G1413 #3=#:G1414) (RETURN (SEQ (PROGN (LETT #3# NIL |HOAGG-;count;MANni;5|) @@ -150,8 +150,8 @@ (|getShellEntry| (|getShellEntry| $$ 0) 30))) (DEFUN |HOAGG-;=;2AB;9| (|x| |y| $) - (PROG (|b| #0=#:G1431 |a| #1=#:G1430 #2=#:G1421 #3=#:G1419 - #4=#:G1420) + (PROG (|b| #0=#:G1432 |a| #1=#:G1431 #2=#:G1422 #3=#:G1420 + #4=#:G1421) (RETURN (SEQ (COND ((SPADCALL |x| (SPADCALL |y| (|getShellEntry| $ 35)) @@ -195,7 +195,7 @@ ('T NIL)))))) (DEFUN |HOAGG-;coerce;AOf;10| (|x| $) - (PROG (#0=#:G1432 |a| #1=#:G1433) + (PROG (#0=#:G1433 |a| #1=#:G1434) (RETURN (SEQ (SPADCALL (SPADCALL diff --git a/src/algebra/strap/HOAGG.lsp b/src/algebra/strap/HOAGG.lsp index be929da3..5bb1cf07 100644 --- a/src/algebra/strap/HOAGG.lsp +++ b/src/algebra/strap/HOAGG.lsp @@ -6,7 +6,7 @@ (DEFPARAMETER |HomogeneousAggregate;AL| 'NIL) (DEFUN |HomogeneousAggregate;| (|t#1|) - (LET ((#0=#:G1397 + (LET ((#0=#:G1398 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|HomogeneousAggregate;CAT|) @@ -77,8 +77,8 @@ (LIST '|HomogeneousAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |HomogeneousAggregate| (#0=#:G1398) - (LET ((#1=#:G1399 +(DEFUN |HomogeneousAggregate| (#0=#:G1399) + (LET ((#1=#:G1400 (|assoc| (|devaluate| #0#) |HomogeneousAggregate;AL|))) (COND (#1# (CDR #1#)) diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index 833b244a..e15bfe2f 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -259,7 +259,7 @@ (|getShellEntry| $ 44))))))))))) (DEFUN |ILIST;=;2$B;22| (|x| |y| $) - (PROG (#0=#:G1468) + (PROG (#0=#:G1469) (RETURN (SEQ (EXIT (COND ((EQ |x| |y|) T) @@ -308,7 +308,7 @@ (EXIT (STRCONC |s| " \\right]")))))) (DEFUN |ILIST;member?;S$B;24| (|s| |x| $) - (PROG (#0=#:G1476) + (PROG (#0=#:G1477) (RETURN (SEQ (EXIT (SEQ (SEQ G190 (COND ((NULL (NOT (NULL |x|))) (GO G191))) @@ -428,7 +428,7 @@ ('T (SEQ (LETT |p| (|ILIST;rest;$Nni$;19| |p| - (LET ((#0=#:G1507 (- |n| 1))) + (LET ((#0=#:G1508 (- |n| 1))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) $) @@ -449,7 +449,7 @@ ((< |n| 3) |p|) ('T (SEQ (LETT |l| - (LET ((#0=#:G1512 (QUOTIENT2 |n| 2))) + (LET ((#0=#:G1513 (QUOTIENT2 |n| 2))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) |ILIST;mergeSort|) @@ -463,11 +463,11 @@ |ILIST;mergeSort|) (EXIT (|ILIST;merge!;M3$;28| |f| |p| |q| $)))))))))) -(DEFUN |IndexedList| (&REST #0=#:G1521 &AUX #1=#:G1519) +(DEFUN |IndexedList| (&REST #0=#:G1522 &AUX #1=#:G1520) (DSETQ #1# #0#) (PROG () (RETURN - (PROG (#2=#:G1520) + (PROG (#2=#:G1521) (RETURN (COND ((LETT #2# diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp index 3334337c..4fb5914a 100644 --- a/src/algebra/strap/INS-.lsp +++ b/src/algebra/strap/INS-.lsp @@ -124,10 +124,10 @@ ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 27)) (|error| "euclideanSize called on zero")) ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 28)) - (LET ((#0=#:G1425 (- (SPADCALL |x| (|getShellEntry| $ 30))))) + (LET ((#0=#:G1426 (- (SPADCALL |x| (|getShellEntry| $ 30))))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#))) ('T - (LET ((#1=#:G1426 (SPADCALL |x| (|getShellEntry| $ 30)))) + (LET ((#1=#:G1427 (SPADCALL |x| (|getShellEntry| $ 30)))) (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#))))) (DEFUN |INS-;convert;SF;10| (|x| $) @@ -275,7 +275,7 @@ ('T |c1|))))))) (DEFUN |INS-;powmod;4S;29| (|x| |n| |p| $) - (PROG (|y| #0=#:G1482 |z|) + (PROG (|y| #0=#:G1483 |z|) (RETURN (SEQ (EXIT (SEQ (COND ((SPADCALL |x| (|getShellEntry| $ 85)) diff --git a/src/algebra/strap/INS.lsp b/src/algebra/strap/INS.lsp index 774558d4..41a8e7d7 100644 --- a/src/algebra/strap/INS.lsp +++ b/src/algebra/strap/INS.lsp @@ -4,10 +4,10 @@ (DEFPARAMETER |IntegerNumberSystem;AL| 'NIL) (DEFUN |IntegerNumberSystem;| () - (LET ((#0=#:G1413 + (LET ((#0=#:G1414 (|sublisV| - (PAIR '(#1=#:G1407 #2=#:G1408 #3=#:G1409 #4=#:G1410 - #5=#:G1411 #6=#:G1412) + (PAIR '(#1=#:G1408 #2=#:G1409 #3=#:G1410 #4=#:G1411 + #5=#:G1412 #6=#:G1413) (LIST '(|Integer|) '(|Integer|) '(|Integer|) '(|InputForm|) '(|Pattern| (|Integer|)) '(|Integer|))) diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index ec1689fe..172fcd30 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -25,7 +25,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Boolean|) |INT;one?;$B;7|)) -(PUT '|INT;one?;$B;7| '|SPADreplace| '(XLAM (|x|) (EQL |x| 1))) +(PUT '|INT;one?;$B;7| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 1))) (DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Integer|) |INT;Zero;$;8|)) @@ -47,12 +47,12 @@ (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Integer|) |INT;inc;2$;12|)) -(PUT '|INT;inc;2$;12| '|SPADreplace| '(XLAM (|x|) (+ |x| 1))) +(PUT '|INT;inc;2$;12| '|SPADreplace| '(XLAM (|x|) (|%iadd| |x| 1))) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Integer|) |INT;dec;2$;13|)) -(PUT '|INT;dec;2$;13| '|SPADreplace| '(XLAM (|x|) (- |x| 1))) +(PUT '|INT;dec;2$;13| '|SPADreplace| '(XLAM (|x|) (|%isub| |x| 1))) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Short|) |INT;hash;$Si;14|)) @@ -131,7 +131,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Integer|) |INT;abs;2$;31|)) -(PUT '|INT;abs;2$;31| '|SPADreplace| 'ABS) +(PUT '|INT;abs;2$;31| '|SPADreplace| '|%iabs|) (DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Integer|) |INT;random;$;32|)) @@ -145,28 +145,27 @@ (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Boolean|) |INT;=;2$B;34|)) -(PUT '|INT;=;2$B;34| '|SPADreplace| 'EQL) +(PUT '|INT;=;2$B;34| '|SPADreplace| '|%ieq|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Boolean|) |INT;<;2$B;35|)) -(PUT '|INT;<;2$B;35| '|SPADreplace| '<) +(PUT '|INT;<;2$B;35| '|SPADreplace| '|%ilt|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Boolean|) |INT;>;2$B;36|)) -(PUT '|INT;>;2$B;36| '|SPADreplace| '>) +(PUT '|INT;>;2$B;36| '|SPADreplace| '|%igt|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Boolean|) |INT;<=;2$B;37|)) -(PUT '|INT;<=;2$B;37| '|SPADreplace| - '(XLAM (|x| |y|) (|%not| (> |x| |y|)))) +(PUT '|INT;<=;2$B;37| '|SPADreplace| '|%ile|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Boolean|) |INT;>=;2$B;38|)) -(PUT '|INT;>=;2$B;38| '|SPADreplace| '>=) +(PUT '|INT;>=;2$B;38| '|SPADreplace| '|%ige|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Integer|) |INT;-;2$;39|)) @@ -176,43 +175,43 @@ (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|) |INT;+;3$;40|)) -(PUT '|INT;+;3$;40| '|SPADreplace| '+) +(PUT '|INT;+;3$;40| '|SPADreplace| '|%iadd|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|) |INT;-;3$;41|)) -(PUT '|INT;-;3$;41| '|SPADreplace| '-) +(PUT '|INT;-;3$;41| '|SPADreplace| '|%isub|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|) |INT;*;3$;42|)) -(PUT '|INT;*;3$;42| '|SPADreplace| '*) +(PUT '|INT;*;3$;42| '|SPADreplace| '|%imul|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|) |INT;*;3$;43|)) -(PUT '|INT;*;3$;43| '|SPADreplace| '*) +(PUT '|INT;*;3$;43| '|SPADreplace| '|%imul|) (DECLAIM (FTYPE (FUNCTION (|%Integer| (|%IntegerSection| 0) |%Shell|) |%Integer|) |INT;**;$Nni$;44|)) -(PUT '|INT;**;$Nni$;44| '|SPADreplace| 'EXPT) +(PUT '|INT;**;$Nni$;44| '|SPADreplace| '|%ipow|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Boolean|) |INT;odd?;$B;45|)) -(PUT '|INT;odd?;$B;45| '|SPADreplace| 'ODDP) +(PUT '|INT;odd?;$B;45| '|SPADreplace| '|%iodd?|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|) |INT;max;3$;46|)) -(PUT '|INT;max;3$;46| '|SPADreplace| 'MAX) +(PUT '|INT;max;3$;46| '|SPADreplace| '|%imax|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|) |INT;min;3$;47|)) -(PUT '|INT;min;3$;47| '|SPADreplace| 'MIN) +(PUT '|INT;min;3$;47| '|SPADreplace| '|%imin|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Pair|) |INT;divide;2$R;48|)) @@ -240,7 +239,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|) |INT;gcd;3$;53|)) -(PUT '|INT;gcd;3$;53| '|SPADreplace| 'GCD) +(PUT '|INT;gcd;3$;53| '|SPADreplace| '|%igcd|) (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Shell|) |INT;unitNormal;$R;54|)) @@ -248,7 +247,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Integer|) |INT;unitCanonical;2$;55|)) -(PUT '|INT;unitCanonical;2$;55| '|SPADreplace| 'ABS) +(PUT '|INT;unitCanonical;2$;55| '|SPADreplace| '|%iabs|) (DECLAIM (FTYPE (FUNCTION (|%List| |%Thing| |%Shell|) |%Pair|) |INT;solveLinearPolynomialEquation|)) @@ -414,9 +413,7 @@ (DEFUN |INT;>;2$B;36| (|x| |y| $) (DECLARE (IGNORE $)) (> |x| |y|)) -(DEFUN |INT;<=;2$B;37| (|x| |y| $) - (DECLARE (IGNORE $)) - (NOT (> |x| |y|))) +(DEFUN |INT;<=;2$B;37| (|x| |y| $) (DECLARE (IGNORE $)) (<= |x| |y|)) (DEFUN |INT;>=;2$B;38| (|x| |y| $) (DECLARE (IGNORE $)) (>= |x| |y|)) @@ -471,56 +468,56 @@ (ABS |x|)) (DEFUN |INT;solveLinearPolynomialEquation| (|lp| |p| $) - (SPADCALL |lp| |p| (|getShellEntry| $ 103))) + (SPADCALL |lp| |p| (|getShellEntry| $ 102))) (DEFUN |INT;squareFreePolynomial| (|p| $) - (SPADCALL |p| (|getShellEntry| $ 107))) + (SPADCALL |p| (|getShellEntry| $ 106))) (DEFUN |INT;factorPolynomial| (|p| $) - (PROG (|pp| #0=#:G1498) + (PROG (|pp| #0=#:G1499) (RETURN - (SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 108)) + (SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 107)) |INT;factorPolynomial|) (EXIT (COND - ((EQL (SPADCALL |pp| (|getShellEntry| $ 109)) - (SPADCALL |p| (|getShellEntry| $ 109))) - (SPADCALL |p| (|getShellEntry| $ 111))) + ((EQL (SPADCALL |pp| (|getShellEntry| $ 108)) + (SPADCALL |p| (|getShellEntry| $ 108))) + (SPADCALL |p| (|getShellEntry| $ 110))) ('T - (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 111)) + (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 110)) (SPADCALL (CONS #'|INT;factorPolynomial!0| $) (SPADCALL (PROG2 (LETT #0# (SPADCALL (SPADCALL |p| - (|getShellEntry| $ 109)) + (|getShellEntry| $ 108)) (SPADCALL |pp| - (|getShellEntry| $ 109)) - (|getShellEntry| $ 113)) + (|getShellEntry| $ 108)) + (|getShellEntry| $ 112)) |INT;factorPolynomial|) (QCDR #0#) (|check-union| (QEQCAR #0# 0) $ #0#)) - (|getShellEntry| $ 115)) - (|getShellEntry| $ 119)) - (|getShellEntry| $ 121))))))))) + (|getShellEntry| $ 114)) + (|getShellEntry| $ 118)) + (|getShellEntry| $ 120))))))))) (DEFUN |INT;factorPolynomial!0| (|#1| $) - (SPADCALL |#1| (|getShellEntry| $ 112))) + (SPADCALL |#1| (|getShellEntry| $ 111))) (DEFUN |INT;factorSquareFreePolynomial| (|p| $) - (SPADCALL |p| (|getShellEntry| $ 122))) + (SPADCALL |p| (|getShellEntry| $ 121))) (DEFUN |INT;gcdPolynomial;3Sup;60| (|p| |q| $) (COND - ((SPADCALL |p| (|getShellEntry| $ 123)) - (SPADCALL |q| (|getShellEntry| $ 124))) - ((SPADCALL |q| (|getShellEntry| $ 123)) - (SPADCALL |p| (|getShellEntry| $ 124))) - ('T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 127))))) + ((SPADCALL |p| (|getShellEntry| $ 122)) + (SPADCALL |q| (|getShellEntry| $ 123))) + ((SPADCALL |q| (|getShellEntry| $ 122)) + (SPADCALL |p| (|getShellEntry| $ 123))) + ('T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 126))))) (DEFUN |Integer| () (PROG () (RETURN - (PROG (#0=#:G1523) + (PROG (#0=#:G1524) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|Integer|) |Integer|) @@ -535,13 +532,13 @@ ((NOT #0#) (HREM |$ConstructorCache| '|Integer|))))))))))) (DEFUN |Integer;| () - (LET ((|dv$| (LIST '|Integer|)) ($ (|newShell| 142)) + (LET ((|dv$| (LIST '|Integer|)) ($ (|newShell| 141)) (|pv$| (|buildPredVector| 0 0 NIL))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) (|haddProp| |$ConstructorCache| '|Integer| NIL (CONS 1 $)) (|stuffDomainSlots| $) - (|setShellEntry| $ 84 + (|setShellEntry| $ 83 (|setShellEntry| $ 53 (CONS (|dispatchFunction| |INT;*;3$;43|) $))) $)) @@ -579,61 +576,61 @@ (|Vector| 17) (|Record| (|:| |mat| 71) (|:| |vec| 74)) (|Vector| $) |INT;reducedSystem;MVR;30| |INT;abs;2$;31| |INT;random;$;32| |INT;random;2$;33| |INT;>;2$B;36| - (93 . |not|) |INT;<=;2$B;37| NIL |INT;**;$Nni$;44| - |INT;odd?;$B;45| |INT;max;3$;46| |INT;min;3$;47| + |INT;<=;2$B;37| NIL |INT;**;$Nni$;44| |INT;odd?;$B;45| + |INT;max;3$;46| |INT;min;3$;47| (|Record| (|:| |quotient| $) (|:| |remainder| $)) |INT;divide;2$R;48| |INT;quo;3$;49| |INT;shift;3$;51| (|Union| $ '"failed") |INT;recip;$U;52| |INT;gcd;3$;53| (|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $)) |INT;unitNormal;$R;54| |INT;unitCanonical;2$;55| - (|SparseUnivariatePolynomial| 17) (|List| 99) - (|Union| 100 '"failed") + (|SparseUnivariatePolynomial| 17) (|List| 98) + (|Union| 99 '"failed") (|IntegerSolveLinearPolynomialEquation|) - (98 . |solveLinearPolynomialEquation|) - (|SparseUnivariatePolynomial| $$) (|Factored| 104) - (|UnivariatePolynomialSquareFree| $$ 104) - (104 . |squareFree|) (109 . |primitivePart|) - (114 . |leadingCoefficient|) (|GaloisGroupFactorizer| 104) - (119 . |factor|) (124 . |coerce|) (129 . |exquo|) - (|Factored| $) (135 . |factor|) (|Mapping| 104 $$) - (|Factored| $$) (|FactoredFunctions2| $$ 104) - (140 . |map|) (|FactoredFunctionUtilities| 104) - (146 . |mergeFactors|) (152 . |factorSquareFree|) - (157 . |zero?|) (162 . |unitCanonical|) (|List| 104) - (|HeuGcd| 104) (167 . |gcd|) + (93 . |solveLinearPolynomialEquation|) + (|SparseUnivariatePolynomial| $$) (|Factored| 103) + (|UnivariatePolynomialSquareFree| $$ 103) + (99 . |squareFree|) (104 . |primitivePart|) + (109 . |leadingCoefficient|) (|GaloisGroupFactorizer| 103) + (114 . |factor|) (119 . |coerce|) (124 . |exquo|) + (|Factored| $) (130 . |factor|) (|Mapping| 103 $$) + (|Factored| $$) (|FactoredFunctions2| $$ 103) + (135 . |map|) (|FactoredFunctionUtilities| 103) + (141 . |mergeFactors|) (147 . |factorSquareFree|) + (152 . |zero?|) (157 . |unitCanonical|) (|List| 103) + (|HeuGcd| 103) (162 . |gcd|) (|SparseUnivariatePolynomial| $) |INT;gcdPolynomial;3Sup;60| (|Fraction| 17) - (|Union| 130 '"failed") (|PatternMatchResult| 17 $) + (|Union| 129 '"failed") (|PatternMatchResult| 17 $) (|Pattern| 17) (|Union| 17 '"failed") (|List| $) - (|Union| 135 '"failed") - (|Record| (|:| |coef| 135) (|:| |generator| $)) + (|Union| 134 '"failed") + (|Record| (|:| |coef| 134) (|:| |generator| $)) (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 138 '"failed") + (|Union| 137 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) (|PositiveInteger|)) - '#(~= 172 |zero?| 178 |unitNormal| 183 |unitCanonical| 188 - |unit?| 193 |symmetricRemainder| 198 |subtractIfCan| 204 - |submod| 210 |squareFreePart| 217 |squareFree| 222 - |sizeLess?| 227 |sign| 233 |shift| 238 |sample| 244 - |retractIfCan| 248 |retract| 253 |rem| 258 |reducedSystem| - 264 |recip| 275 |rationalIfCan| 280 |rational?| 285 - |rational| 290 |random| 295 |quo| 304 |principalIdeal| 310 - |prime?| 315 |powmod| 320 |positiveRemainder| 327 - |positive?| 333 |permutation| 338 |patternMatch| 344 - |one?| 351 |odd?| 356 |nextItem| 361 |negative?| 366 - |multiEuclidean| 371 |mulmod| 377 |min| 384 |max| 390 - |mask| 396 |length| 401 |lcm| 406 |latex| 417 |invmod| 422 - |init| 428 |inc| 432 |hash| 437 |gcdPolynomial| 442 |gcd| - 448 |factorial| 459 |factor| 464 |extendedEuclidean| 469 - |exquo| 482 |expressIdealMember| 488 |even?| 494 - |euclideanSize| 499 |divide| 504 |differentiate| 510 |dec| - 521 |copy| 526 |convert| 531 |coerce| 561 |characteristic| - 581 |bit?| 585 |binomial| 591 |before?| 597 |base| 603 - |associates?| 607 |addmod| 613 |abs| 620 |Zero| 625 |One| - 629 |OMwrite| 633 D 657 >= 668 > 674 = 680 <= 686 < 692 - - 698 + 709 ** 715 * 727) + '#(~= 167 |zero?| 173 |unitNormal| 178 |unitCanonical| 183 + |unit?| 188 |symmetricRemainder| 193 |subtractIfCan| 199 + |submod| 205 |squareFreePart| 212 |squareFree| 217 + |sizeLess?| 222 |sign| 228 |shift| 233 |sample| 239 + |retractIfCan| 243 |retract| 248 |rem| 253 |reducedSystem| + 259 |recip| 270 |rationalIfCan| 275 |rational?| 280 + |rational| 285 |random| 290 |quo| 299 |principalIdeal| 305 + |prime?| 310 |powmod| 315 |positiveRemainder| 322 + |positive?| 328 |permutation| 333 |patternMatch| 339 + |one?| 346 |odd?| 351 |nextItem| 356 |negative?| 361 + |multiEuclidean| 366 |mulmod| 372 |min| 379 |max| 385 + |mask| 391 |length| 396 |lcm| 401 |latex| 412 |invmod| 417 + |init| 423 |inc| 427 |hash| 432 |gcdPolynomial| 437 |gcd| + 443 |factorial| 454 |factor| 459 |extendedEuclidean| 464 + |exquo| 477 |expressIdealMember| 483 |even?| 489 + |euclideanSize| 494 |divide| 499 |differentiate| 505 |dec| + 516 |copy| 521 |convert| 526 |coerce| 556 |characteristic| + 576 |bit?| 580 |binomial| 586 |before?| 592 |base| 598 + |associates?| 602 |addmod| 608 |abs| 615 |Zero| 620 |One| + 624 |OMwrite| 628 D 652 >= 663 > 669 = 675 <= 681 < 687 - + 693 + 704 ** 710 * 722) '((|infinite| . 0) (|noetherian| . 0) (|canonicalsClosed| . 0) (|canonical| . 0) (|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0) @@ -686,61 +683,61 @@ (|ConvertibleTo| 56) (|ConvertibleTo| 59) (|CombinatorialFunctionCategory|) - (|ConvertibleTo| 133) + (|ConvertibleTo| 132) (|ConvertibleTo| 62) (|ConvertibleTo| 17) (|CoercibleFrom| $$) (|CoercibleFrom| 17) (|BasicType|) (|CoercibleTo| 44)) - (|makeByteWordVec2| 141 + (|makeByteWordVec2| 140 '(0 7 0 8 1 12 11 0 13 3 12 11 0 14 14 15 2 12 11 0 17 18 1 12 11 0 19 0 20 0 21 2 12 0 14 20 22 1 12 11 0 23 1 12 11 0 24 1 12 11 0 25 0 7 0 32 1 44 0 17 45 1 56 0 17 57 1 59 0 17 60 1 62 0 17 63 1 14 0 17 65 2 17 9 0 0 67 - 2 14 0 0 0 68 1 9 0 0 82 2 102 101 - 100 99 103 1 106 105 104 107 1 104 0 - 0 108 1 104 2 0 109 1 110 105 104 111 - 1 104 0 2 112 2 0 93 0 0 113 1 0 114 - 0 115 2 118 105 116 117 119 2 120 105 - 105 105 121 1 110 105 104 122 1 104 9 - 0 123 1 104 0 0 124 1 126 104 125 127 - 2 0 9 0 0 1 1 0 9 0 30 1 0 96 0 97 1 - 0 0 0 98 1 0 9 0 1 2 0 0 0 0 1 2 0 93 - 0 0 1 3 0 0 0 0 0 52 1 0 0 0 1 1 0 - 114 0 1 2 0 9 0 0 1 1 0 17 0 1 2 0 0 - 0 0 92 0 0 0 1 1 0 134 0 1 1 0 17 0 1 - 2 0 0 0 0 54 2 0 75 72 76 77 1 0 71 - 72 73 1 0 93 0 94 1 0 131 0 1 1 0 9 0 - 1 1 0 130 0 1 0 0 0 79 1 0 0 0 80 2 0 - 0 0 0 91 1 0 137 135 1 1 0 9 0 1 3 0 - 0 0 0 0 1 2 0 0 0 0 70 1 0 9 0 1 2 0 - 0 0 0 1 3 0 132 0 133 132 1 1 0 9 0 - 34 1 0 9 0 86 1 0 93 0 1 1 0 9 0 43 2 - 0 136 135 0 1 3 0 0 0 0 0 55 2 0 0 0 - 0 88 2 0 0 0 0 87 1 0 0 0 1 1 0 0 0 - 49 1 0 0 135 1 2 0 0 0 0 1 1 0 14 0 - 69 2 0 0 0 0 1 0 0 0 1 1 0 0 0 38 1 0 - 41 0 42 2 0 128 128 128 129 1 0 0 135 - 1 2 0 0 0 0 95 1 0 0 0 1 1 0 114 0 - 115 3 0 139 0 0 0 1 2 0 140 0 0 1 2 0 - 93 0 0 113 2 0 136 135 0 1 1 0 9 0 1 - 1 0 7 0 1 2 0 89 0 0 90 1 0 0 0 1 2 0 - 0 0 7 1 1 0 0 0 40 1 0 0 0 36 1 0 14 - 0 66 1 0 59 0 61 1 0 56 0 58 1 0 62 0 - 64 1 0 133 0 1 1 0 17 0 48 1 0 0 17 - 47 1 0 0 0 1 1 0 0 17 47 1 0 44 0 46 - 0 0 7 1 2 0 9 0 0 1 2 0 0 0 0 1 2 0 9 - 0 0 1 0 0 0 35 2 0 9 0 0 1 3 0 0 0 0 - 0 51 1 0 0 0 78 0 0 0 6 0 0 0 31 3 0 - 11 12 0 9 29 2 0 14 0 9 27 2 0 11 12 - 0 28 1 0 14 0 26 1 0 0 0 1 2 0 0 0 7 - 1 2 0 9 0 0 50 2 0 9 0 0 81 2 0 9 0 0 - 33 2 0 9 0 0 83 2 0 9 0 0 10 1 0 0 0 - 16 2 0 0 0 0 39 2 0 0 0 0 37 2 0 0 0 - 7 85 2 0 0 0 141 1 2 0 0 0 0 53 2 0 0 - 17 0 84 2 0 0 7 0 1 2 0 0 141 0 1))))) + 2 14 0 0 0 68 2 101 100 99 98 102 1 + 105 104 103 106 1 103 0 0 107 1 103 2 + 0 108 1 109 104 103 110 1 103 0 2 111 + 2 0 92 0 0 112 1 0 113 0 114 2 117 + 104 115 116 118 2 119 104 104 104 120 + 1 109 104 103 121 1 103 9 0 122 1 103 + 0 0 123 1 125 103 124 126 2 0 9 0 0 1 + 1 0 9 0 30 1 0 95 0 96 1 0 0 0 97 1 0 + 9 0 1 2 0 0 0 0 1 2 0 92 0 0 1 3 0 0 + 0 0 0 52 1 0 0 0 1 1 0 113 0 1 2 0 9 + 0 0 1 1 0 17 0 1 2 0 0 0 0 91 0 0 0 1 + 1 0 133 0 1 1 0 17 0 1 2 0 0 0 0 54 2 + 0 75 72 76 77 1 0 71 72 73 1 0 92 0 + 93 1 0 130 0 1 1 0 9 0 1 1 0 129 0 1 + 0 0 0 79 1 0 0 0 80 2 0 0 0 0 90 1 0 + 136 134 1 1 0 9 0 1 3 0 0 0 0 0 1 2 0 + 0 0 0 70 1 0 9 0 1 2 0 0 0 0 1 3 0 + 131 0 132 131 1 1 0 9 0 34 1 0 9 0 85 + 1 0 92 0 1 1 0 9 0 43 2 0 135 134 0 1 + 3 0 0 0 0 0 55 2 0 0 0 0 87 2 0 0 0 0 + 86 1 0 0 0 1 1 0 0 0 49 1 0 0 134 1 2 + 0 0 0 0 1 1 0 14 0 69 2 0 0 0 0 1 0 0 + 0 1 1 0 0 0 38 1 0 41 0 42 2 0 127 + 127 127 128 1 0 0 134 1 2 0 0 0 0 94 + 1 0 0 0 1 1 0 113 0 114 3 0 138 0 0 0 + 1 2 0 139 0 0 1 2 0 92 0 0 112 2 0 + 135 134 0 1 1 0 9 0 1 1 0 7 0 1 2 0 + 88 0 0 89 1 0 0 0 1 2 0 0 0 7 1 1 0 0 + 0 40 1 0 0 0 36 1 0 14 0 66 1 0 59 0 + 61 1 0 56 0 58 1 0 62 0 64 1 0 132 0 + 1 1 0 17 0 48 1 0 0 17 47 1 0 0 0 1 1 + 0 0 17 47 1 0 44 0 46 0 0 7 1 2 0 9 0 + 0 1 2 0 0 0 0 1 2 0 9 0 0 1 0 0 0 35 + 2 0 9 0 0 1 3 0 0 0 0 0 51 1 0 0 0 78 + 0 0 0 6 0 0 0 31 3 0 11 12 0 9 29 2 0 + 14 0 9 27 2 0 11 12 0 28 1 0 14 0 26 + 1 0 0 0 1 2 0 0 0 7 1 2 0 9 0 0 50 2 + 0 9 0 0 81 2 0 9 0 0 33 2 0 9 0 0 82 + 2 0 9 0 0 10 1 0 0 0 16 2 0 0 0 0 39 + 2 0 0 0 0 37 2 0 0 0 7 84 2 0 0 0 140 + 1 2 0 0 0 0 53 2 0 0 17 0 83 2 0 0 7 + 0 1 2 0 0 140 0 1))))) '|lookupComplete|)) (MAKEPROP '|Integer| 'NILADIC T) diff --git a/src/algebra/strap/INTDOM.lsp b/src/algebra/strap/INTDOM.lsp index 82872ee3..aec56f1a 100644 --- a/src/algebra/strap/INTDOM.lsp +++ b/src/algebra/strap/INTDOM.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |IntegralDomain;AL| 'NIL) (DEFUN |IntegralDomain;| () - (LET ((#0=#:G1402 + (LET ((#0=#:G1403 (|Join| (|CommutativeRing|) (|Algebra| '$) (|EntireRing|) (|mkCategory| '|domain| '(((|exquo| ((|Union| $ "failed") $ $)) T) diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp index f224b0e8..6ceaf1dc 100644 --- a/src/algebra/strap/ISTRING.lsp +++ b/src/algebra/strap/ISTRING.lsp @@ -178,7 +178,7 @@ (STRCONC "\\mbox{``" (STRCONC |s| "''}"))) (DEFUN |ISTRING;replace;$Us2$;15| (|s| |sg| |t| $) - (PROG (|l| |m| |n| |h| |r| #0=#:G1531 #1=#:G1532 |i| #2=#:G1533 |k|) + (PROG (|l| |m| |n| |h| |r| #0=#:G1532 #1=#:G1533 |i| #2=#:G1534 |k|) (RETURN (SEQ (LETT |l| (- (SPADCALL |sg| (|getShellEntry| $ 44)) @@ -200,7 +200,7 @@ (EXIT (|error| "index out of range")))) (LETT |r| (MAKE-FULL-CVEC - (LET ((#3=#:G1440 + (LET ((#3=#:G1441 (+ (- |m| (+ (- |h| |l|) 1)) |n|))) (|check-subtype| (>= #3# 0) '(|NonNegativeInteger|) #3#)) @@ -250,7 +250,7 @@ (EXIT |c|)))))) (DEFUN |ISTRING;substring?;2$IB;17| (|part| |whole| |startpos| $) - (PROG (|np| |nw| |iw| |ip| #0=#:G1534 #1=#:G1449 #2=#:G1445) + (PROG (|np| |nw| |iw| |ip| #0=#:G1535 #1=#:G1450 #2=#:G1446) (RETURN (SEQ (EXIT (SEQ (LETT |np| (QCSIZE |part|) |ISTRING;substring?;2$IB;17|) @@ -319,7 +319,7 @@ ('T (+ |r| (|getShellEntry| $ 6))))))))))))) (DEFUN |ISTRING;position;C$2I;19| (|c| |t| |startpos| $) - (PROG (|r| #0=#:G1535 #1=#:G1459) + (PROG (|r| #0=#:G1536 #1=#:G1460) (RETURN (SEQ (EXIT (SEQ (LETT |startpos| (- |startpos| (|getShellEntry| $ 6)) @@ -354,7 +354,7 @@ #1# (EXIT #1#))))) (DEFUN |ISTRING;position;Cc$2I;20| (|cc| |t| |startpos| $) - (PROG (|r| #0=#:G1536 #1=#:G1465) + (PROG (|r| #0=#:G1537 #1=#:G1466) (RETURN (SEQ (EXIT (SEQ (LETT |startpos| (- |startpos| (|getShellEntry| $ 6)) @@ -562,7 +562,7 @@ (SPADCALL |i| |n| (|getShellEntry| $ 24)) $)))))) (DEFUN |ISTRING;rightTrim;$C$;26| (|s| |c| $) - (PROG (|j| #0=#:G1537) + (PROG (|j| #0=#:G1538) (RETURN (SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 47)) |ISTRING;rightTrim;$C$;26|) @@ -583,7 +583,7 @@ $)))))) (DEFUN |ISTRING;rightTrim;$Cc$;27| (|s| |cc| $) - (PROG (|j| #0=#:G1538) + (PROG (|j| #0=#:G1539) (RETURN (SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 47)) |ISTRING;rightTrim;$Cc$;27|) @@ -604,7 +604,7 @@ $)))))) (DEFUN |ISTRING;concat;L$;28| (|l| $) - (PROG (#0=#:G1539 #1=#:G1494 #2=#:G1492 #3=#:G1493 |t| |s| #4=#:G1540 + (PROG (#0=#:G1540 #1=#:G1495 #2=#:G1493 #3=#:G1494 |t| |s| #4=#:G1541 |i|) (RETURN (SEQ (LETT |t| @@ -702,13 +702,13 @@ (|stringMatch| |pattern| |target| (CHARACTER |wildcard|))) (DEFUN |ISTRING;match?;2$CB;34| (|pattern| |target| |dontcare| $) - (PROG (|n| |m| |s| #0=#:G1520 |i| |p| |q|) + (PROG (|n| |m| |s| #0=#:G1521 |i| |p| |q|) (RETURN (SEQ (EXIT (SEQ (LETT |n| (SPADCALL |pattern| (|getShellEntry| $ 47)) |ISTRING;match?;2$CB;34|) (LETT |p| - (LET ((#1=#:G1521 + (LET ((#1=#:G1522 (|ISTRING;position;C$2I;19| |dontcare| |pattern| (LETT |m| @@ -741,7 +741,7 @@ |ISTRING;match?;2$CB;34|) (LETT |q| (LET - ((#2=#:G1522 + ((#2=#:G1523 (|ISTRING;position;C$2I;19| |dontcare| |pattern| (+ |p| 1) $))) @@ -763,7 +763,7 @@ |ISTRING;match?;2$CB;34|) (LETT |i| (LET - ((#3=#:G1523 + ((#3=#:G1524 (|ISTRING;position;2$2I;18| |s| |target| |i| $))) (|check-subtype| (>= #3# 0) @@ -786,7 +786,7 @@ (EXIT (LETT |q| (LET - ((#4=#:G1524 + ((#4=#:G1525 (|ISTRING;position;C$2I;19| |dontcare| |pattern| (+ |q| 1) $))) @@ -812,10 +812,10 @@ (EXIT T))))))) #0# (EXIT #0#))))) -(DEFUN |IndexedString| (#0=#:G1541) +(DEFUN |IndexedString| (#0=#:G1542) (PROG () (RETURN - (PROG (#1=#:G1542) + (PROG (#1=#:G1543) (RETURN (COND ((LETT #1# diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp index 6fad1fc1..75ce649f 100644 --- a/src/algebra/strap/LIST.lsp +++ b/src/algebra/strap/LIST.lsp @@ -172,7 +172,7 @@ (EXIT |lu|))))) (DEFUN |LIST;convert;$If;13| (|x| $) - (PROG (#0=#:G1442 |a| #1=#:G1443) + (PROG (#0=#:G1443 |a| #1=#:G1444) (RETURN (SEQ (SPADCALL (CONS (SPADCALL '|construct| (|getShellEntry| $ 47)) @@ -196,10 +196,10 @@ (GO G190) G191 (EXIT (NREVERSE0 #0#))))) (|getShellEntry| $ 52)))))) -(DEFUN |List| (#0=#:G1444) +(DEFUN |List| (#0=#:G1445) (PROG () (RETURN - (PROG (#1=#:G1445) + (PROG (#1=#:G1446) (RETURN (COND ((LETT #1# diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp index c26c0898..52fa1610 100644 --- a/src/algebra/strap/LNAGG-.lsp +++ b/src/algebra/strap/LNAGG-.lsp @@ -21,7 +21,7 @@ |LNAGG-;maxIndex;AI;6|)) (DEFUN |LNAGG-;indices;AL;1| (|a| $) - (PROG (#0=#:G1410 |i| #1=#:G1411) + (PROG (#0=#:G1411 |i| #1=#:G1412) (RETURN (SEQ (PROGN (LETT #0# NIL |LNAGG-;indices;AL;1|) diff --git a/src/algebra/strap/LNAGG.lsp b/src/algebra/strap/LNAGG.lsp index fe5b1777..4f274319 100644 --- a/src/algebra/strap/LNAGG.lsp +++ b/src/algebra/strap/LNAGG.lsp @@ -6,10 +6,10 @@ (DEFPARAMETER |LinearAggregate;AL| 'NIL) (DEFUN |LinearAggregate;| (|t#1|) - (LET ((#0=#:G1399 + (LET ((#0=#:G1400 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (|sublisV| - (PAIR '(#1=#:G1397 #2=#:G1398) + (PAIR '(#1=#:G1398 #2=#:G1399) (LIST '(|Integer|) '(|UniversalSegment| (|Integer|)))) (COND @@ -65,8 +65,8 @@ (LIST '|LinearAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |LinearAggregate| (#0=#:G1400) - (LET ((#1=#:G1401 (|assoc| (|devaluate| #0#) |LinearAggregate;AL|))) +(DEFUN |LinearAggregate| (#0=#:G1401) + (LET ((#1=#:G1402 (|assoc| (|devaluate| #0#) |LinearAggregate;AL|))) (COND (#1# (CDR #1#)) (T (PROGN diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp index 1e19097f..b00c0a30 100644 --- a/src/algebra/strap/LSAGG-.lsp +++ b/src/algebra/strap/LSAGG-.lsp @@ -242,7 +242,7 @@ (SEQ (LETT |y| (SPADCALL |x| (LET - ((#0=#:G1466 (- (- |i| 1) |m|))) + ((#0=#:G1467 (- (- |i| 1) |m|))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) @@ -268,7 +268,7 @@ (SEQ (LETT |y| (SPADCALL |x| (LET - ((#0=#:G1470 (- (- |i| 1) |m|))) + ((#0=#:G1471 (- (- |i| 1) |m|))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) @@ -346,7 +346,7 @@ (SEQ (LETT |y| (SPADCALL |x| (LET - ((#0=#:G1482 (- (- |i| 1) |m|))) + ((#0=#:G1483 (- (- |i| 1) |m|))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) @@ -378,7 +378,7 @@ ((EQL |l| |m|) (SPADCALL |x| (LET - ((#0=#:G1488 (- (+ |h| 1) |m|))) + ((#0=#:G1489 (- (+ |h| 1) |m|))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39))) @@ -386,7 +386,7 @@ (SEQ (LETT |t| (SPADCALL |x| (LET - ((#1=#:G1489 + ((#1=#:G1490 (- (- |l| 1) |m|))) (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) @@ -396,7 +396,7 @@ (SPADCALL |t| (SPADCALL |t| (LET - ((#2=#:G1490 + ((#2=#:G1491 (+ (- |h| |l|) 2))) (|check-subtype| (>= #2# 0) '(|NonNegativeInteger|) @@ -464,7 +464,7 @@ ((< |n| 3) |p|) ('T (SEQ (LETT |l| - (LET ((#0=#:G1509 (QUOTIENT2 |n| 2))) + (LET ((#0=#:G1510 (QUOTIENT2 |n| 2))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) |LSAGG-;mergeSort|) @@ -482,7 +482,7 @@ (|getShellEntry| $ 23))))))))))) (DEFUN |LSAGG-;sorted?;MAB;15| (|f| |l| $) - (PROG (#0=#:G1515 |p|) + (PROG (#0=#:G1516 |p|) (RETURN (SEQ (EXIT (COND ((SPADCALL |l| (|getShellEntry| $ 16)) T) @@ -671,7 +671,7 @@ ('T (SEQ (LETT |z| (SPADCALL |y| - (LET ((#0=#:G1550 (- |s| |m|))) + (LET ((#0=#:G1551 (- |s| |m|))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) @@ -713,7 +713,7 @@ ('T (SEQ (LETT |x| (SPADCALL |x| - (LET ((#0=#:G1556 (- |s| |m|))) + (LET ((#0=#:G1557 (- |s| |m|))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) @@ -778,7 +778,7 @@ (|getShellEntry| $ 74)))))) (DEFUN |LSAGG-;<;2AB;25| (|x| |y| $) - (PROG (#0=#:G1565) + (PROG (#0=#:G1566) (RETURN (SEQ (EXIT (SEQ (SEQ G190 (COND diff --git a/src/algebra/strap/LSAGG.lsp b/src/algebra/strap/LSAGG.lsp index 7a168bdd..64bb96bb 100644 --- a/src/algebra/strap/LSAGG.lsp +++ b/src/algebra/strap/LSAGG.lsp @@ -6,7 +6,7 @@ (DEFPARAMETER |ListAggregate;AL| 'NIL) (DEFUN |ListAggregate;| (|t#1|) - (LET ((#0=#:G1429 + (LET ((#0=#:G1430 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|ListAggregate;CAT|) @@ -22,8 +22,8 @@ (|setShellEntry| #0# 0 (LIST '|ListAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |ListAggregate| (#0=#:G1430) - (LET ((#1=#:G1431 (|assoc| (|devaluate| #0#) |ListAggregate;AL|))) +(DEFUN |ListAggregate| (#0=#:G1431) + (LET ((#1=#:G1432 (|assoc| (|devaluate| #0#) |ListAggregate;AL|))) (COND (#1# (CDR #1#)) (T (PROGN diff --git a/src/algebra/strap/MONOID.lsp b/src/algebra/strap/MONOID.lsp index 2fc46389..7fad9cea 100644 --- a/src/algebra/strap/MONOID.lsp +++ b/src/algebra/strap/MONOID.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |Monoid;AL| 'NIL) (DEFUN |Monoid;| () - (LET ((#0=#:G1398 + (LET ((#0=#:G1399 (|Join| (|SemiGroup|) (|mkCategory| '|domain| '(((|One| ($) |constant|) T) diff --git a/src/algebra/strap/MTSCAT.lsp b/src/algebra/strap/MTSCAT.lsp index c32aefde..743cd473 100644 --- a/src/algebra/strap/MTSCAT.lsp +++ b/src/algebra/strap/MTSCAT.lsp @@ -6,12 +6,12 @@ (DEFPARAMETER |MultivariateTaylorSeriesCategory;AL| 'NIL) (DEFUN |MultivariateTaylorSeriesCategory;| (|t#1| |t#2|) - (LET ((#0=#:G1398 + (LET ((#0=#:G1399 (|sublisV| (PAIR '(|t#1| |t#2|) (LIST (|devaluate| |t#1|) (|devaluate| |t#2|))) (|sublisV| - (PAIR '(#1=#:G1397) + (PAIR '(#1=#:G1398) (LIST '(|IndexedExponents| |t#2|))) (COND (|MultivariateTaylorSeriesCategory;CAT|) @@ -86,9 +86,9 @@ #0#)) (DEFUN |MultivariateTaylorSeriesCategory| - (&REST #0=#:G1401 &AUX #1=#:G1399) + (&REST #0=#:G1402 &AUX #1=#:G1400) (DSETQ #1# #0#) - (LET ((#2=#:G1400 + (LET ((#2=#:G1401 (|assoc| (|devaluateList| #1#) |MultivariateTaylorSeriesCategory;AL|))) (COND diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index 96730ae9..357b3954 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -1,7 +1,8 @@ (/VERSIONCHECK 2) -(|noteSubDomainInfo| '|NonNegativeInteger| '(|Integer|) '(>= |#1| 0)) +(|noteSubDomainInfo| '|NonNegativeInteger| '(|Integer|) + '(|%ige| |#1| 0)) (DECLAIM (FTYPE (FUNCTION ((|%IntegerSection| 0) (|%IntegerSection| 0) @@ -9,7 +10,7 @@ (|%IntegerSection| 0)) |NNI;sup;3$;1|)) -(PUT '|NNI;sup;3$;1| '|SPADreplace| 'MAX) +(PUT '|NNI;sup;3$;1| '|SPADreplace| '|%imax|) (DECLAIM (FTYPE (FUNCTION ((|%IntegerSection| 0) |%Integer| |%Shell|) (|%IntegerSection| 0)) @@ -43,7 +44,7 @@ (DEFUN |NonNegativeInteger| () (PROG () (RETURN - (PROG (#0=#:G1408) + (PROG (#0=#:G1409) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|NonNegativeInteger|) diff --git a/src/algebra/strap/OINTDOM.lsp b/src/algebra/strap/OINTDOM.lsp index fec16d2e..50612347 100644 --- a/src/algebra/strap/OINTDOM.lsp +++ b/src/algebra/strap/OINTDOM.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |OrderedIntegralDomain;AL| 'NIL) (DEFUN |OrderedIntegralDomain;| () - (LET ((#0=#:G1396 (|Join| (|IntegralDomain|) (|OrderedRing|)))) + (LET ((#0=#:G1397 (|Join| (|IntegralDomain|) (|OrderedRing|)))) (|setShellEntry| #0# 0 '(|OrderedIntegralDomain|)) #0#)) diff --git a/src/algebra/strap/ORDRING.lsp b/src/algebra/strap/ORDRING.lsp index e25fce4e..b3e0d439 100644 --- a/src/algebra/strap/ORDRING.lsp +++ b/src/algebra/strap/ORDRING.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |OrderedRing;AL| 'NIL) (DEFUN |OrderedRing;| () - (LET ((#0=#:G1402 + (LET ((#0=#:G1403 (|Join| (|OrderedAbelianGroup|) (|Ring|) (|Monoid|) (|mkCategory| '|domain| '(((|positive?| ((|Boolean|) $)) T) diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp index d789b783..4a5d4fbc 100644 --- a/src/algebra/strap/OUTFORM.lsp +++ b/src/algebra/strap/OUTFORM.lsp @@ -638,7 +638,7 @@ (|OUTFORM;rspace;2I$;30| |n| (- |m| 1) $) $)))) (DEFUN |OUTFORM;matrix;L$;31| (|ll| $) - (PROG (#0=#:G1552 |l| #1=#:G1553 |lv|) + (PROG (#0=#:G1553 |l| #1=#:G1554 |lv|) (RETURN (SEQ (LETT |lv| (PROGN @@ -672,7 +672,7 @@ (CONS 'AGGSET |l|)) (DEFUN |OUTFORM;blankSeparate;L$;35| (|l| $) - (PROG (|c| |u| #0=#:G1554 |l1|) + (PROG (|c| |u| #0=#:G1555 |l1|) (RETURN (SEQ (LETT |c| 'CONCATB |OUTFORM;blankSeparate;L$;35|) (LETT |l1| NIL |OUTFORM;blankSeparate;L$;35|) @@ -849,7 +849,7 @@ (DEFUN |OUTFORM;empty;$;73| ($) (LIST 'NOTHING)) (DEFUN |OUTFORM;infix?;$B;74| (|a| $) - (PROG (#0=#:G1495 |e|) + (PROG (#0=#:G1496 |e|) (RETURN (SEQ (EXIT (SEQ (LETT |e| (COND @@ -1025,7 +1025,7 @@ (DEFUN |OutputForm| () (PROG () (RETURN - (PROG (#0=#:G1556) + (PROG (#0=#:G1557) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|OutputForm|) diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp index 6a746b65..d40bdae0 100644 --- a/src/algebra/strap/PI.lsp +++ b/src/algebra/strap/PI.lsp @@ -2,12 +2,12 @@ (/VERSIONCHECK 2) (|noteSubDomainInfo| '|PositiveInteger| '(|NonNegativeInteger|) - '(> |#1| 0)) + '(|%igt| |#1| 0)) (DEFUN |PositiveInteger| () (PROG () (RETURN - (PROG (#0=#:G1400) + (PROG (#0=#:G1401) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|PositiveInteger|) diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp index e28995ec..cb7b1776 100644 --- a/src/algebra/strap/POLYCAT-.lsp +++ b/src/algebra/strap/POLYCAT-.lsp @@ -142,8 +142,8 @@ |POLYCAT-;convert;SIf;43|)) (DEFUN |POLYCAT-;eval;SLS;1| (|p| |l| $) - (PROG (#0=#:G1690 #1=#:G1426 #2=#:G1691 #3=#:G1692 |lvar| #4=#:G1693 - |e| #5=#:G1694) + (PROG (#0=#:G1691 #1=#:G1427 #2=#:G1692 #3=#:G1693 |lvar| #4=#:G1694 + |e| #5=#:G1695) (RETURN (SEQ (COND ((NULL |l|) |p|) @@ -256,7 +256,7 @@ ('T (CONS 0 |l|)))))) (DEFUN |POLYCAT-;isTimes;SU;4| (|p| $) - (PROG (|lv| #0=#:G1695 |v| #1=#:G1696 |l| |r|) + (PROG (|lv| #0=#:G1696 |v| #1=#:G1697 |l| |r|) (RETURN (SEQ (COND ((OR (NULL (LETT |lv| @@ -358,7 +358,7 @@ (CDR |lv|) (CDR |ln|) (|getShellEntry| $ 70))))) (DEFUN |POLYCAT-;retract;SVarSet;9| (|p| $) - (PROG (#0=#:G1477 |q|) + (PROG (#0=#:G1478 |q|) (RETURN (SEQ (LETT |q| (PROG2 (LETT #0# (SPADCALL |p| (|getShellEntry| $ 53)) @@ -374,7 +374,7 @@ ('T (|error| "Polynomial is not a single variable")))))))) (DEFUN |POLYCAT-;retractIfCan;SU;10| (|p| $) - (PROG (|q| #0=#:G1485) + (PROG (|q| #0=#:G1486) (RETURN (SEQ (EXIT (SEQ (SEQ (LETT |q| (SPADCALL |p| (|getShellEntry| $ 53)) @@ -398,7 +398,7 @@ (|getShellEntry| $ 76))) (DEFUN |POLYCAT-;primitiveMonomials;SL;12| (|p| $) - (PROG (#0=#:G1697 |q| #1=#:G1698) + (PROG (#0=#:G1698 |q| #1=#:G1699) (RETURN (SEQ (PROGN (LETT #0# NIL |POLYCAT-;primitiveMonomials;SL;12|) @@ -420,7 +420,7 @@ (GO G190) G191 (EXIT (NREVERSE0 #0#)))))))) (DEFUN |POLYCAT-;totalDegree;SNni;13| (|p| $) - (PROG (#0=#:G1491 |d| |u|) + (PROG (#0=#:G1492 |d| |u|) (RETURN (SEQ (COND ((SPADCALL |p| (|getShellEntry| $ 78)) 0) @@ -460,7 +460,7 @@ (EXIT |d|)))))))) (DEFUN |POLYCAT-;totalDegree;SLNni;14| (|p| |lv| $) - (PROG (#0=#:G1499 |v| |w| |d| |u|) + (PROG (#0=#:G1500 |v| |w| |d| |u|) (RETURN (SEQ (COND ((SPADCALL |p| (|getShellEntry| $ 78)) 0) @@ -517,7 +517,7 @@ (|getShellEntry| $ 96))) (DEFUN |POLYCAT-;allMonoms| (|l| $) - (PROG (#0=#:G1699 |p| #1=#:G1700) + (PROG (#0=#:G1700 |p| #1=#:G1701) (RETURN (SEQ (SPADCALL (SPADCALL @@ -543,7 +543,7 @@ (|getShellEntry| $ 100)))))) (DEFUN |POLYCAT-;P2R| (|p| |b| |n| $) - (PROG (|w| |bj| #0=#:G1702 |i| #1=#:G1701) + (PROG (|w| |bj| #0=#:G1703 |i| #1=#:G1702) (RETURN (SEQ (LETT |w| (SPADCALL |n| (|spadConstant| $ 28) @@ -573,7 +573,7 @@ (EXIT |w|))))) (DEFUN |POLYCAT-;eq2R| (|l| |b| $) - (PROG (#0=#:G1703 |bj| #1=#:G1704 #2=#:G1705 |p| #3=#:G1706) + (PROG (#0=#:G1704 |bj| #1=#:G1705 #2=#:G1706 |p| #3=#:G1707) (RETURN (SEQ (SPADCALL (PROGN @@ -616,7 +616,7 @@ (|getShellEntry| $ 111)))))) (DEFUN |POLYCAT-;reducedSystem;MM;20| (|m| $) - (PROG (#0=#:G1707 |r| #1=#:G1708 |b| #2=#:G1709 |bj| #3=#:G1710 |d| + (PROG (#0=#:G1708 |r| #1=#:G1709 |b| #2=#:G1710 |bj| #3=#:G1711 |d| |mm| |l|) (RETURN (SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 114)) @@ -690,7 +690,7 @@ (EXIT |mm|))))) (DEFUN |POLYCAT-;reducedSystem;MVR;21| (|m| |v| $) - (PROG (#0=#:G1711 |s| #1=#:G1712 |b| #2=#:G1713 |bj| #3=#:G1714 |d| + (PROG (#0=#:G1712 |s| #1=#:G1713 |b| #2=#:G1714 |bj| #3=#:G1715 |d| |n| |mm| |w| |l| |r|) (RETURN (SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 114)) @@ -794,8 +794,8 @@ (SPADCALL |pp| (|getShellEntry| $ 146))) (DEFUN |POLYCAT-;factor;SF;26| (|p| $) - (PROG (|v| |ansR| #0=#:G1715 |w| #1=#:G1716 |up| |ansSUP| #2=#:G1717 - |ww| #3=#:G1718) + (PROG (|v| |ansR| #0=#:G1716 |w| #1=#:G1717 |up| |ansSUP| #2=#:G1718 + |ww| #3=#:G1719) (RETURN (SEQ (LETT |v| (SPADCALL |p| (|getShellEntry| $ 53)) |POLYCAT-;factor;SF;26|) @@ -894,12 +894,12 @@ (|getShellEntry| $ 159))))))))))) (DEFUN |POLYCAT-;conditionP;MU;27| (|mat| $) - (PROG (|ll| #0=#:G1719 |z| #1=#:G1720 |ch| |l| #2=#:G1721 #3=#:G1722 - #4=#:G1582 #5=#:G1580 #6=#:G1581 #7=#:G1723 |vars| |degs| - #8=#:G1724 |d| #9=#:G1725 |nd| #10=#:G1608 |deg1| - |redmons| #11=#:G1726 |v| #12=#:G1728 |u| #13=#:G1727 - |llR| |monslist| |ans| #14=#:G1609 |mons| #15=#:G1729 |m| - #16=#:G1730 |i| #17=#:G1604 #18=#:G1602 #19=#:G1603) + (PROG (|ll| #0=#:G1720 |z| #1=#:G1721 |ch| |l| #2=#:G1722 #3=#:G1723 + #4=#:G1583 #5=#:G1581 #6=#:G1582 #7=#:G1724 |vars| |degs| + #8=#:G1725 |d| #9=#:G1726 |nd| #10=#:G1609 |deg1| + |redmons| #11=#:G1727 |v| #12=#:G1729 |u| #13=#:G1728 + |llR| |monslist| |ans| #14=#:G1610 |mons| #15=#:G1730 |m| + #16=#:G1731 |i| #17=#:G1605 #18=#:G1603 #19=#:G1604) (RETURN (SEQ (EXIT (SEQ (LETT |ll| (SPADCALL @@ -1051,7 +1051,7 @@ (GO #10#))) ('T (LET - ((#20=#:G1611 + ((#20=#:G1612 (QCDR |nd|))) (|check-subtype| (>= #20# 0) @@ -1146,7 +1146,7 @@ (EXIT (CONS 0 (LET - ((#21=#:G1610 + ((#21=#:G1611 (|makeSimpleArray| (|getVMType| (|getShellEntry| $ 6)) @@ -1262,7 +1262,7 @@ $)))))))))) (DEFUN |POLYCAT-;charthRootlv| (|p| |vars| |ch| $) - (PROG (|v| |dd| |cp| |d| |ans| |ansx| #0=#:G1638) + (PROG (|v| |dd| |cp| |d| |ans| |ansx| #0=#:G1639) (RETURN (SEQ (EXIT (COND ((NULL |vars|) @@ -1337,7 +1337,7 @@ (SPADCALL (QCDR |ansx|) |v| (LET - ((#1=#:G1639 + ((#1=#:G1640 (QCDR |dd|))) (|check-subtype| (>= #1# 0) @@ -1391,7 +1391,7 @@ (SPADCALL |p| (|getShellEntry| $ 197))) (DEFUN |POLYCAT-;squareFreePart;2S;34| (|p| $) - (PROG (|s| |f| #0=#:G1731 #1=#:G1653 #2=#:G1651 #3=#:G1652) + (PROG (|s| |f| #0=#:G1732 #1=#:G1654 #2=#:G1652 #3=#:G1653) (RETURN (SEQ (SPADCALL (SPADCALL @@ -1436,7 +1436,7 @@ (|getShellEntry| $ 204))) (DEFUN |POLYCAT-;primitivePart;2S;36| (|p| $) - (PROG (#0=#:G1657) + (PROG (#0=#:G1658) (RETURN (QVELT (SPADCALL (PROG2 (LETT #0# @@ -1452,7 +1452,7 @@ 1)))) (DEFUN |POLYCAT-;primitivePart;SVarSetS;37| (|p| |v| $) - (PROG (#0=#:G1663) + (PROG (#0=#:G1664) (RETURN (QVELT (SPADCALL (PROG2 (LETT #0# diff --git a/src/algebra/strap/POLYCAT.lsp b/src/algebra/strap/POLYCAT.lsp index 51c4e0b2..37a40b36 100644 --- a/src/algebra/strap/POLYCAT.lsp +++ b/src/algebra/strap/POLYCAT.lsp @@ -6,7 +6,7 @@ (DEFPARAMETER |PolynomialCategory;AL| 'NIL) (DEFUN |PolynomialCategory;| (|t#1| |t#2| |t#3|) - (LET ((#0=#:G1415 + (LET ((#0=#:G1416 (|sublisV| (PAIR '(|t#1| |t#2| |t#3|) (LIST (|devaluate| |t#1|) (|devaluate| |t#2|) @@ -204,9 +204,9 @@ (|devaluate| |t#2|) (|devaluate| |t#3|))) #0#)) -(DEFUN |PolynomialCategory| (&REST #0=#:G1418 &AUX #1=#:G1416) +(DEFUN |PolynomialCategory| (&REST #0=#:G1419 &AUX #1=#:G1417) (DSETQ #1# #0#) - (LET ((#2=#:G1417 + (LET ((#2=#:G1418 (|assoc| (|devaluateList| #1#) |PolynomialCategory;AL|))) (COND (#2# (CDR #2#)) diff --git a/src/algebra/strap/QFCAT.lsp b/src/algebra/strap/QFCAT.lsp index f79694e0..fcec7860 100644 --- a/src/algebra/strap/QFCAT.lsp +++ b/src/algebra/strap/QFCAT.lsp @@ -6,7 +6,7 @@ (DEFPARAMETER |QuotientFieldCategory;AL| 'NIL) (DEFUN |QuotientFieldCategory;| (|t#1|) - (LET ((#0=#:G1398 + (LET ((#0=#:G1399 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|QuotientFieldCategory;CAT|) @@ -79,8 +79,8 @@ (LIST '|QuotientFieldCategory| (|devaluate| |t#1|))) #0#)) -(DEFUN |QuotientFieldCategory| (#0=#:G1399) - (LET ((#1=#:G1400 +(DEFUN |QuotientFieldCategory| (#0=#:G1400) + (LET ((#1=#:G1401 (|assoc| (|devaluate| #0#) |QuotientFieldCategory;AL|))) (COND (#1# (CDR #1#)) diff --git a/src/algebra/strap/RCAGG.lsp b/src/algebra/strap/RCAGG.lsp index fd66583b..755e7ea0 100644 --- a/src/algebra/strap/RCAGG.lsp +++ b/src/algebra/strap/RCAGG.lsp @@ -6,7 +6,7 @@ (DEFPARAMETER |RecursiveAggregate;AL| 'NIL) (DEFUN |RecursiveAggregate;| (|t#1|) - (LET ((#0=#:G1396 + (LET ((#0=#:G1397 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|RecursiveAggregate;CAT|) @@ -48,8 +48,8 @@ (LIST '|RecursiveAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |RecursiveAggregate| (#0=#:G1397) - (LET ((#1=#:G1398 (|assoc| (|devaluate| #0#) |RecursiveAggregate;AL|))) +(DEFUN |RecursiveAggregate| (#0=#:G1398) + (LET ((#1=#:G1399 (|assoc| (|devaluate| #0#) |RecursiveAggregate;AL|))) (COND (#1# (CDR #1#)) (T (PROGN diff --git a/src/algebra/strap/RING.lsp b/src/algebra/strap/RING.lsp index 3eb33dcf..93d9396b 100644 --- a/src/algebra/strap/RING.lsp +++ b/src/algebra/strap/RING.lsp @@ -4,8 +4,8 @@ (DEFPARAMETER |Ring;AL| 'NIL) (DEFUN |Ring;| () - (LET ((#0=#:G1397 - (|sublisV| (PAIR '(#1=#:G1396) (LIST '(|Integer|))) + (LET ((#0=#:G1398 + (|sublisV| (PAIR '(#1=#:G1397) (LIST '(|Integer|))) (|Join| (|Rng|) (|Monoid|) (|LeftModule| '$) (|CoercibleFrom| '#1#) (|mkCategory| '|package| diff --git a/src/algebra/strap/RNG.lsp b/src/algebra/strap/RNG.lsp index 395abb8f..94432451 100644 --- a/src/algebra/strap/RNG.lsp +++ b/src/algebra/strap/RNG.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |Rng;AL| 'NIL) (DEFUN |Rng;| () - (LET ((#0=#:G1396 (|Join| (|AbelianGroup|) (|SemiGroup|)))) + (LET ((#0=#:G1397 (|Join| (|AbelianGroup|) (|SemiGroup|)))) (|setShellEntry| #0# 0 '(|Rng|)) #0#)) diff --git a/src/algebra/strap/RNS.lsp b/src/algebra/strap/RNS.lsp index baaa933b..809ea623 100644 --- a/src/algebra/strap/RNS.lsp +++ b/src/algebra/strap/RNS.lsp @@ -4,9 +4,9 @@ (DEFPARAMETER |RealNumberSystem;AL| 'NIL) (DEFUN |RealNumberSystem;| () - (LET ((#0=#:G1405 + (LET ((#0=#:G1406 (|sublisV| - (PAIR '(#1=#:G1401 #2=#:G1402 #3=#:G1403 #4=#:G1404) + (PAIR '(#1=#:G1402 #2=#:G1403 #3=#:G1404 #4=#:G1405) (LIST '(|Integer|) '(|Fraction| (|Integer|)) '(|Pattern| (|Float|)) '(|Float|))) (|Join| (|Field|) (|OrderedRing|) (|RealConstant|) diff --git a/src/algebra/strap/SETAGG.lsp b/src/algebra/strap/SETAGG.lsp index c5ededb4..dd352424 100644 --- a/src/algebra/strap/SETAGG.lsp +++ b/src/algebra/strap/SETAGG.lsp @@ -6,7 +6,7 @@ (DEFPARAMETER |SetAggregate;AL| 'NIL) (DEFUN |SetAggregate;| (|t#1|) - (LET ((#0=#:G1396 + (LET ((#0=#:G1397 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|SetAggregate;CAT|) @@ -35,8 +35,8 @@ (|setShellEntry| #0# 0 (LIST '|SetAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |SetAggregate| (#0=#:G1397) - (LET ((#1=#:G1398 (|assoc| (|devaluate| #0#) |SetAggregate;AL|))) +(DEFUN |SetAggregate| (#0=#:G1398) + (LET ((#1=#:G1399 (|assoc| (|devaluate| #0#) |SetAggregate;AL|))) (COND (#1# (CDR #1#)) (T (PROGN diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index ef4e34c4..bac231f6 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -58,7 +58,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|) |SINT;=;2$B;15|)) -(PUT '|SINT;=;2$B;15| '|SPADreplace| 'EQL) +(PUT '|SINT;=;2$B;15| '|SPADreplace| '|%ieq|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;~;2$;16|)) @@ -122,13 +122,12 @@ (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|) |SINT;<=;2$B;28|)) -(PUT '|SINT;<=;2$B;28| '|SPADreplace| - '(XLAM (|x| |y|) (|%not| (> |x| |y|)))) +(PUT '|SINT;<=;2$B;28| '|SPADreplace| '|%ile|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|) |SINT;>=;2$B;29|)) -(PUT '|SINT;>=;2$B;29| '|SPADreplace| '>=) +(PUT '|SINT;>=;2$B;29| '|SPADreplace| '|%ige|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;inc;2$;30|)) @@ -179,7 +178,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|) |SINT;gcd;3$;40|)) -(PUT '|SINT;gcd;3$;40| '|SPADreplace| 'GCD) +(PUT '|SINT;gcd;3$;40| '|SPADreplace| '|%igcd|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;abs;2$;41|)) @@ -199,7 +198,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|) |SINT;one?;$B;44|)) -(PUT '|SINT;one?;$B;44| '|SPADreplace| '(XLAM (|x|) (EQL |x| 1))) +(PUT '|SINT;one?;$B;44| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 1))) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|) |SINT;max;3$;45|)) @@ -402,9 +401,7 @@ (DECLARE (IGNORE $)) (QSGREATERP |x| |y|)) -(DEFUN |SINT;<=;2$B;28| (|x| |y| $) - (DECLARE (IGNORE $)) - (NOT (> |x| |y|))) +(DEFUN |SINT;<=;2$B;28| (|x| |y| $) (DECLARE (IGNORE $)) (<= |x| |y|)) (DEFUN |SINT;>=;2$B;29| (|x| |y| $) (DECLARE (IGNORE $)) (>= |x| |y|)) @@ -491,7 +488,7 @@ (+ (- |$ShortMaximum| |$ShortMinimum|) 1)) (DEFUN |SINT;index;Pi$;55| (|i| $) - (LET ((#0=#:G1460 (- (+ |i| |$ShortMinimum|) 1))) + (LET ((#0=#:G1461 (- (+ |i| |$ShortMinimum|) 1))) (|check-subtype| (SMINTP #0#) '(|SingleInteger|) #0#))) (DEFUN |SINT;lookup;$Pi;56| (|x| $) @@ -533,7 +530,7 @@ (DEFUN |SingleInteger| () (PROG () (RETURN - (PROG (#0=#:G1494) + (PROG (#0=#:G1495) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|SingleInteger|) @@ -551,7 +548,7 @@ (HREM |$ConstructorCache| '|SingleInteger|))))))))))) (DEFUN |SingleInteger;| () - (LET ((|dv$| (LIST '|SingleInteger|)) ($ (|newShell| 117)) + (LET ((|dv$| (LIST '|SingleInteger|)) ($ (|newShell| 116)) (|pv$| (|buildPredVector| 0 0 NIL))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) @@ -587,58 +584,58 @@ |SINT;/\\;3$;18| |SINT;\\/;3$;19| |SINT;Not;2$;20| |SINT;And;3$;21| |SINT;and;3$;22| |SINT;Or;3$;23| |SINT;or;3$;24| |SINT;xor;3$;25| |SINT;>;2$B;27| - (62 . |not|) |SINT;<=;2$B;28| |SINT;>=;2$B;29| - |SINT;inc;2$;30| |SINT;dec;2$;31| |SINT;+;3$;33| - |SINT;-;3$;34| (|NonNegativeInteger|) |SINT;**;$Nni$;36| - |SINT;quo;3$;37| |SINT;rem;3$;38| + |SINT;<=;2$B;28| |SINT;>=;2$B;29| |SINT;inc;2$;30| + |SINT;dec;2$;31| |SINT;+;3$;33| |SINT;-;3$;34| + (|NonNegativeInteger|) |SINT;**;$Nni$;36| |SINT;quo;3$;37| + |SINT;rem;3$;38| (|Record| (|:| |quotient| $) (|:| |remainder| $)) |SINT;divide;2$R;39| |SINT;gcd;3$;40| |SINT;abs;2$;41| - |SINT;odd?;$B;42| |SINT;zero?;$B;43| (67 . |One|) + |SINT;odd?;$B;42| |SINT;zero?;$B;43| (62 . |One|) |SINT;one?;$B;44| |SINT;max;3$;45| |SINT;min;3$;46| (|SingleInteger|) |SINT;hash;2$;47| |SINT;length;2$;48| |SINT;shift;3$;49| |SINT;mulmod;4$;50| |SINT;addmod;4$;51| |SINT;submod;4$;52| |SINT;negative?;$B;53| - |SINT;size;Nni;54| (|PositiveInteger|) (71 . +) (77 . -) + |SINT;size;Nni;54| (|PositiveInteger|) (66 . +) (72 . -) |SINT;index;Pi$;55| |SINT;lookup;$Pi;56| (|Vector| 5) - (|Record| (|:| |mat| 30) (|:| |vec| 90)) (|Vector| $) + (|Record| (|:| |mat| 30) (|:| |vec| 89)) (|Vector| $) |SINT;reducedSystem;MVR;57| |SINT;positiveRemainder;3$;58| |SINT;coerce;I$;59| |SINT;random;$;60| |SINT;random;2$;61| (|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $)) |SINT;unitNormal;$R;62| (|Fraction| 5) - (|Union| 100 '"failed") (|Union| $ '"failed") (|Float|) + (|Union| 99 '"failed") (|Union| $ '"failed") (|Float|) (|DoubleFloat|) (|Pattern| 5) (|PatternMatchResult| 5 $) (|InputForm|) (|Union| 5 '"failed") (|List| $) - (|Union| 109 '"failed") - (|Record| (|:| |coef| 109) (|:| |generator| $)) + (|Union| 108 '"failed") + (|Record| (|:| |coef| 108) (|:| |generator| $)) (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 112 '"failed") + (|Union| 111 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) (|Factored| $) (|SparseUnivariatePolynomial| $)) - '#(~= 83 ~ 89 |zero?| 94 |xor| 99 |unitNormal| 105 - |unitCanonical| 110 |unit?| 115 |symmetricRemainder| 120 - |subtractIfCan| 126 |submod| 132 |squareFreePart| 139 - |squareFree| 144 |sizeLess?| 149 |size| 155 |sign| 159 - |shift| 164 |sample| 170 |retractIfCan| 174 |retract| 179 - |rem| 184 |reducedSystem| 190 |recip| 201 |rationalIfCan| - 206 |rational?| 211 |rational| 216 |random| 221 |quo| 230 - |principalIdeal| 236 |prime?| 241 |powmod| 246 - |positiveRemainder| 253 |positive?| 259 |permutation| 264 - |patternMatch| 270 |or| 277 |one?| 283 |odd?| 288 |not| - 293 |nextItem| 298 |negative?| 303 |multiEuclidean| 308 - |mulmod| 314 |min| 321 |max| 331 |mask| 341 |lookup| 346 - |length| 351 |lcm| 356 |latex| 367 |invmod| 372 |init| 378 - |index| 382 |inc| 387 |hash| 392 |gcdPolynomial| 397 |gcd| - 403 |factorial| 414 |factor| 419 |extendedEuclidean| 424 - |exquo| 437 |expressIdealMember| 443 |even?| 449 - |euclideanSize| 454 |divide| 459 |differentiate| 465 |dec| - 476 |copy| 481 |convert| 486 |coerce| 511 |characteristic| - 531 |bit?| 535 |binomial| 541 |before?| 547 |base| 553 - |associates?| 557 |and| 563 |addmod| 569 |abs| 576 |\\/| - 581 |Zero| 587 |Or| 591 |One| 597 |OMwrite| 601 |Not| 625 - D 630 |And| 641 >= 647 > 653 = 659 <= 665 < 671 |/\\| 677 - - 683 + 694 ** 700 * 712) + '#(~= 78 ~ 84 |zero?| 89 |xor| 94 |unitNormal| 100 + |unitCanonical| 105 |unit?| 110 |symmetricRemainder| 115 + |subtractIfCan| 121 |submod| 127 |squareFreePart| 134 + |squareFree| 139 |sizeLess?| 144 |size| 150 |sign| 154 + |shift| 159 |sample| 165 |retractIfCan| 169 |retract| 174 + |rem| 179 |reducedSystem| 185 |recip| 196 |rationalIfCan| + 201 |rational?| 206 |rational| 211 |random| 216 |quo| 225 + |principalIdeal| 231 |prime?| 236 |powmod| 241 + |positiveRemainder| 248 |positive?| 254 |permutation| 259 + |patternMatch| 265 |or| 272 |one?| 278 |odd?| 283 |not| + 288 |nextItem| 293 |negative?| 298 |multiEuclidean| 303 + |mulmod| 309 |min| 316 |max| 326 |mask| 336 |lookup| 341 + |length| 346 |lcm| 351 |latex| 362 |invmod| 367 |init| 373 + |index| 377 |inc| 382 |hash| 387 |gcdPolynomial| 392 |gcd| + 398 |factorial| 409 |factor| 414 |extendedEuclidean| 419 + |exquo| 432 |expressIdealMember| 438 |even?| 444 + |euclideanSize| 449 |divide| 454 |differentiate| 460 |dec| + 471 |copy| 476 |convert| 481 |coerce| 506 |characteristic| + 526 |bit?| 530 |binomial| 536 |before?| 542 |base| 548 + |associates?| 552 |and| 558 |addmod| 564 |abs| 571 |\\/| + 576 |Zero| 582 |Or| 586 |One| 592 |OMwrite| 596 |Not| 620 + D 625 |And| 636 >= 642 > 648 = 654 <= 660 < 666 |/\\| 672 + - 678 + 689 ** 695 * 707) '((|noetherian| . 0) (|canonicalsClosed| . 0) (|canonical| . 0) (|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0) (|noZeroDivisors| . 0) @@ -689,60 +686,60 @@ (|BooleanLogic|) (|RealConstant|) (|RetractableTo| 5) (|SetCategory|) (|OpenMath|) (|Type|) + (|ConvertibleTo| 102) (|ConvertibleTo| 103) - (|ConvertibleTo| 104) (|CombinatorialFunctionCategory|) - (|ConvertibleTo| 105) - (|ConvertibleTo| 107) + (|ConvertibleTo| 104) + (|ConvertibleTo| 106) (|ConvertibleTo| 5) (|CoercibleFrom| $$) (|CoercibleFrom| 5) (|BasicType|) (|CoercibleTo| 33)) - (|makeByteWordVec2| 116 + (|makeByteWordVec2| 115 '(0 5 0 8 1 12 11 0 13 3 12 11 0 14 14 15 2 12 11 0 5 18 1 12 11 0 19 0 20 0 21 2 12 0 14 20 22 1 12 11 0 23 1 12 11 0 24 1 12 11 0 25 1 5 33 0 34 1 0 - 0 5 36 1 9 0 0 55 0 5 0 72 2 85 0 0 0 - 86 2 5 0 0 0 87 2 0 9 0 0 1 1 0 0 0 - 44 1 0 9 0 71 2 0 0 0 0 53 1 0 98 0 - 99 1 0 0 0 1 1 0 9 0 1 2 0 0 0 0 1 2 - 0 102 0 0 1 3 0 0 0 0 0 82 1 0 0 0 1 - 1 0 115 0 1 2 0 9 0 0 1 0 0 62 84 1 0 - 5 0 1 2 0 0 0 0 79 0 0 0 1 1 0 108 0 - 1 1 0 5 0 1 2 0 0 0 0 65 1 0 30 31 32 - 2 0 91 31 92 93 1 0 102 0 1 1 0 101 0 - 1 1 0 9 0 1 1 0 100 0 1 0 0 0 96 1 0 - 0 0 97 2 0 0 0 0 64 1 0 111 109 1 1 0 - 9 0 1 3 0 0 0 0 0 1 2 0 0 0 0 94 1 0 - 9 0 1 2 0 0 0 0 1 3 0 106 0 105 106 1 - 2 0 0 0 0 52 1 0 9 0 73 1 0 9 0 70 1 - 0 0 0 45 1 0 102 0 1 1 0 9 0 83 2 0 - 110 109 0 1 3 0 0 0 0 0 80 0 0 0 42 2 - 0 0 0 0 75 0 0 0 41 2 0 0 0 0 74 1 0 - 0 0 1 1 0 85 0 89 1 0 0 0 78 2 0 0 0 - 0 1 1 0 0 109 1 1 0 14 0 1 2 0 0 0 0 - 1 0 0 0 1 1 0 0 85 88 1 0 0 0 58 1 0 - 76 0 77 2 0 116 116 116 1 2 0 0 0 0 - 68 1 0 0 109 1 1 0 0 0 1 1 0 115 0 1 - 3 0 113 0 0 0 1 2 0 114 0 0 1 2 0 102 - 0 0 1 2 0 110 109 0 1 1 0 9 0 1 1 0 - 62 0 1 2 0 66 0 0 67 1 0 0 0 1 2 0 0 - 0 62 1 1 0 0 0 59 1 0 0 0 1 1 0 103 0 - 1 1 0 104 0 1 1 0 105 0 1 1 0 107 0 1 - 1 0 5 0 17 1 0 0 5 95 1 0 0 0 1 1 0 0 - 5 95 1 0 33 0 35 0 0 62 1 2 0 9 0 0 1 - 2 0 0 0 0 1 2 0 9 0 0 1 0 0 0 40 2 0 - 9 0 0 1 2 0 0 0 0 50 3 0 0 0 0 0 81 1 - 0 0 0 69 2 0 0 0 0 47 0 0 0 7 2 0 0 0 - 0 51 0 0 0 39 3 0 11 12 0 9 29 2 0 14 - 0 9 27 2 0 11 12 0 28 1 0 14 0 26 1 0 - 0 0 48 1 0 0 0 1 2 0 0 0 62 1 2 0 0 0 - 0 49 2 0 9 0 0 57 2 0 9 0 0 54 2 0 9 - 0 0 43 2 0 9 0 0 56 2 0 9 0 0 10 2 0 - 0 0 0 46 2 0 0 0 0 61 1 0 0 0 16 2 0 - 0 0 0 60 2 0 0 0 62 63 2 0 0 0 85 1 2 - 0 0 0 0 37 2 0 0 5 0 38 2 0 0 62 0 1 - 2 0 0 85 0 1))))) + 0 5 36 0 5 0 71 2 84 0 0 0 85 2 5 0 0 + 0 86 2 0 9 0 0 1 1 0 0 0 44 1 0 9 0 + 70 2 0 0 0 0 53 1 0 97 0 98 1 0 0 0 1 + 1 0 9 0 1 2 0 0 0 0 1 2 0 101 0 0 1 3 + 0 0 0 0 0 81 1 0 0 0 1 1 0 114 0 1 2 + 0 9 0 0 1 0 0 61 83 1 0 5 0 1 2 0 0 0 + 0 78 0 0 0 1 1 0 107 0 1 1 0 5 0 1 2 + 0 0 0 0 64 1 0 30 31 32 2 0 90 31 91 + 92 1 0 101 0 1 1 0 100 0 1 1 0 9 0 1 + 1 0 99 0 1 0 0 0 95 1 0 0 0 96 2 0 0 + 0 0 63 1 0 110 108 1 1 0 9 0 1 3 0 0 + 0 0 0 1 2 0 0 0 0 93 1 0 9 0 1 2 0 0 + 0 0 1 3 0 105 0 104 105 1 2 0 0 0 0 + 52 1 0 9 0 72 1 0 9 0 69 1 0 0 0 45 1 + 0 101 0 1 1 0 9 0 82 2 0 109 108 0 1 + 3 0 0 0 0 0 79 0 0 0 42 2 0 0 0 0 74 + 0 0 0 41 2 0 0 0 0 73 1 0 0 0 1 1 0 + 84 0 88 1 0 0 0 77 2 0 0 0 0 1 1 0 0 + 108 1 1 0 14 0 1 2 0 0 0 0 1 0 0 0 1 + 1 0 0 84 87 1 0 0 0 57 1 0 75 0 76 2 + 0 115 115 115 1 2 0 0 0 0 67 1 0 0 + 108 1 1 0 0 0 1 1 0 114 0 1 3 0 112 0 + 0 0 1 2 0 113 0 0 1 2 0 101 0 0 1 2 0 + 109 108 0 1 1 0 9 0 1 1 0 61 0 1 2 0 + 65 0 0 66 1 0 0 0 1 2 0 0 0 61 1 1 0 + 0 0 58 1 0 0 0 1 1 0 102 0 1 1 0 103 + 0 1 1 0 104 0 1 1 0 106 0 1 1 0 5 0 + 17 1 0 0 5 94 1 0 0 0 1 1 0 0 5 94 1 + 0 33 0 35 0 0 61 1 2 0 9 0 0 1 2 0 0 + 0 0 1 2 0 9 0 0 1 0 0 0 40 2 0 9 0 0 + 1 2 0 0 0 0 50 3 0 0 0 0 0 80 1 0 0 0 + 68 2 0 0 0 0 47 0 0 0 7 2 0 0 0 0 51 + 0 0 0 39 3 0 11 12 0 9 29 2 0 14 0 9 + 27 2 0 11 12 0 28 1 0 14 0 26 1 0 0 0 + 48 1 0 0 0 1 2 0 0 0 61 1 2 0 0 0 0 + 49 2 0 9 0 0 56 2 0 9 0 0 54 2 0 9 0 + 0 43 2 0 9 0 0 55 2 0 9 0 0 10 2 0 0 + 0 0 46 2 0 0 0 0 60 1 0 0 0 16 2 0 0 + 0 0 59 2 0 0 0 61 62 2 0 0 0 84 1 2 0 + 0 0 0 37 2 0 0 5 0 38 2 0 0 61 0 1 2 + 0 0 84 0 1))))) '|lookupComplete|)) (MAKEPROP '|SingleInteger| 'NILADIC T) diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp index e81844bc..1d31c1cd 100644 --- a/src/algebra/strap/STAGG-.lsp +++ b/src/algebra/strap/STAGG-.lsp @@ -50,7 +50,7 @@ (SPADCALL |x| (|getShellEntry| $ 9))) (DEFUN |STAGG-;first;ANniA;3| (|x| |n| $) - (PROG (#0=#:G1446 |i|) + (PROG (#0=#:G1447 |i|) (RETURN (SEQ (SPADCALL (PROGN @@ -123,7 +123,7 @@ '(|NonNegativeInteger|) |l|) (|getShellEntry| $ 25)) (LET - ((#0=#:G1419 (+ (- |h| |l|) 1))) + ((#0=#:G1420 (+ (- |h| |l|) 1))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 35))))))))))))) @@ -221,7 +221,7 @@ (LETT |z| (SPADCALL |y| (LET - ((#0=#:G1442 + ((#0=#:G1443 (+ (- |h| |l|) 1))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) diff --git a/src/algebra/strap/STAGG.lsp b/src/algebra/strap/STAGG.lsp index a353f2ef..e477684c 100644 --- a/src/algebra/strap/STAGG.lsp +++ b/src/algebra/strap/STAGG.lsp @@ -6,7 +6,7 @@ (DEFPARAMETER |StreamAggregate;AL| 'NIL) (DEFUN |StreamAggregate;| (|t#1|) - (LET ((#0=#:G1403 + (LET ((#0=#:G1404 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|StreamAggregate;CAT|) @@ -27,8 +27,8 @@ (LIST '|StreamAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |StreamAggregate| (#0=#:G1404) - (LET ((#1=#:G1405 (|assoc| (|devaluate| #0#) |StreamAggregate;AL|))) +(DEFUN |StreamAggregate| (#0=#:G1405) + (LET ((#1=#:G1406 (|assoc| (|devaluate| #0#) |StreamAggregate;AL|))) (COND (#1# (CDR #1#)) (T (PROGN diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp index 05b03c5e..1b94a4b0 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -209,7 +209,7 @@ (SPADCALL |x| (|getShellEntry| $ 79))) (DEFUN |SYMBOL;syprefix| (|sc| $) - (PROG (|ns| #0=#:G1547 |n| #1=#:G1548) + (PROG (|ns| #0=#:G1548 |n| #1=#:G1549) (RETURN (SEQ (LETT |ns| (LIST (LENGTH (QVELT |sc| 3)) (LENGTH (QVELT |sc| 2)) @@ -438,7 +438,7 @@ (EXIT |s|))))) (DEFUN |SYMBOL;anyRadix| (|n| |s| $) - (PROG (|qr| |ns| #0=#:G1503) + (PROG (|qr| |ns| #0=#:G1504) (RETURN (SEQ (EXIT (SEQ (LETT |ns| "" |SYMBOL;anyRadix|) (EXIT (SEQ G190 NIL @@ -530,7 +530,7 @@ (|SYMBOL;scripts;$R;32| |x| $) $)))))) (DEFUN |SYMBOL;resetNew;V;29| ($) - (PROG (|k| #0=#:G1549) + (PROG (|k| #0=#:G1550) (RETURN (SEQ (SPADCALL (|getShellEntry| $ 10) 0 (|getShellEntry| $ 121)) (EXIT (SEQ (LETT |k| NIL |SYMBOL;resetNew;V;29|) @@ -554,7 +554,7 @@ (DEFUN |SYMBOL;scripted?;$B;30| (|sy| $) (NOT (ATOM |sy|))) (DEFUN |SYMBOL;name;2$;31| (|sy| $) - (PROG (|str| |i| #0=#:G1550 #1=#:G1530 #2=#:G1528) + (PROG (|str| |i| #0=#:G1551 #1=#:G1531 #2=#:G1529) (RETURN (SEQ (EXIT (COND ((NOT (|SYMBOL;scripted?;$B;30| |sy| $)) |sy|) @@ -607,8 +607,8 @@ #1# (EXIT #1#))))) (DEFUN |SYMBOL;scripts;$R;32| (|sy| $) - (PROG (|lscripts| |str| |nstr| |j| |nscripts| |m| |n| #0=#:G1551 |i| - #1=#:G1552 |a| #2=#:G1553 |allscripts|) + (PROG (|lscripts| |str| |nstr| |j| |nscripts| |m| |n| #0=#:G1552 |i| + #1=#:G1553 |a| #2=#:G1554 |allscripts|) (RETURN (SEQ (COND ((NOT (|SYMBOL;scripted?;$B;30| |sy| $)) @@ -639,7 +639,7 @@ (|getShellEntry| $ 139)))) (GO G191))) (SPADCALL |nscripts| |i| - (LET ((#3=#:G1541 + (LET ((#3=#:G1542 (- (SPADCALL (SPADCALL |str| |j| @@ -746,7 +746,7 @@ (DEFUN |Symbol| () (PROG () (RETURN - (PROG (#0=#:G1555) + (PROG (#0=#:G1556) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|Symbol|) |Symbol|) diff --git a/src/algebra/strap/UFD-.lsp b/src/algebra/strap/UFD-.lsp index 7955310b..c6a03416 100644 --- a/src/algebra/strap/UFD-.lsp +++ b/src/algebra/strap/UFD-.lsp @@ -8,7 +8,7 @@ |UFD-;prime?;SB;2|)) (DEFUN |UFD-;squareFreePart;2S;1| (|x| $) - (PROG (|s| |f| #0=#:G1418 #1=#:G1405 #2=#:G1403 #3=#:G1404) + (PROG (|s| |f| #0=#:G1419 #1=#:G1406 #2=#:G1404 #3=#:G1405) (RETURN (SEQ (SPADCALL (SPADCALL diff --git a/src/algebra/strap/UFD.lsp b/src/algebra/strap/UFD.lsp index a0fd01b8..57a137f0 100644 --- a/src/algebra/strap/UFD.lsp +++ b/src/algebra/strap/UFD.lsp @@ -4,7 +4,7 @@ (DEFPARAMETER |UniqueFactorizationDomain;AL| 'NIL) (DEFUN |UniqueFactorizationDomain;| () - (LET ((#0=#:G1396 + (LET ((#0=#:G1397 (|Join| (|GcdDomain|) (|mkCategory| '|domain| '(((|prime?| ((|Boolean|) $)) T) diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp index 99ed4101..c60624e6 100644 --- a/src/algebra/strap/URAGG-.lsp +++ b/src/algebra/strap/URAGG-.lsp @@ -274,7 +274,7 @@ (EXIT |x|)))))))) (DEFUN |URAGG-;findCycle| (|x| $) - (PROG (#0=#:G1474 |y|) + (PROG (#0=#:G1475 |y|) (RETURN (SEQ (EXIT (SEQ (LETT |y| (SPADCALL |x| (|getShellEntry| $ 14)) |URAGG-;findCycle|) @@ -444,14 +444,14 @@ ('T (SPADCALL (SPADCALL |x| - (LET ((#0=#:G1499 (- |m| |n|))) + (LET ((#0=#:G1500 (- |m| |n|))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 59)) (|getShellEntry| $ 60))))))))) (DEFUN |URAGG-;=;2AB;23| (|x| |y| $) - (PROG (|k| #0=#:G1507) + (PROG (|k| #0=#:G1508) (RETURN (SEQ (EXIT (COND ((SPADCALL |x| |y| (|getShellEntry| $ 51)) T) @@ -505,7 +505,7 @@ #0# (EXIT #0#))))) (DEFUN |URAGG-;node?;2AB;24| (|u| |v| $) - (PROG (|k| #0=#:G1512) + (PROG (|k| #0=#:G1513) (RETURN (SEQ (EXIT (SEQ (SEQ (LETT |k| 0 |URAGG-;node?;2AB;24|) G190 (COND @@ -580,7 +580,7 @@ ('T (SEQ (LETT |p| (SPADCALL |p| - (LET ((#0=#:G1525 (- |n| 1))) + (LET ((#0=#:G1526 (- |n| 1))) (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 59)) diff --git a/src/algebra/strap/URAGG.lsp b/src/algebra/strap/URAGG.lsp index 040fec6b..635b921b 100644 --- a/src/algebra/strap/URAGG.lsp +++ b/src/algebra/strap/URAGG.lsp @@ -6,7 +6,7 @@ (DEFPARAMETER |UnaryRecursiveAggregate;AL| 'NIL) (DEFUN |UnaryRecursiveAggregate;| (|t#1|) - (LET ((#0=#:G1424 + (LET ((#0=#:G1425 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|UnaryRecursiveAggregate;CAT|) @@ -80,8 +80,8 @@ (LIST '|UnaryRecursiveAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |UnaryRecursiveAggregate| (#0=#:G1425) - (LET ((#1=#:G1426 +(DEFUN |UnaryRecursiveAggregate| (#0=#:G1426) + (LET ((#1=#:G1427 (|assoc| (|devaluate| #0#) |UnaryRecursiveAggregate;AL|))) (COND (#1# (CDR #1#)) diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp index fba19410..b3208017 100644 --- a/src/algebra/strap/VECTOR.lsp +++ b/src/algebra/strap/VECTOR.lsp @@ -26,10 +26,10 @@ (|getShellEntry| $ 17))) (|getShellEntry| $ 19))) -(DEFUN |Vector| (#0=#:G1407) +(DEFUN |Vector| (#0=#:G1408) (PROG () (RETURN - (PROG (#1=#:G1408) + (PROG (#1=#:G1409) (RETURN (COND ((LETT #1# diff --git a/src/algebra/syntax.spad.pamphlet b/src/algebra/syntax.spad.pamphlet index 30de16df..ef4501ff 100644 --- a/src/algebra/syntax.spad.pamphlet +++ b/src/algebra/syntax.spad.pamphlet @@ -211,7 +211,7 @@ Syntax(): Public == Private where getOperator x == atom? x => userError "atom as operand to getOperator" - op: % := CAR(x)$Lisp + op: % := %head(x)$Foreign(Builtin) op case Identifier => op@Identifier op case Integer => op@Integer op case DoubleFloat => op@DoubleFloat @@ -223,7 +223,7 @@ Syntax(): Public == Private where getOperands x == atom? x => [] - CDR(x)$Lisp + %tail(x)$Foreign(Builtin) coerce(x: %): InputForm == x : InputForm diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index be422d75..e135583f 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -1075,11 +1075,10 @@ $middleEndMacroList == middleEndExpand: %Form -> %Form middleEndExpand x == - x = '%false => 'NIL - x = '%true => 'T + x = '%false or x = '%nil => 'NIL + IDENTP x and (x' := x has %Rename) => x' isAtomicForm x => x [op,:args] := x - IDENTP op and (op' := op has %Rename) => [op',:middleEndExpand args] IDENTP op and (fun := getOpcodeExpander op) => apply(fun,x,nil) op in $middleEndMacroList => middleEndExpand MACROEXPAND_-1 x diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot index 85da2c38..bf094be5 100644 --- a/src/interp/g-opt.boot +++ b/src/interp/g-opt.boot @@ -402,10 +402,11 @@ $VMsideEffectFreeOperators == SPADfirst QVELT _+ _- _* _< _= _<_= _> _>_= ASH INTEGER_-LENGTH QEQCAR QCDR QCAR INTEGERP FLOATP STRINGP IDENTP SYMBOLP MINUSP GREATERP ZEROP ODDP FLOAT_-RADIX FLOAT FLOAT_-SIGN FLOAT_-DIGITS - CGREATERP GGREATERP CHAR BOOLE GET BVEC_-GREATER FUNCALL - %and %or %not %eq %ieq %ilt %ile %igt %ige %head %tail - %imul %iadd %isub %igcd %ilcm %iexp %imin %imax - %feq %flt %fle %fgt %fge %fmul %fadd %fsub %fexp %fmin %fmax) + CGREATERP GGREATERP CHAR BOOLE GET BVEC_-GREATER FUNCALL %false %true + %and %or %not %eq %ieq %ilt %ile %igt %ige %head %tail %integer? + %imul %iadd %isub %igcd %ilcm %ipow %imin %imax %ieven? %iodd? + %feq %flt %fle %fgt %fge %fmul %fadd %fsub %fexp %fmin %fmax + %fpow %nil %pair?) ++ List of simple VM operators $simpleVMoperators == diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot index 139eff6e..5e1a228a 100644 --- a/src/interp/g-util.boot +++ b/src/interp/g-util.boot @@ -231,26 +231,33 @@ expandDynval ["%dynval",:args] == ["SYMBOL-VALUE",:expandToVMForm args] expandStore ["%store",place,value] == - place := expandToVMForm place value := expandToVMForm value + place is ['%head,x] => ['RPLACA,expandToVMForm x,value] + place is ['%tail,x] => ['RPLACD,expandToVMForm x,value] + place := expandToVMForm place cons? place => ["SETF",place,value] ["SETQ",place,value] ++ Opcodes with direct mapping to target operations. for x in [ + -- Boolean constants + -- ['%false, :'NIL], + ['%true, :'T], -- unary Boolean operations ['%not, :'NOT], - -- binary Boolean operations ['%and, :'AND], ['%or, :'OR], -- unary integer operations. - ['%iabs,:'ABS], - + ['%iabs, :'ABS], + ['%ieven?, :'EVENP], + ['%ineg, :"-"], + ['%integer?,:'INTEGERP], + ['%iodd?, :'ODDP], -- binary integer operations. ['%iadd,:"+"], - ['%iexp,:'EXPT], + ['%ieq, :"EQL"], ['%igcd,:'GCD], ['%ige, :">="], ['%igt, :">"], @@ -260,14 +267,13 @@ for x in [ ['%imax,:'MAX], ['%imin,:'MIN], ['%imul,:"*"], + ['%ipow,:'EXPT], ['%isub,:"-"], -- unary float operations. ['%fabs,:'ABS], - -- binary float operations. ['%fadd,:"+"], - ['%fexp,:'EXPT], ['%fge, :">="], ['%fgt, :">"], ['%fle, :"<="], @@ -275,10 +281,14 @@ for x in [ ['%fmax,:'MAX], ['%fmin,:'MIN], ['%fmul,:"*"], + ['%fpow,:'EXPT], ['%fsub,:"-"], + -- list contants + -- ['%nil, :'NIL], -- unary list operations ['%head,:'CAR], + ['%pair?, :'CONSP], ['%tail,:'CDR] ] repeat property(first x,'%Rename) := rest x @@ -301,11 +311,10 @@ getOpcodeExpander op == ++ Expand all opcodes contained in the form `x' into a form ++ suitable for evaluation by the VM. expandToVMForm x == - x = '%false => 'NIL - x = '%true => 'T + x = '%false or x = '%nil => 'NIL + IDENTP x and (x' := x has %Rename) => x' isAtomicForm x => x [op,:args] := x - IDENTP op and (op' := op has %Rename) => [op',:expandToVMForm args] IDENTP op and (fun:= getOpcodeExpander op) => apply(fun,x,nil) op' := expandToVMForm op args' := expandToVMForm args |