diff options
Diffstat (limited to 'src/algebra/strap')
59 files changed, 252 insertions, 250 deletions
diff --git a/src/algebra/strap/ABELGRP.lsp b/src/algebra/strap/ABELGRP.lsp index db5ae7cf..61670471 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=#:G1399 - (|sublisV| (PAIR '(#1=#:G1398) (LIST '(|Integer|))) + (LET ((#0=#:G1374 + (|sublisV| (PAIR '(#1=#:G1373) (LIST '(|Integer|))) (|Join| (|CancellationAbelianMonoid|) (|LeftLinearSet| '#1#) (|mkCategory| '|domain| diff --git a/src/algebra/strap/ABELMON.lsp b/src/algebra/strap/ABELMON.lsp index cfdd1b16..84630f4a 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=#:G1398 + (LET ((#0=#:G1373 (|Join| (|AbelianSemiGroup|) (|mkCategory| '|domain| '(((|Zero| ($) |constant|) T) diff --git a/src/algebra/strap/ABELSG.lsp b/src/algebra/strap/ABELSG.lsp index 46363f44..7e50c7f2 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=#:G1397 + (LET ((#0=#:G1372 (|Join| (|SetCategory|) (|mkCategory| '|domain| '(((+ ($ $ $)) T) diff --git a/src/algebra/strap/ALAGG.lsp b/src/algebra/strap/ALAGG.lsp index c33b5d87..fbbb335a 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=#:G1399 + (LET ((#0=#:G1374 (|sublisV| (PAIR '(|t#1| |t#2|) (LIST (|devaluate| |t#1|) (|devaluate| |t#2|))) (|sublisV| - (PAIR '(#1=#:G1398) + (PAIR '(#1=#:G1373) (LIST '(|Record| (|:| |key| |t#1|) (|:| |entry| |t#2|)))) (COND @@ -34,9 +34,9 @@ (|devaluate| |t#2|))) #0#)) -(DEFUN |AssociationListAggregate| (&REST #0=#:G1402 &AUX #1=#:G1400) +(DEFUN |AssociationListAggregate| (&REST #0=#:G1377 &AUX #1=#:G1375) (DSETQ #1# #0#) - (LET ((#2=#:G1401 + (LET ((#2=#:G1376 (|assoc| (|devaluateList| #1#) |AssociationListAggregate;AL|))) (COND diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp index 2cd01a42..30c0079c 100644 --- a/src/algebra/strap/BOOLEAN.lsp +++ b/src/algebra/strap/BOOLEAN.lsp @@ -150,7 +150,7 @@ (DEFUN |Boolean| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1424) + (PROG (#0=#:G1399) (RETURN (COND ((SETQ #0# (HGET |$ConstructorCache| '|Boolean|)) @@ -197,14 +197,14 @@ 172 < 178 |/\\| 184) 'NIL (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0)) - (CONS '#(NIL NIL NIL NIL |Logic&| |SetCategory&| - |OrderedType&| NIL |BasicType&| NIL NIL NIL) + (CONS '#(NIL NIL NIL NIL |SetCategory&| |OrderedType&| + NIL |Logic&| |BasicType&| NIL NIL NIL) (CONS '#((|OrderedFinite|) (|OrderedSet|) (|PropositionalLogic|) (|Finite|) - (|Logic|) (|SetCategory|) - (|OrderedType|) (|BooleanLogic|) - (|BasicType|) (|ConvertibleTo| 33) - (|Type|) (|CoercibleTo| 35)) + (|SetCategory|) (|OrderedType|) + (|BooleanLogic|) (|Logic|) (|BasicType|) + (|ConvertibleTo| 33) (|Type|) + (|CoercibleTo| 35)) (|makeByteWordVec2| 38 '(1 25 18 0 26 0 27 0 29 0 25 0 31 2 0 18 0 0 1 1 0 0 0 10 2 0 0 0 0 15 0 0 diff --git a/src/algebra/strap/CABMON.lsp b/src/algebra/strap/CABMON.lsp index 0772044a..d8673af2 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=#:G1397 + (LET ((#0=#:G1372 (|Join| (|AbelianMonoid|) (|mkCategory| '|domain| '(((|subtractIfCan| ((|Union| $ "failed") $ $)) diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp index 719559af..15a63aa1 100644 --- a/src/algebra/strap/CHAR.lsp +++ b/src/algebra/strap/CHAR.lsp @@ -123,12 +123,12 @@ (DEFUN |CHAR;size;Nni;6| ($) (DECLARE (IGNORE $)) 256) (DEFUN |CHAR;index;Pi$;7| (|n| $) - (CODE-CHAR (LET ((#0=#:G1405 (- |n| 1))) + (CODE-CHAR (LET ((#0=#:G1380 (- |n| 1))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)))) (DEFUN |CHAR;lookup;$Pi;8| (|c| $) - (LET ((#0=#:G1407 (+ 1 (CHAR-CODE |c|)))) + (LET ((#0=#:G1382 (+ 1 (CHAR-CODE |c|)))) (|check-subtype| (PLUSP #0#) '(|PositiveInteger|) #0#))) (DEFUN |CHAR;char;Nni$;9| (|n| $) @@ -187,7 +187,7 @@ (DEFUN |Character| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1427) + (PROG (#0=#:G1402) (RETURN (COND ((SETQ #0# (HGET |$ConstructorCache| '|Character|)) diff --git a/src/algebra/strap/CLAGG-.lsp b/src/algebra/strap/CLAGG-.lsp index eb404d15..9acb3b8b 100644 --- a/src/algebra/strap/CLAGG-.lsp +++ b/src/algebra/strap/CLAGG-.lsp @@ -45,14 +45,14 @@ (LENGTH (SPADCALL |c| (|getShellEntry| $ 9)))) (DEFUN |CLAGG-;count;MANni;2| (|f| |c| $) - (LET ((#0=#:G1402 NIL) (#1=#:G1403 T) - (#2=#:G1429 (SPADCALL |c| (|getShellEntry| $ 9)))) + (LET ((#0=#:G1377 NIL) (#1=#:G1378 T) + (#2=#:G1404 (SPADCALL |c| (|getShellEntry| $ 9)))) (LOOP (COND ((ATOM #2#) (RETURN (COND (#1# 0) (T #0#)))) (T (LET ((|x| (CAR #2#))) (AND (SPADCALL |x| |f|) - (LET ((#3=#:G1401 1)) + (LET ((#3=#:G1376 1)) (COND (#1# (SETQ #0# #3#)) (T (SETQ #0# (+ #0# #3#)))) @@ -60,25 +60,25 @@ (SETQ #2# (CDR #2#))))) (DEFUN |CLAGG-;any?;MAB;3| (|f| |c| $) - (LET ((#0=#:G1407 NIL) (#1=#:G1408 T) - (#2=#:G1430 (SPADCALL |c| (|getShellEntry| $ 9)))) + (LET ((#0=#:G1382 NIL) (#1=#:G1383 T) + (#2=#:G1405 (SPADCALL |c| (|getShellEntry| $ 9)))) (LOOP (COND ((ATOM #2#) (RETURN (COND (#1# NIL) (T #0#)))) (T (LET ((|x| (CAR #2#))) - (LET ((#3=#:G1406 (SPADCALL |x| |f|))) + (LET ((#3=#:G1381 (SPADCALL |x| |f|))) (COND (#1# (SETQ #0# #3#)) (T (SETQ #0# (OR #0# #3#)))) (SETQ #1# NIL))))) (SETQ #2# (CDR #2#))))) (DEFUN |CLAGG-;every?;MAB;4| (|f| |c| $) - (LET ((#0=#:G1411 NIL) (#1=#:G1412 T) - (#2=#:G1431 (SPADCALL |c| (|getShellEntry| $ 9)))) + (LET ((#0=#:G1386 NIL) (#1=#:G1387 T) + (#2=#:G1406 (SPADCALL |c| (|getShellEntry| $ 9)))) (LOOP (COND ((ATOM #2#) (RETURN (COND (#1# T) (T #0#)))) (T (LET ((|x| (CAR #2#))) - (LET ((#3=#:G1410 (SPADCALL |x| |f|))) + (LET ((#3=#:G1385 (SPADCALL |x| |f|))) (COND (#1# (SETQ #0# #3#)) (T (SETQ #0# (AND #0# #3#)))) diff --git a/src/algebra/strap/CLAGG.lsp b/src/algebra/strap/CLAGG.lsp index 0b352d92..85246919 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=#:G1397 + (LET ((#0=#:G1372 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|Collection;CAT|) @@ -69,8 +69,8 @@ (|setShellEntry| #0# 0 (LIST '|Collection| (|devaluate| |t#1|))) #0#)) -(DEFUN |Collection| (#0=#:G1398) - (LET ((#1=#:G1399 (|assoc| (|devaluate| #0#) |Collection;AL|))) +(DEFUN |Collection| (#0=#:G1373) + (LET ((#1=#:G1374 (|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 d7eeb604..125e68cb 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=#:G1397 + (LET ((#0=#:G1372 (|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 1915550c..2fb56809 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -441,7 +441,7 @@ (COND ((EQL 2 2) 53) ((EQL 2 16) (* 4 53)) - (T (LET ((#0=#:G1431 + (T (LET ((#0=#:G1406 (TRUNCATE (SPADCALL 53 (|DFLOAT;log2;2$;40| @@ -636,7 +636,7 @@ (DEFUN |DFLOAT;retract;$F;80| (|x| $) (|DFLOAT;rationalApproximation;$2NniF;87| |x| - (LET ((#0=#:G1514 (- 53 1))) + (LET ((#0=#:G1489 (- 53 1))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) 2 $)) @@ -644,7 +644,7 @@ (DEFUN |DFLOAT;retractIfCan;$U;81| (|x| $) (CONS 0 (|DFLOAT;rationalApproximation;$2NniF;87| |x| - (LET ((#0=#:G1522 (- 53 1))) + (LET ((#0=#:G1497 (- 53 1))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) 2 $))) @@ -717,7 +717,7 @@ (|getShellEntry| $ 134))) (T (SEQ (LETT |de| (EXPT BASE - (LET ((#0=#:G1550 (- |ex|))) + (LET ((#0=#:G1525 (- |ex|))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#))) @@ -842,7 +842,7 @@ (DEFUN |DoubleFloat| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1581) + (PROG (#0=#:G1556) (RETURN (COND ((SETQ #0# (HGET |$ConstructorCache| '|DoubleFloat|)) diff --git a/src/algebra/strap/DIFRING.lsp b/src/algebra/strap/DIFRING.lsp index b0e48f64..0b5fa14c 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=#:G1397 (|Join| (|Ring|) (|DifferentialSpace|)))) + (LET ((#0=#:G1372 (|Join| (|Ring|) (|DifferentialSpace|)))) (|setShellEntry| #0# 0 '(|DifferentialRing|)) #0#)) diff --git a/src/algebra/strap/DIVRING.lsp b/src/algebra/strap/DIVRING.lsp index 3f98dc82..374ffbcf 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=#:G1400 + (LET ((#0=#:G1375 (|sublisV| - (PAIR '(#1=#:G1399) (LIST '(|Fraction| (|Integer|)))) + (PAIR '(#1=#:G1374) (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 7b021105..cd7f845a 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=#:G1397 + (LET ((#0=#:G1372 (|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 ee210403..979c32c1 100644 --- a/src/algebra/strap/EUCDOM-.lsp +++ b/src/algebra/strap/EUCDOM-.lsp @@ -229,8 +229,8 @@ |EUCDOM-;principalIdeal;LR;9|) (EXIT (CONS (CONS (QVELT |u| 0) (LET - ((#0=#:G1519 (CAR |v|)) - (#1=#:G1518 NIL)) + ((#0=#:G1494 (CAR |v|)) + (#1=#:G1493 NIL)) (LOOP (COND ((ATOM #0#) @@ -254,7 +254,7 @@ ((SPADCALL |z| (|spadConstant| $ 19) (|getShellEntry| $ 51)) (CONS 0 - (LET ((#0=#:G1521 |l|) (#1=#:G1520 NIL)) + (LET ((#0=#:G1496 |l|) (#1=#:G1495 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) @@ -272,8 +272,8 @@ ((EQL (CAR |q|) 1) (CONS 1 "failed")) (T (CONS 0 (LET - ((#2=#:G1523 (CAR |pid|)) - (#3=#:G1522 NIL)) + ((#2=#:G1498 (CAR |pid|)) + (#3=#:G1497 NIL)) (LOOP (COND ((ATOM #2#) @@ -304,8 +304,8 @@ |EUCDOM-;multiEuclidean;LSU;11|) (LETT |u| (SPADCALL - (LET ((#0=#:G1504 NIL) (#1=#:G1505 T) - (#2=#:G1524 |l1|)) + (LET ((#0=#:G1479 NIL) (#1=#:G1480 T) + (#2=#:G1499 |l1|)) (LOOP (COND ((ATOM #2#) @@ -313,8 +313,8 @@ (COND (#1# (|spadConstant| $ 30)) (T #0#)))) - (T (LET ((#3=#:G1397 (CAR #2#))) - (LET ((#4=#:G1503 #3#)) + (T (LET ((#3=#:G1372 (CAR #2#))) + (LET ((#4=#:G1478 #3#)) (COND (#1# (SETQ #0# #4#)) (T @@ -323,8 +323,8 @@ (|getShellEntry| $ 29))))) (SETQ #1# NIL))))) (SETQ #2# (CDR #2#)))) - (LET ((#5=#:G1507 NIL) (#6=#:G1508 T) - (#7=#:G1525 |l2|)) + (LET ((#5=#:G1482 NIL) (#6=#:G1483 T) + (#7=#:G1500 |l2|)) (LOOP (COND ((ATOM #7#) @@ -332,8 +332,8 @@ (COND (#6# (|spadConstant| $ 30)) (T #5#)))) - (T (LET ((#8=#:G1398 (CAR #7#))) - (LET ((#9=#:G1506 #8#)) + (T (LET ((#8=#:G1373 (CAR #7#))) + (LET ((#9=#:G1481 #8#)) (COND (#6# (SETQ #5# #9#)) (T diff --git a/src/algebra/strap/EUCDOM.lsp b/src/algebra/strap/EUCDOM.lsp index b9413824..1704e681 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=#:G1414 + (LET ((#0=#:G1389 (|Join| (|PrincipalIdealDomain|) (|mkCategory| '|domain| '(((|sizeLess?| ((|Boolean|) $ $)) T) diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp index 874d766f..ff4359c7 100644 --- a/src/algebra/strap/FFIELDC-.lsp +++ b/src/algebra/strap/FFIELDC-.lsp @@ -127,7 +127,7 @@ (LETT |q| (- (SPADCALL (|getShellEntry| $ 40)) 1) |FFIELDC-;primitive?;SB;9|) (LETT |equalone| NIL |FFIELDC-;primitive?;SB;9|) - (LET ((#0=#:G1513 |explist|) (|exp| NIL)) + (LET ((#0=#:G1488 |explist|) (|exp| NIL)) (LOOP (COND ((OR (ATOM #0#) @@ -155,7 +155,7 @@ |FFIELDC-;order;SPi;10|) (LETT |lof| (SPADCALL (|getShellEntry| $ 56)) |FFIELDC-;order;SPi;10|) - (LET ((#0=#:G1514 |lof|)) + (LET ((#0=#:G1489 |lof|)) (LOOP (COND ((ATOM #0#) (RETURN NIL)) @@ -173,7 +173,7 @@ |FFIELDC-;order;SPi;10|) (LET ((|j| 0) - (#1=#:G1515 (- (CDR |rec|) 2))) + (#1=#:G1490 (- (CDR |rec|) 2))) (LOOP (COND ((OR (> |j| #1#) @@ -224,7 +224,7 @@ |FFIELDC-;discreteLog;SNni;11|) (LETT |exp| |groupord| |FFIELDC-;discreteLog;SNni;11|) - (LET ((#0=#:G1516 |faclist|)) + (LET ((#0=#:G1491 |faclist|)) (LOOP (COND ((ATOM #0#) (RETURN NIL)) @@ -236,7 +236,7 @@ (EXIT (LET ((|t| 0) - (#1=#:G1517 + (#1=#:G1492 (- (CDR |f|) 1))) (LOOP (COND @@ -414,7 +414,7 @@ (LETT |mult| 1 |FFIELDC-;discreteLog;2SU;12|) (LETT |exp| |groupord| |FFIELDC-;discreteLog;2SU;12|) - (LET ((#0=#:G1518 |faclist|)) + (LET ((#0=#:G1493 |faclist|)) (LOOP (COND ((ATOM #0#) (RETURN NIL)) @@ -430,7 +430,7 @@ (EXIT (LET ((|t| 0) - (#1=#:G1519 (- (CDR |f|) 1))) + (#1=#:G1494 (- (CDR |f|) 1))) (LOOP (COND ((> |t| #1#) (RETURN NIL)) @@ -497,8 +497,8 @@ (EXIT (SPADCALL (SPADCALL (CAR |flist|) (|getShellEntry| $ 106)) - (LET ((#0=#:G1508 NIL) (#1=#:G1509 T) - (#2=#:G1520 (CDR |flist|))) + (LET ((#0=#:G1483 NIL) (#1=#:G1484 T) + (#2=#:G1495 (CDR |flist|))) (LOOP (COND ((ATOM #2#) @@ -509,7 +509,7 @@ (T (LET ((|u| (CAR #2#))) (LET - ((#3=#:G1507 + ((#3=#:G1482 (SPADCALL (CAR |u|) (CDR |u|) (|getShellEntry| $ 107)))) diff --git a/src/algebra/strap/FFIELDC.lsp b/src/algebra/strap/FFIELDC.lsp index 9b7237a5..5bf2d89c 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=#:G1405 + (LET ((#0=#:G1380 (|Join| (|FieldOfPrimeCharacteristic|) (|Finite|) (|StepThrough|) (|DifferentialRing|) (|mkCategory| '|domain| diff --git a/src/algebra/strap/FPS-.lsp b/src/algebra/strap/FPS-.lsp index 744e62bf..e98d51fa 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=#:G1402 + (LET ((#0=#:G1377 (MAX 1 (TRUNCATE (SPADCALL 4004 diff --git a/src/algebra/strap/FPS.lsp b/src/algebra/strap/FPS.lsp index 1d84e2f8..2b75657f 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=#:G1397 + (LET ((#0=#:G1372 (|Join| (|RealNumberSystem|) (|mkCategory| '|domain| '(((|float| ($ (|Integer|) (|Integer|))) T) diff --git a/src/algebra/strap/GCDDOM-.lsp b/src/algebra/strap/GCDDOM-.lsp index 8abb8a01..36dbbf51 100644 --- a/src/algebra/strap/GCDDOM-.lsp +++ b/src/algebra/strap/GCDDOM-.lsp @@ -55,7 +55,7 @@ (LETT |c2| (SPADCALL |p2| (|getShellEntry| $ 26)) |GCDDOM-;gcdPolynomial;3Sup;4|) (SETQ |p1| - (LET ((#0=#:G1418 + (LET ((#0=#:G1393 (SPADCALL |p1| |c1| (|getShellEntry| $ 27)))) (|check-union| (ZEROP (CAR #0#)) diff --git a/src/algebra/strap/GCDDOM.lsp b/src/algebra/strap/GCDDOM.lsp index d1dbce16..f638ac77 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=#:G1403 + (LET ((#0=#:G1378 (|Join| (|IntegralDomain|) (|mkCategory| '|domain| '(((|gcd| ($ $ $)) T) diff --git a/src/algebra/strap/HOAGG-.lsp b/src/algebra/strap/HOAGG-.lsp index 7443870a..be7ddc88 100644 --- a/src/algebra/strap/HOAGG-.lsp +++ b/src/algebra/strap/HOAGG-.lsp @@ -45,25 +45,25 @@ (LENGTH (SPADCALL |c| (|getShellEntry| $ 15)))) (DEFUN |HOAGG-;any?;MAB;3| (|f| |c| $) - (LET ((#0=#:G1405 NIL) (#1=#:G1406 T) - (#2=#:G1428 (SPADCALL |c| (|getShellEntry| $ 15)))) + (LET ((#0=#:G1380 NIL) (#1=#:G1381 T) + (#2=#:G1403 (SPADCALL |c| (|getShellEntry| $ 15)))) (LOOP (COND ((ATOM #2#) (RETURN (COND (#1# NIL) (T #0#)))) (T (LET ((|x| (CAR #2#))) - (LET ((#3=#:G1404 (SPADCALL |x| |f|))) + (LET ((#3=#:G1379 (SPADCALL |x| |f|))) (COND (#1# (SETQ #0# #3#)) (T (SETQ #0# (OR #0# #3#)))) (SETQ #1# NIL))))) (SETQ #2# (CDR #2#))))) (DEFUN |HOAGG-;every?;MAB;4| (|f| |c| $) - (LET ((#0=#:G1410 NIL) (#1=#:G1411 T) - (#2=#:G1429 (SPADCALL |c| (|getShellEntry| $ 15)))) + (LET ((#0=#:G1385 NIL) (#1=#:G1386 T) + (#2=#:G1404 (SPADCALL |c| (|getShellEntry| $ 15)))) (LOOP (COND ((ATOM #2#) (RETURN (COND (#1# T) (T #0#)))) (T (LET ((|x| (CAR #2#))) - (LET ((#3=#:G1409 (SPADCALL |x| |f|))) + (LET ((#3=#:G1384 (SPADCALL |x| |f|))) (COND (#1# (SETQ #0# #3#)) (T (SETQ #0# (AND #0# #3#)))) @@ -71,14 +71,14 @@ (SETQ #2# (CDR #2#))))) (DEFUN |HOAGG-;count;MANni;5| (|f| |c| $) - (LET ((#0=#:G1414 NIL) (#1=#:G1415 T) - (#2=#:G1430 (SPADCALL |c| (|getShellEntry| $ 15)))) + (LET ((#0=#:G1389 NIL) (#1=#:G1390 T) + (#2=#:G1405 (SPADCALL |c| (|getShellEntry| $ 15)))) (LOOP (COND ((ATOM #2#) (RETURN (COND (#1# 0) (T #0#)))) (T (LET ((|x| (CAR #2#))) (AND (SPADCALL |x| |f|) - (LET ((#3=#:G1413 1)) + (LET ((#3=#:G1388 1)) (COND (#1# (SETQ #0# #3#)) (T (SETQ #0# (+ #0# #3#)))) @@ -92,14 +92,14 @@ (COND ((SPADCALL |x| (SPADCALL |y| (|getShellEntry| $ 32)) (|getShellEntry| $ 33)) - (LET ((#0=#:G1419 NIL) (#1=#:G1420 T) - (#2=#:G1431 (SPADCALL |x| (|getShellEntry| $ 15))) - (#3=#:G1432 (SPADCALL |y| (|getShellEntry| $ 15)))) + (LET ((#0=#:G1394 NIL) (#1=#:G1395 T) + (#2=#:G1406 (SPADCALL |x| (|getShellEntry| $ 15))) + (#3=#:G1407 (SPADCALL |y| (|getShellEntry| $ 15)))) (LOOP (COND ((OR (ATOM #2#) (ATOM #3#)) (RETURN (COND (#1# T) (T #0#)))) (T (LET ((|a| (CAR #2#)) (|b| (CAR #3#))) - (LET ((#4=#:G1418 + (LET ((#4=#:G1393 (SPADCALL |a| |b| (|getShellEntry| $ 34)))) (COND (#1# (SETQ #0# #4#)) @@ -128,8 +128,8 @@ (DEFUN |HOAGG-;coerce;AOf;10| (|x| $) (SPADCALL (SPADCALL - (LET ((#0=#:G1434 (SPADCALL |x| (|getShellEntry| $ 15))) - (#1=#:G1433 NIL)) + (LET ((#0=#:G1409 (SPADCALL |x| (|getShellEntry| $ 15))) + (#1=#:G1408 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) diff --git a/src/algebra/strap/HOAGG.lsp b/src/algebra/strap/HOAGG.lsp index 44e52b8b..c824102a 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=#:G1398 + (LET ((#0=#:G1373 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|HomogeneousAggregate;CAT|) @@ -77,8 +77,8 @@ (LIST '|HomogeneousAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |HomogeneousAggregate| (#0=#:G1399) - (LET ((#1=#:G1400 +(DEFUN |HomogeneousAggregate| (#0=#:G1374) + (LET ((#1=#:G1375 (|assoc| (|devaluate| #0#) |HomogeneousAggregate;AL|))) (COND (#1# (CDR #1#)) diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index bcc6d8bd..70b228e2 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -382,7 +382,7 @@ ((< |n| 1) (|error| "index out of range")) (T (SEQ (SETQ |p| (|ILIST;rest;$Nni$;19| |p| - (LET ((#0=#:G1506 (- |n| 1))) + (LET ((#0=#:G1481 (- |n| 1))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) $)) @@ -401,7 +401,7 @@ (EXIT (COND ((< |n| 3) |p|) (T (SEQ (LETT |l| - (LET ((#0=#:G1511 (TRUNCATE |n| 2))) + (LET ((#0=#:G1486 (TRUNCATE |n| 2))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) |ILIST;mergeSort|) @@ -413,10 +413,10 @@ $)) (EXIT (|ILIST;merge!;M3$;28| |f| |p| |q| $)))))))))) -(DEFUN |IndexedList| (&REST #0=#:G1520 &AUX #1=#:G1518) +(DEFUN |IndexedList| (&REST #0=#:G1495 &AUX #1=#:G1493) (DECLARE (SPECIAL |$ConstructorCache|)) (DSETQ #1# #0#) - (PROG (#2=#:G1519) + (PROG (#2=#:G1494) (RETURN (COND ((SETQ #2# diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp index 7270b8a1..19a232bd 100644 --- a/src/algebra/strap/INS-.lsp +++ b/src/algebra/strap/INS-.lsp @@ -124,9 +124,9 @@ ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 27)) (|error| "euclideanSize called on zero")) ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 28)) - (LET ((#0=#:G1426 (- (SPADCALL |x| (|getShellEntry| $ 30))))) + (LET ((#0=#:G1401 (- (SPADCALL |x| (|getShellEntry| $ 30))))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#))) - (T (LET ((#1=#:G1427 (SPADCALL |x| (|getShellEntry| $ 30)))) + (T (LET ((#1=#:G1402 (SPADCALL |x| (|getShellEntry| $ 30)))) (|check-subtype| (NOT (MINUSP #1#)) '(|NonNegativeInteger|) #1#))))) diff --git a/src/algebra/strap/INS.lsp b/src/algebra/strap/INS.lsp index 41a8e7d7..fd51e855 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=#:G1414 + (LET ((#0=#:G1389 (|sublisV| - (PAIR '(#1=#:G1408 #2=#:G1409 #3=#:G1410 #4=#:G1411 - #5=#:G1412 #6=#:G1413) + (PAIR '(#1=#:G1383 #2=#:G1384 #3=#:G1385 #4=#:G1386 + #5=#:G1387 #6=#:G1388) (LIST '(|Integer|) '(|Integer|) '(|Integer|) '(|InputForm|) '(|Pattern| (|Integer|)) '(|Integer|))) diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index 65c5e2b0..f528d6be 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -471,7 +471,7 @@ (T (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 109)) (SPADCALL (CONS #'|INT;factorPolynomial!0| $) (SPADCALL - (LET ((#0=#:G1504 + (LET ((#0=#:G1479 (SPADCALL (SPADCALL |p| (|getShellEntry| $ 107)) @@ -500,7 +500,7 @@ (DEFUN |Integer| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1536) + (PROG (#0=#:G1511) (RETURN (COND ((SETQ #0# (HGET |$ConstructorCache| '|Integer|)) diff --git a/src/algebra/strap/INTDOM.lsp b/src/algebra/strap/INTDOM.lsp index aec56f1a..7d5baad4 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=#:G1403 + (LET ((#0=#:G1378 (|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 fc760f24..4b5f1be6 100644 --- a/src/algebra/strap/ISTRING.lsp +++ b/src/algebra/strap/ISTRING.lsp @@ -195,28 +195,28 @@ (EXIT (|error| "index out of range")))) (LETT |r| (MAKE-FULL-CVEC - (LET ((#0=#:G1444 + (LET ((#0=#:G1419 (+ (- |m| (+ (- |h| |l|) 1)) |n|))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) (|spadConstant| $ 53)) |ISTRING;replace;$Us2$;15|) (LETT |k| 0 |ISTRING;replace;$Us2$;15|) - (LET ((|i| 0) (#1=#:G1535 (- |l| 1))) + (LET ((|i| 0) (#1=#:G1510 (- |l| 1))) (LOOP (COND ((> |i| #1#) (RETURN NIL)) (T (SEQ (QESET |r| |k| (CHAR |s| |i|)) (EXIT (SETQ |k| (+ |k| 1)))))) (SETQ |i| (+ |i| 1)))) - (LET ((|i| 0) (#2=#:G1536 (- |n| 1))) + (LET ((|i| 0) (#2=#:G1511 (- |n| 1))) (LOOP (COND ((> |i| #2#) (RETURN NIL)) (T (SEQ (QESET |r| |k| (CHAR |t| |i|)) (EXIT (SETQ |k| (+ |k| 1)))))) (SETQ |i| (+ |i| 1)))) - (LET ((|i| (+ |h| 1)) (#3=#:G1537 (- |m| 1))) + (LET ((|i| (+ |h| 1)) (#3=#:G1512 (- |m| 1))) (LOOP (COND ((> |i| #3#) (RETURN NIL)) @@ -239,7 +239,7 @@ (EXIT (COND ((MINUSP |startpos|) (|error| "index out of bounds")) ((< (- |nw| |startpos|) |np|) NIL) - (T (SEQ (LET ((|ip| 0) (#0=#:G1538 (- |np| 1)) + (T (SEQ (LET ((|ip| 0) (#0=#:G1513 (- |np| 1)) (|iw| |startpos|)) (LOOP (COND @@ -278,7 +278,7 @@ ((NOT (< |startpos| (QCSIZE |t|))) (- (|getShellEntry| $ 6) 1)) (T (SEQ (LET ((|r| |startpos|) - (#0=#:G1539 (- (QCSIZE |t|) 1))) + (#0=#:G1514 (- (QCSIZE |t|) 1))) (LOOP (COND ((> |r| #0#) (RETURN NIL)) @@ -297,7 +297,7 @@ ((NOT (< |startpos| (QCSIZE |t|))) (- (|getShellEntry| $ 6) 1)) (T (SEQ (LET ((|r| |startpos|) - (#0=#:G1540 (- (QCSIZE |t|) 1))) + (#0=#:G1515 (- (QCSIZE |t|) 1))) (LOOP (COND ((> |r| #0#) (RETURN NIL)) @@ -488,13 +488,13 @@ (DEFUN |ISTRING;concat;L$;28| (|l| $) (LET ((|t| (SPADCALL - (LET ((#0=#:G1497 NIL) (#1=#:G1498 T) - (#2=#:G1542 |l|)) + (LET ((#0=#:G1472 NIL) (#1=#:G1473 T) + (#2=#:G1517 |l|)) (LOOP (COND ((ATOM #2#) (RETURN (COND (#1# 0) (T #0#)))) (T (LET ((|s| (CAR #2#))) - (LET ((#3=#:G1496 + (LET ((#3=#:G1471 (SPADCALL |s| (|getShellEntry| $ 16)))) (COND @@ -504,7 +504,7 @@ (SETQ #2# (CDR #2#)))) (|spadConstant| $ 53) (|getShellEntry| $ 9))) (|i| (|getShellEntry| $ 6))) - (SEQ (LET ((#4=#:G1541 |l|)) + (SEQ (LET ((#4=#:G1516 |l|)) (LOOP (COND ((ATOM #4#) (RETURN NIL)) @@ -555,7 +555,7 @@ (RETURN (LET ((|n| (SPADCALL |pattern| (|getShellEntry| $ 47)))) (SEQ (LETT |p| - (LET ((#0=#:G1525 + (LET ((#0=#:G1500 (|ISTRING;position;C$2I;19| |dontcare| |pattern| (LETT |m| @@ -583,7 +583,7 @@ (LETT |i| |p| |ISTRING;match?;2$CB;34|) (LETT |q| (LET - ((#1=#:G1526 + ((#1=#:G1501 (|ISTRING;position;C$2I;19| |dontcare| |pattern| (+ |p| 1) $))) @@ -605,7 +605,7 @@ |ISTRING;match?;2$CB;34|) (SETQ |i| (LET - ((#2=#:G1527 + ((#2=#:G1502 (|ISTRING;position;2$2I;18| |s| |target| |i| $))) (|check-subtype| @@ -625,7 +625,7 @@ (EXIT (SETQ |q| (LET - ((#3=#:G1528 + ((#3=#:G1503 (|ISTRING;position;C$2I;19| |dontcare| |pattern| (+ |q| 1) $))) @@ -647,9 +647,9 @@ (EXIT NIL))))) (EXIT T)))))))))) -(DEFUN |IndexedString| (#0=#:G1543) +(DEFUN |IndexedString| (#0=#:G1518) (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#1=#:G1544) + (PROG (#1=#:G1519) (RETURN (COND ((SETQ #1# diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp index cac9fdbd..d2431d27 100644 --- a/src/algebra/strap/LIST.lsp +++ b/src/algebra/strap/LIST.lsp @@ -154,7 +154,7 @@ (DEFUN |LIST;convert;$If;13| (|x| $) (SPADCALL (CONS (SPADCALL '|construct| (|getShellEntry| $ 47)) - (LET ((#0=#:G1444 |x|) (#1=#:G1443 NIL)) + (LET ((#0=#:G1419 |x|) (#1=#:G1418 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) @@ -166,9 +166,9 @@ (SETQ #0# (CDR #0#))))) (|getShellEntry| $ 52))) -(DEFUN |List| (#0=#:G1445) +(DEFUN |List| (#0=#:G1420) (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#1=#:G1446) + (PROG (#1=#:G1421) (RETURN (COND ((SETQ #1# diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp index f14a10d8..cfe612cd 100644 --- a/src/algebra/strap/LNAGG-.lsp +++ b/src/algebra/strap/LNAGG-.lsp @@ -22,8 +22,8 @@ (DEFUN |LNAGG-;indices;AL;1| (|a| $) (LET ((|i| (SPADCALL |a| (|getShellEntry| $ 9))) - (#0=#:G1412 (SPADCALL |a| (|getShellEntry| $ 10))) - (#1=#:G1411 NIL)) + (#0=#:G1387 (SPADCALL |a| (|getShellEntry| $ 10))) + (#1=#:G1386 NIL)) (LOOP (COND ((> |i| #0#) (RETURN (NREVERSE #1#))) diff --git a/src/algebra/strap/LNAGG.lsp b/src/algebra/strap/LNAGG.lsp index cd27da9b..d712e9ce 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=#:G1400 + (LET ((#0=#:G1375 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (|sublisV| - (PAIR '(#1=#:G1398 #2=#:G1399) + (PAIR '(#1=#:G1373 #2=#:G1374) (LIST '(|Integer|) '(|UniversalSegment| (|Integer|)))) (COND @@ -64,8 +64,8 @@ (LIST '|LinearAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |LinearAggregate| (#0=#:G1401) - (LET ((#1=#:G1402 (|assoc| (|devaluate| #0#) |LinearAggregate;AL|))) +(DEFUN |LinearAggregate| (#0=#:G1376) + (LET ((#1=#:G1377 (|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 5599f794..8adc9781 100644 --- a/src/algebra/strap/LSAGG-.lsp +++ b/src/algebra/strap/LSAGG-.lsp @@ -225,7 +225,7 @@ ((EQL |i| |m|) (SPADCALL |s| |x| (|getShellEntry| $ 14))) (T (SEQ (LETT |y| (SPADCALL |x| - (LET ((#0=#:G1467 (- (- |i| 1) |m|))) + (LET ((#0=#:G1442 (- (- |i| 1) |m|))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) @@ -246,7 +246,7 @@ ((EQL |i| |m|) (SPADCALL |w| |x| (|getShellEntry| $ 41))) (T (SEQ (LETT |y| (SPADCALL |x| - (LET ((#0=#:G1471 (- (- |i| 1) |m|))) + (LET ((#0=#:G1446 (- (- |i| 1) |m|))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) @@ -307,7 +307,7 @@ ((EQL |i| |m|) (SPADCALL |x| (|getShellEntry| $ 17))) (T (SEQ (LETT |y| (SPADCALL |x| - (LET ((#0=#:G1483 (- (- |i| 1) |m|))) + (LET ((#0=#:G1458 (- (- |i| 1) |m|))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) @@ -333,14 +333,14 @@ ((< |h| |l|) |x|) ((EQL |l| |m|) (SPADCALL |x| - (LET ((#0=#:G1489 (- (+ |h| 1) |m|))) + (LET ((#0=#:G1464 (- (+ |h| 1) |m|))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39))) (T (SEQ (LETT |t| (SPADCALL |x| (LET - ((#1=#:G1490 + ((#1=#:G1465 (- (- |l| 1) |m|))) (|check-subtype| (NOT (MINUSP #1#)) @@ -351,7 +351,7 @@ (SPADCALL |t| (SPADCALL |t| (LET - ((#2=#:G1491 (+ (- |h| |l|) 2))) + ((#2=#:G1466 (+ (- |h| |l|) 2))) (|check-subtype| (NOT (MINUSP #2#)) '(|NonNegativeInteger|) #2#)) @@ -405,7 +405,7 @@ (EXIT (COND ((< |n| 3) |p|) (T (SEQ (LETT |l| - (LET ((#0=#:G1511 (TRUNCATE |n| 2))) + (LET ((#0=#:G1486 (TRUNCATE |n| 2))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) |LSAGG-;mergeSort|) @@ -569,7 +569,7 @@ ((< |s| |m|) (|error| "index out of range")) (T (SEQ (LETT |z| (SPADCALL |y| - (LET ((#0=#:G1552 (- |s| |m|))) + (LET ((#0=#:G1527 (- |s| |m|))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) @@ -601,7 +601,7 @@ ((< |s| |m|) (|error| "index out of range")) (T (SEQ (SETQ |x| (SPADCALL |x| - (LET ((#0=#:G1559 (- |s| |m|))) + (LET ((#0=#:G1534 (- |s| |m|))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39))) diff --git a/src/algebra/strap/LSAGG.lsp b/src/algebra/strap/LSAGG.lsp index 219998d3..f3f84a5d 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=#:G1430 + (LET ((#0=#:G1405 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|ListAggregate;CAT|) @@ -20,8 +20,8 @@ (|setShellEntry| #0# 0 (LIST '|ListAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |ListAggregate| (#0=#:G1431) - (LET ((#1=#:G1432 (|assoc| (|devaluate| #0#) |ListAggregate;AL|))) +(DEFUN |ListAggregate| (#0=#:G1406) + (LET ((#1=#:G1407 (|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 7fad9cea..8ebfd39b 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=#:G1399 + (LET ((#0=#:G1374 (|Join| (|SemiGroup|) (|mkCategory| '|domain| '(((|One| ($) |constant|) T) diff --git a/src/algebra/strap/MTSCAT.lsp b/src/algebra/strap/MTSCAT.lsp index 72955375..56b20cbe 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=#:G1399 + (LET ((#0=#:G1374 (|sublisV| (PAIR '(|t#1| |t#2|) (LIST (|devaluate| |t#1|) (|devaluate| |t#2|))) (|sublisV| - (PAIR '(#1=#:G1398) + (PAIR '(#1=#:G1373) (LIST '(|IndexedExponents| |t#2|))) (COND (|MultivariateTaylorSeriesCategory;CAT|) @@ -87,9 +87,9 @@ #0#)) (DEFUN |MultivariateTaylorSeriesCategory| - (&REST #0=#:G1402 &AUX #1=#:G1400) + (&REST #0=#:G1377 &AUX #1=#:G1375) (DSETQ #1# #0#) - (LET ((#2=#:G1401 + (LET ((#2=#:G1376 (|assoc| (|devaluateList| #1#) |MultivariateTaylorSeriesCategory;AL|))) (COND diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index efe37d37..55d5f335 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -40,7 +40,7 @@ (DEFUN |NonNegativeInteger| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1409) + (PROG (#0=#:G1384) (RETURN (COND ((SETQ #0# (HGET |$ConstructorCache| '|NonNegativeInteger|)) diff --git a/src/algebra/strap/OINTDOM.lsp b/src/algebra/strap/OINTDOM.lsp index 50612347..d828bebb 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=#:G1397 (|Join| (|IntegralDomain|) (|OrderedRing|)))) + (LET ((#0=#:G1372 (|Join| (|IntegralDomain|) (|OrderedRing|)))) (|setShellEntry| #0# 0 '(|OrderedIntegralDomain|)) #0#)) diff --git a/src/algebra/strap/ORDRING.lsp b/src/algebra/strap/ORDRING.lsp index b3e0d439..f310dd7b 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=#:G1403 + (LET ((#0=#:G1378 (|Join| (|OrderedAbelianGroup|) (|Ring|) (|Monoid|) (|mkCategory| '|domain| '(((|positive?| ((|Boolean|) $)) T) diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp index 01827b30..dcbbd6a0 100644 --- a/src/algebra/strap/OUTFORM.lsp +++ b/src/algebra/strap/OUTFORM.lsp @@ -635,7 +635,7 @@ (|OUTFORM;rspace;2I$;30| |n| (- |m| 1) $) $)))) (DEFUN |OUTFORM;matrix;L$;31| (|ll| $) - (LET ((|lv| (LET ((#0=#:G1554 |ll|) (#1=#:G1553 NIL)) + (LET ((|lv| (LET ((#0=#:G1529 |ll|) (#1=#:G1528 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) @@ -658,7 +658,7 @@ (DEFUN |OUTFORM;blankSeparate;L$;35| (|l| $) (LET ((|c| 'CONCATB) (|l1| NIL)) - (SEQ (LET ((#0=#:G1555 (REVERSE |l|))) + (SEQ (LET ((#0=#:G1530 (REVERSE |l|))) (LOOP (COND ((ATOM #0#) (RETURN NIL)) @@ -977,7 +977,7 @@ (DEFUN |OutputForm| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1557) + (PROG (#0=#:G1532) (RETURN (COND ((SETQ #0# (HGET |$ConstructorCache| '|OutputForm|)) diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp index 29f7ada0..350ddbe3 100644 --- a/src/algebra/strap/PI.lsp +++ b/src/algebra/strap/PI.lsp @@ -6,7 +6,7 @@ (DEFUN |PositiveInteger| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1401) + (PROG (#0=#:G1376) (RETURN (COND ((SETQ #0# (HGET |$ConstructorCache| '|PositiveInteger|)) diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp index 6430677d..e685fb74 100644 --- a/src/algebra/strap/POLYCAT-.lsp +++ b/src/algebra/strap/POLYCAT-.lsp @@ -146,7 +146,7 @@ (RETURN (SEQ (COND ((NULL |l|) |p|) - (T (SEQ (LET ((#0=#:G1691 |l|)) + (T (SEQ (LET ((#0=#:G1666 |l|)) (LOOP (COND ((ATOM #0#) (RETURN NIL)) @@ -164,7 +164,7 @@ "cannot find a variable to evaluate"))))))) (SETQ #0# (CDR #0#)))) (LETT |lvar| - (LET ((#1=#:G1693 |l|) (#2=#:G1692 NIL)) + (LET ((#1=#:G1668 |l|) (#2=#:G1667 NIL)) (LOOP (COND ((ATOM #1#) (RETURN (NREVERSE #2#))) @@ -179,7 +179,7 @@ (SETQ #1# (CDR #1#)))) |POLYCAT-;eval;SLS;1|) (EXIT (SPADCALL |p| |lvar| - (LET ((#3=#:G1695 |l|) (#4=#:G1694 NIL)) + (LET ((#3=#:G1670 |l|) (#4=#:G1669 NIL)) (LOOP (COND ((ATOM #3#) @@ -227,7 +227,7 @@ (NOT (SPADCALL |p| (|getShellEntry| $ 42)))) (CONS 1 "failed")) (T (SEQ (LETT |l| - (LET ((#0=#:G1697 |lv|) (#1=#:G1696 NIL)) + (LET ((#0=#:G1672 |lv|) (#1=#:G1671 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) @@ -305,7 +305,7 @@ (CDR |lv|) (CDR |ln|) (|getShellEntry| $ 70))))) (DEFUN |POLYCAT-;retract;SVarSet;9| (|p| $) - (LET ((|q| (LET ((#0=#:G1478 (SPADCALL |p| (|getShellEntry| $ 53)))) + (LET ((|q| (LET ((#0=#:G1453 (SPADCALL |p| (|getShellEntry| $ 53)))) (|check-union| (ZEROP (CAR #0#)) (|getShellEntry| $ 9) #0#) (CDR #0#)))) @@ -316,7 +316,7 @@ (T (|error| "Polynomial is not a single variable"))))) (DEFUN |POLYCAT-;retractIfCan;SU;10| (|p| $) - (PROG (|q| #0=#:G1486) + (PROG (|q| #0=#:G1461) (RETURN (SEQ (EXIT (SEQ (SEQ (LETT |q| (SPADCALL |p| (|getShellEntry| $ 53)) @@ -340,8 +340,8 @@ (|getShellEntry| $ 76))) (DEFUN |POLYCAT-;primitiveMonomials;SL;12| (|p| $) - (LET ((#0=#:G1699 (SPADCALL |p| (|getShellEntry| $ 35))) - (#1=#:G1698 NIL)) + (LET ((#0=#:G1674 (SPADCALL |p| (|getShellEntry| $ 35))) + (#1=#:G1673 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) @@ -356,7 +356,7 @@ ((SPADCALL |p| (|getShellEntry| $ 78)) 0) (T (SEQ (LETT |u| (SPADCALL |p| - (LET ((#0=#:G1492 + (LET ((#0=#:G1467 (SPADCALL |p| (|getShellEntry| $ 53)))) (|check-union| (ZEROP (CAR #0#)) @@ -393,7 +393,7 @@ (SPADCALL |p| (LETT |v| (LET - ((#0=#:G1500 + ((#0=#:G1475 (SPADCALL |p| (|getShellEntry| $ 53)))) (|check-union| (ZEROP (CAR #0#)) @@ -439,7 +439,7 @@ (DEFUN |POLYCAT-;allMonoms| (|l| $) (SPADCALL (SPADCALL - (LET ((#0=#:G1701 |l|) (#1=#:G1700 NIL)) + (LET ((#0=#:G1676 |l|) (#1=#:G1675 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) @@ -455,7 +455,7 @@ (LET ((|w| (SPADCALL |n| (|spadConstant| $ 28) (|getShellEntry| $ 102)))) (SEQ (LET ((|i| (SPADCALL |w| (|getShellEntry| $ 104))) - (#0=#:G1702 (|sizeOfSimpleArray| |w|)) (#1=#:G1703 |b|)) + (#0=#:G1677 (|sizeOfSimpleArray| |w|)) (#1=#:G1678 |b|)) (LOOP (COND ((OR (> |i| #0#) (ATOM #1#)) (RETURN NIL)) @@ -469,13 +469,13 @@ (DEFUN |POLYCAT-;eq2R| (|l| |b| $) (SPADCALL - (LET ((#0=#:G1707 |b|) (#1=#:G1704 NIL)) + (LET ((#0=#:G1682 |b|) (#1=#:G1679 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) (T (LET ((|bj| (CAR #0#))) (SETQ #1# - (CONS (LET ((#2=#:G1706 |l|) (#3=#:G1705 NIL)) + (CONS (LET ((#2=#:G1681 |l|) (#3=#:G1680 NIL)) (LOOP (COND ((ATOM #2#) (RETURN (NREVERSE #3#))) @@ -495,7 +495,7 @@ (LET* ((|l| (SPADCALL |m| (|getShellEntry| $ 114))) (|b| (SPADCALL (SPADCALL - (LET ((#0=#:G1709 |l|) (#1=#:G1708 NIL)) + (LET ((#0=#:G1684 |l|) (#1=#:G1683 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) @@ -507,7 +507,7 @@ (SETQ #0# (CDR #0#)))) (|getShellEntry| $ 99)) (|getShellEntry| $ 100))) - (|d| (LET ((#2=#:G1711 |b|) (#3=#:G1710 NIL)) + (|d| (LET ((#2=#:G1686 |b|) (#3=#:G1685 NIL)) (LOOP (COND ((ATOM #2#) (RETURN (NREVERSE #3#))) @@ -536,7 +536,7 @@ (|b| (SPADCALL (SPADCALL (|POLYCAT-;allMonoms| |r| $) (SPADCALL - (LET ((#0=#:G1713 |l|) (#1=#:G1712 NIL)) + (LET ((#0=#:G1688 |l|) (#1=#:G1687 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) @@ -549,7 +549,7 @@ (|getShellEntry| $ 99)) (|getShellEntry| $ 124)) (|getShellEntry| $ 100))) - (|d| (LET ((#2=#:G1715 |b|) (#3=#:G1714 NIL)) + (|d| (LET ((#2=#:G1690 |b|) (#3=#:G1689 NIL)) (LOOP (COND ((ATOM #2#) (RETURN (NREVERSE #3#))) @@ -605,10 +605,10 @@ (SPADCALL (SPADCALL |ansR| (|getShellEntry| $ 151)) (|getShellEntry| $ 51)) - (LET ((#0=#:G1717 + (LET ((#0=#:G1692 (SPADCALL |ansR| (|getShellEntry| $ 155))) - (#1=#:G1716 NIL)) + (#1=#:G1691 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) @@ -633,10 +633,10 @@ (SPADCALL |ansSUP| (|getShellEntry| $ 160)) (CDR |v|) (|getShellEntry| $ 161)) - (LET ((#2=#:G1719 + (LET ((#2=#:G1694 (SPADCALL |ansSUP| (|getShellEntry| $ 164))) - (#3=#:G1718 NIL)) + (#3=#:G1693 NIL)) (LOOP (COND ((ATOM #2#) (RETURN (NREVERSE #3#))) @@ -657,8 +657,8 @@ (RETURN (LET* ((|ll| (SPADCALL (SPADCALL |mat| (|getShellEntry| $ 166)) (|getShellEntry| $ 114))) - (|llR| (LET ((#0=#:G1731 (|SPADfirst| |ll|)) - (#1=#:G1730 NIL)) + (|llR| (LET ((#0=#:G1706 (|SPADfirst| |ll|)) + (#1=#:G1705 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) @@ -666,15 +666,15 @@ (SETQ #1# (CONS NIL #1#))))) (SETQ #0# (CDR #0#))))) (|monslist| NIL) (|ch| (|spadConstant| $ 169))) - (SEQ (LET ((#2=#:G1720 |ll|)) + (SEQ (LET ((#2=#:G1695 |ll|)) (LOOP (COND ((ATOM #2#) (RETURN NIL)) (T (LET ((|l| (CAR #2#))) (SEQ (LETT |mons| (LET - ((#3=#:G1582 NIL) (#4=#:G1583 T) - (#5=#:G1721 |l|)) + ((#3=#:G1557 NIL) (#4=#:G1558 T) + (#5=#:G1696 |l|)) (LOOP (COND ((ATOM #5#) @@ -687,7 +687,7 @@ (T (LET ((|u| (CAR #5#))) (LET - ((#6=#:G1581 + ((#6=#:G1556 (SPADCALL |u| (|getShellEntry| $ 98)))) (COND @@ -702,7 +702,7 @@ |POLYCAT-;conditionP;MU;27|) (LETT |redmons| NIL |POLYCAT-;conditionP;MU;27|) - (LET ((#7=#:G1722 |mons|)) + (LET ((#7=#:G1697 |mons|)) (LOOP (COND ((ATOM #7#) (RETURN NIL)) @@ -719,8 +719,8 @@ |POLYCAT-;conditionP;MU;27|) (LETT |deg1| (LET - ((#8=#:G1724 |degs|) - (#9=#:G1723 NIL)) + ((#8=#:G1699 |degs|) + (#9=#:G1698 NIL)) (LOOP (COND ((ATOM #8#) @@ -745,7 +745,7 @@ "failed"))) (T (LET - ((#10=#:G1610 + ((#10=#:G1585 (CDR |nd|))) (|check-subtype| (NOT @@ -766,9 +766,9 @@ (EXIT (SETQ |llR| (LET - ((#11=#:G1726 |l|) - (#12=#:G1727 |llR|) - (#13=#:G1725 NIL)) + ((#11=#:G1701 |l|) + (#12=#:G1702 |llR|) + (#13=#:G1700 NIL)) (LOOP (COND ((OR (ATOM #11#) @@ -809,14 +809,14 @@ (T (SEQ (LETT |i| 0 |POLYCAT-;conditionP;MU;27|) (EXIT (CONS 0 (LET - ((#14=#:G1612 + ((#14=#:G1587 (|makeSimpleArray| (|getVMType| (|getShellEntry| $ 6)) (SIZE |monslist|)))) (LET - ((#15=#:G1728 |monslist|) - (#16=#:G1611 0)) + ((#15=#:G1703 |monslist|) + (#16=#:G1586 0)) (LOOP (COND ((ATOM #15#) (RETURN #14#)) @@ -825,9 +825,9 @@ (|setSimpleArrayEntry| #14# #16# (LET - ((#17=#:G1604 NIL) - (#18=#:G1605 T) - (#19=#:G1729 |mons|)) + ((#17=#:G1579 NIL) + (#18=#:G1580 T) + (#19=#:G1704 |mons|)) (LOOP (COND ((ATOM #19#) @@ -842,7 +842,7 @@ ((|m| (CAR #19#))) (LET - ((#20=#:G1603 + ((#20=#:G1578 (SPADCALL |m| (SPADCALL @@ -966,7 +966,7 @@ (SPADCALL (CDR |ansx|) |v| (LET - ((#0=#:G1640 + ((#0=#:G1615 (CDR |dd|))) (|check-subtype| (NOT @@ -1014,14 +1014,14 @@ (LETT |s| (SPADCALL |p| (|getShellEntry| $ 198)) |POLYCAT-;squareFreePart;2S;34|) (|getShellEntry| $ 199)) - (LET ((#0=#:G1653 NIL) (#1=#:G1654 T) - (#2=#:G1732 (SPADCALL |s| (|getShellEntry| $ 202)))) + (LET ((#0=#:G1628 NIL) (#1=#:G1629 T) + (#2=#:G1707 (SPADCALL |s| (|getShellEntry| $ 202)))) (LOOP (COND ((ATOM #2#) (RETURN (COND (#1# (|spadConstant| $ 43)) (T #0#)))) (T (LET ((|f| (CAR #2#))) - (LET ((#3=#:G1652 (CAR |f|))) + (LET ((#3=#:G1627 (CAR |f|))) (COND (#1# (SETQ #0# #3#)) (T (SETQ #0# @@ -1037,7 +1037,7 @@ (DEFUN |POLYCAT-;primitivePart;2S;36| (|p| $) (QVELT (SPADCALL - (LET ((#0=#:G1658 + (LET ((#0=#:G1633 (SPADCALL |p| (SPADCALL |p| (|getShellEntry| $ 206)) (|getShellEntry| $ 207)))) @@ -1049,7 +1049,7 @@ (DEFUN |POLYCAT-;primitivePart;SVarSetS;37| (|p| |v| $) (QVELT (SPADCALL - (LET ((#0=#:G1664 + (LET ((#0=#:G1639 (SPADCALL |p| (SPADCALL |p| |v| (|getShellEntry| $ 211)) (|getShellEntry| $ 212)))) diff --git a/src/algebra/strap/POLYCAT.lsp b/src/algebra/strap/POLYCAT.lsp index c511ad14..ed7ebdfe 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=#:G1416 + (LET ((#0=#:G1391 (|sublisV| (PAIR '(|t#1| |t#2| |t#3|) (LIST (|devaluate| |t#1|) (|devaluate| |t#2|) @@ -198,9 +198,9 @@ (|devaluate| |t#2|) (|devaluate| |t#3|))) #0#)) -(DEFUN |PolynomialCategory| (&REST #0=#:G1419 &AUX #1=#:G1417) +(DEFUN |PolynomialCategory| (&REST #0=#:G1394 &AUX #1=#:G1392) (DSETQ #1# #0#) - (LET ((#2=#:G1418 + (LET ((#2=#:G1393 (|assoc| (|devaluateList| #1#) |PolynomialCategory;AL|))) (COND (#2# (CDR #2#)) diff --git a/src/algebra/strap/QFCAT.lsp b/src/algebra/strap/QFCAT.lsp index 97e3c046..08c1b912 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=#:G1399 + (LET ((#0=#:G1374 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|QuotientFieldCategory;CAT|) @@ -76,8 +76,8 @@ (LIST '|QuotientFieldCategory| (|devaluate| |t#1|))) #0#)) -(DEFUN |QuotientFieldCategory| (#0=#:G1400) - (LET ((#1=#:G1401 +(DEFUN |QuotientFieldCategory| (#0=#:G1375) + (LET ((#1=#:G1376 (|assoc| (|devaluate| #0#) |QuotientFieldCategory;AL|))) (COND (#1# (CDR #1#)) diff --git a/src/algebra/strap/RCAGG.lsp b/src/algebra/strap/RCAGG.lsp index 809bda8c..5a8aba91 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=#:G1397 + (LET ((#0=#:G1372 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|RecursiveAggregate;CAT|) @@ -45,8 +45,8 @@ (LIST '|RecursiveAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |RecursiveAggregate| (#0=#:G1398) - (LET ((#1=#:G1399 (|assoc| (|devaluate| #0#) |RecursiveAggregate;AL|))) +(DEFUN |RecursiveAggregate| (#0=#:G1373) + (LET ((#1=#:G1374 (|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 93d9396b..62e9b7c6 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=#:G1398 - (|sublisV| (PAIR '(#1=#:G1397) (LIST '(|Integer|))) + (LET ((#0=#:G1373 + (|sublisV| (PAIR '(#1=#:G1372) (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 94432451..fcdff63a 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=#:G1397 (|Join| (|AbelianGroup|) (|SemiGroup|)))) + (LET ((#0=#:G1372 (|Join| (|AbelianGroup|) (|SemiGroup|)))) (|setShellEntry| #0# 0 '(|Rng|)) #0#)) diff --git a/src/algebra/strap/RNS.lsp b/src/algebra/strap/RNS.lsp index 809ea623..b7201edc 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=#:G1406 + (LET ((#0=#:G1381 (|sublisV| - (PAIR '(#1=#:G1402 #2=#:G1403 #3=#:G1404 #4=#:G1405) + (PAIR '(#1=#:G1377 #2=#:G1378 #3=#:G1379 #4=#:G1380) (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 67ed3cd5..ed7c4128 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=#:G1397 + (LET ((#0=#:G1372 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|SetAggregate;CAT|) @@ -33,8 +33,8 @@ (|setShellEntry| #0# 0 (LIST '|SetAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |SetAggregate| (#0=#:G1398) - (LET ((#1=#:G1399 (|assoc| (|devaluate| #0#) |SetAggregate;AL|))) +(DEFUN |SetAggregate| (#0=#:G1373) + (LET ((#1=#:G1374 (|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 701ae24d..fa11e006 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -476,7 +476,7 @@ (+ (- |$ShortMaximum| |$ShortMinimum|) 1)) (DEFUN |SINT;index;Pi$;55| (|i| $) - (LET ((#0=#:G1464 (- (+ |i| |$ShortMinimum|) 1))) + (LET ((#0=#:G1439 (- (+ |i| |$ShortMinimum|) 1))) (|check-subtype| (SMINTP #0#) '(|SingleInteger|) #0#))) (DEFUN |SINT;lookup;$Pi;56| (|x| $) @@ -509,7 +509,7 @@ (DEFUN |SingleInteger| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1499) + (PROG (#0=#:G1474) (RETURN (COND ((SETQ #0# (HGET |$ConstructorCache| '|SingleInteger|)) @@ -628,10 +628,11 @@ |AbelianGroup&| NIL NIL NIL NIL NIL |AbelianMonoid&| |Monoid&| NIL NIL NIL NIL NIL NIL |AbelianSemiGroup&| |SemiGroup&| NIL - |Logic&| |DifferentialSpace&| |OrderedType&| - |SetCategory&| NIL NIL |RetractableTo&| - |DifferentialDomain&| |BasicType&| NIL NIL NIL - NIL NIL NIL NIL NIL NIL NIL NIL) + |DifferentialSpace&| |OrderedType&| + |SetCategory&| |Logic&| NIL NIL + |RetractableTo&| |DifferentialDomain&| + |BasicType&| NIL NIL NIL NIL NIL NIL NIL NIL + NIL NIL NIL) (CONS '#((|IntegerNumberSystem|) (|EuclideanDomain|) (|UniqueFactorizationDomain|) @@ -659,10 +660,11 @@ (|LeftLinearSet| $$) (|RightLinearSet| $$) (|AbelianSemiGroup|) (|SemiGroup|) - (|LeftLinearSet| 5) (|Logic|) + (|LeftLinearSet| 5) (|DifferentialSpace|) (|OrderedType|) - (|SetCategory|) (|BooleanLogic|) - (|RealConstant|) (|RetractableTo| 5) + (|SetCategory|) (|Logic|) + (|BooleanLogic|) (|RealConstant|) + (|RetractableTo| 5) (|DifferentialDomain| $$) (|BasicType|) (|OpenMath|) (|ConvertibleTo| 100) (|ConvertibleTo| 101) diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp index 4a3fbda0..60c28e58 100644 --- a/src/algebra/strap/STAGG-.lsp +++ b/src/algebra/strap/STAGG-.lsp @@ -51,7 +51,7 @@ (DEFUN |STAGG-;first;ANniA;3| (|x| |n| $) (SPADCALL - (LET ((|i| 1) (#0=#:G1447 NIL)) + (LET ((|i| 1) (#0=#:G1422 NIL)) (LOOP (COND ((> |i| |n|) (RETURN (NREVERSE #0#))) @@ -112,7 +112,7 @@ (NOT (MINUSP |l|)) '(|NonNegativeInteger|) |l|) (|getShellEntry| $ 25)) - (LET ((#0=#:G1420 (+ (- |h| |l|) 1))) + (LET ((#0=#:G1395 (+ (- |h| |l|) 1))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 35)))))))))))) @@ -193,7 +193,7 @@ (LETT |z| (SPADCALL |y| (LET - ((#0=#:G1443 + ((#0=#:G1418 (+ (- |h| |l|) 1))) (|check-subtype| (NOT (MINUSP #0#)) diff --git a/src/algebra/strap/STAGG.lsp b/src/algebra/strap/STAGG.lsp index 945a862c..896311f6 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=#:G1404 + (LET ((#0=#:G1379 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|StreamAggregate;CAT|) @@ -25,8 +25,8 @@ (LIST '|StreamAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |StreamAggregate| (#0=#:G1405) - (LET ((#1=#:G1406 (|assoc| (|devaluate| #0#) |StreamAggregate;AL|))) +(DEFUN |StreamAggregate| (#0=#:G1380) + (LET ((#1=#:G1381 (|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 fc1b66ba..45a9c215 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -209,8 +209,8 @@ (CONS (STRCONC (|getShellEntry| $ 38) (|SYMBOL;istring| (LENGTH (QVELT |sc| 4)) $)) - (LET ((#0=#:G1549 (NREVERSE |ns|)) - (#1=#:G1548 NIL)) + (LET ((#0=#:G1524 (NREVERSE |ns|)) + (#1=#:G1523 NIL)) (LOOP (COND ((ATOM #0#) (RETURN (NREVERSE #1#))) @@ -464,7 +464,7 @@ (DEFUN |SYMBOL;resetNew;V;29| ($) (SEQ (SPADCALL (|getShellEntry| $ 10) 0 (|getShellEntry| $ 121)) - (EXIT (LET ((#0=#:G1550 + (EXIT (LET ((#0=#:G1525 (SPADCALL (|getShellEntry| $ 13) (|getShellEntry| $ 133)))) (LOOP @@ -489,7 +489,7 @@ $) |SYMBOL;name;2$;31|) (LET ((|i| (+ (|getShellEntry| $ 41) 1)) - (#0=#:G1551 (QCSIZE |str|))) + (#0=#:G1526 (QCSIZE |str|))) (LOOP (COND ((> |i| #0#) (RETURN NIL)) @@ -541,7 +541,7 @@ (|getShellEntry| $ 139)))) (RETURN NIL)) (T (SPADCALL |nscripts| |i| - (LET ((#0=#:G1542 + (LET ((#0=#:G1517 (- (SPADCALL (SPADCALL |str| |j| @@ -563,7 +563,7 @@ (SETQ |m| (SPADCALL |lscripts| (|getShellEntry| $ 153))) - (LET ((|i| |m|) (#1=#:G1552 |nscripts|)) + (LET ((|i| |m|) (#1=#:G1527 |nscripts|)) (LOOP (COND ((ATOM #1#) (RETURN NIL)) @@ -575,10 +575,10 @@ (T (SEQ (SPADCALL |lscripts| |i| (LET - ((#2=#:G1554 + ((#2=#:G1529 (SPADCALL |allscripts| |n| (|getShellEntry| $ 156))) - (#3=#:G1553 NIL)) + (#3=#:G1528 NIL)) (LOOP (COND ((ATOM #2#) @@ -624,7 +624,7 @@ (DEFUN |Symbol| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1556) + (PROG (#0=#:G1531) (RETURN (COND ((SETQ #0# (HGET |$ConstructorCache| '|Symbol|)) diff --git a/src/algebra/strap/UFD-.lsp b/src/algebra/strap/UFD-.lsp index 741e93a8..8cf15830 100644 --- a/src/algebra/strap/UFD-.lsp +++ b/src/algebra/strap/UFD-.lsp @@ -15,14 +15,14 @@ (LETT |s| (SPADCALL |x| (|getShellEntry| $ 8)) |UFD-;squareFreePart;2S;1|) (|getShellEntry| $ 10)) - (LET ((#0=#:G1405 NIL) (#1=#:G1406 T) - (#2=#:G1419 (SPADCALL |s| (|getShellEntry| $ 14)))) + (LET ((#0=#:G1380 NIL) (#1=#:G1381 T) + (#2=#:G1394 (SPADCALL |s| (|getShellEntry| $ 14)))) (LOOP (COND ((ATOM #2#) (RETURN (COND (#1# (|spadConstant| $ 16)) (T #0#)))) (T (LET ((|f| (CAR #2#))) - (LET ((#3=#:G1404 (CAR |f|))) + (LET ((#3=#:G1379 (CAR |f|))) (COND (#1# (SETQ #0# #3#)) (T (SETQ #0# diff --git a/src/algebra/strap/UFD.lsp b/src/algebra/strap/UFD.lsp index 57a137f0..4dee186a 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=#:G1397 + (LET ((#0=#:G1372 (|Join| (|GcdDomain|) (|mkCategory| '|domain| '(((|prime?| ((|Boolean|) $)) T) diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp index e9d5c793..12a47db1 100644 --- a/src/algebra/strap/URAGG-.lsp +++ b/src/algebra/strap/URAGG-.lsp @@ -378,7 +378,7 @@ ((< |m| |n|) (|error| "index out of range")) (T (SPADCALL (SPADCALL |x| - (LET ((#0=#:G1502 (- |m| |n|))) + (LET ((#0=#:G1477 (- |m| |n|))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 62)) @@ -483,7 +483,7 @@ ((< |n| 1) (|error| "index out of range")) (T (SEQ (SETQ |p| (SPADCALL |p| - (LET ((#0=#:G1528 (- |n| 1))) + (LET ((#0=#:G1503 (- |n| 1))) (|check-subtype| (NOT (MINUSP #0#)) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 62))) diff --git a/src/algebra/strap/URAGG.lsp b/src/algebra/strap/URAGG.lsp index 60a22e5a..f43f88c7 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=#:G1425 + (LET ((#0=#:G1400 (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|))) (COND (|UnaryRecursiveAggregate;CAT|) @@ -78,8 +78,8 @@ (LIST '|UnaryRecursiveAggregate| (|devaluate| |t#1|))) #0#)) -(DEFUN |UnaryRecursiveAggregate| (#0=#:G1426) - (LET ((#1=#:G1427 +(DEFUN |UnaryRecursiveAggregate| (#0=#:G1401) + (LET ((#1=#:G1402 (|assoc| (|devaluate| #0#) |UnaryRecursiveAggregate;AL|))) (COND (#1# (CDR #1#)) diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp index b4bf5d7d..e5e49ad7 100644 --- a/src/algebra/strap/VECTOR.lsp +++ b/src/algebra/strap/VECTOR.lsp @@ -26,9 +26,9 @@ (|getShellEntry| $ 17))) (|getShellEntry| $ 19))) -(DEFUN |Vector| (#0=#:G1408) +(DEFUN |Vector| (#0=#:G1383) (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#1=#:G1409) + (PROG (#1=#:G1384) (RETURN (COND ((SETQ #1# |