aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/strap
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2010-06-13 19:01:38 +0000
committerdos-reis <gdr@axiomatics.org>2010-06-13 19:01:38 +0000
commit10112561c30ba05194b4d3b8cae34b610487e740 (patch)
tree529be672e50d4af6f4840725023d48bf2488c73d /src/algebra/strap
parent90a4fe6666a5db6d12e71e924c1486522a2ccdd1 (diff)
downloadopen-axiom-10112561c30ba05194b4d3b8cae34b610487e740.tar.gz
* algebra/laurent.spad.pamphlet
(UnivariateLaurentSeriesConstructor) [termsToOutputForm]: Tidy. * algebra/mts.spad.pamphlet (SparseMultivariateTaylorSeries) [coerce]: Likewise. * algebra/padic.spad.pamphlet (PAdicIntegerCategory) [coerce]: Likewise. * algebra/pscat.spad.pamphlet (UnivariateTaylorSeriesCategory)[coerce]: Likewise. * algebra/puiseux.spad.pamphlet (UnivariatePuiseuxSeries) [termsToOutputForm]: Likewise.
Diffstat (limited to 'src/algebra/strap')
-rw-r--r--src/algebra/strap/GCDDOM-.lsp86
-rw-r--r--src/algebra/strap/INT.lsp21
-rw-r--r--src/algebra/strap/ISTRING.lsp388
-rw-r--r--src/algebra/strap/LSAGG-.lsp131
-rw-r--r--src/algebra/strap/POLYCAT-.lsp86
-rw-r--r--src/algebra/strap/URAGG-.lsp216
6 files changed, 470 insertions, 458 deletions
diff --git a/src/algebra/strap/GCDDOM-.lsp b/src/algebra/strap/GCDDOM-.lsp
index f1d298cf..1248c146 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=#:G1418)
+ (PROG (|e2| |e1| |c1| |p| |c2|)
(RETURN
(SEQ (COND
((SPADCALL |p1| (|getShellEntry| $ 24))
@@ -56,26 +56,23 @@
(LETT |c2| (SPADCALL |p2| (|getShellEntry| $ 26))
|GCDDOM-;gcdPolynomial;3Sup;4|)
(LETT |p1|
- (PROG2 (LETT #0#
- (SPADCALL |p1| |c1|
- (|getShellEntry| $ 27))
- |GCDDOM-;gcdPolynomial;3Sup;4|)
- (CDR #0#)
+ (LET ((#0=#:G1418
+ (SPADCALL |p1| |c1|
+ (|getShellEntry| $ 27))))
(|check-union| (EQL (CAR #0#) 0)
(|SparseUnivariatePolynomial|
(|getShellEntry| $ 6))
- #0#))
+ #0#)
+ (CDR #0#))
|GCDDOM-;gcdPolynomial;3Sup;4|)
(LETT |p2|
- (PROG2 (LETT #0#
- (SPADCALL |p2| |c2|
- (|getShellEntry| $ 27))
- |GCDDOM-;gcdPolynomial;3Sup;4|)
- (CDR #0#)
+ (LET ((#0# (SPADCALL |p2| |c2|
+ (|getShellEntry| $ 27))))
(|check-union| (EQL (CAR #0#) 0)
(|SparseUnivariatePolynomial|
(|getShellEntry| $ 6))
- #0#))
+ #0#)
+ (CDR #0#))
|GCDDOM-;gcdPolynomial;3Sup;4|)
(SEQ (LETT |e1|
(SPADCALL |p1| (|getShellEntry| $ 29))
@@ -83,20 +80,19 @@
(EXIT (COND
((> |e1| 0)
(LETT |p1|
- (PROG2
- (LETT #0#
- (SPADCALL |p1|
- (SPADCALL
- (|spadConstant| $ 16) |e1|
- (|getShellEntry| $ 34))
- (|getShellEntry| $ 35))
- |GCDDOM-;gcdPolynomial;3Sup;4|)
- (CDR #0#)
+ (LET
+ ((#0#
+ (SPADCALL |p1|
+ (SPADCALL
+ (|spadConstant| $ 16) |e1|
+ (|getShellEntry| $ 34))
+ (|getShellEntry| $ 35))))
(|check-union|
(EQL (CAR #0#) 0)
(|SparseUnivariatePolynomial|
(|getShellEntry| $ 6))
- #0#))
+ #0#)
+ (CDR #0#))
|GCDDOM-;gcdPolynomial;3Sup;4|)))))
(SEQ (LETT |e2|
(SPADCALL |p2| (|getShellEntry| $ 29))
@@ -104,20 +100,19 @@
(EXIT (COND
((> |e2| 0)
(LETT |p2|
- (PROG2
- (LETT #0#
- (SPADCALL |p2|
- (SPADCALL
- (|spadConstant| $ 16) |e2|
- (|getShellEntry| $ 34))
- (|getShellEntry| $ 35))
- |GCDDOM-;gcdPolynomial;3Sup;4|)
- (CDR #0#)
+ (LET
+ ((#0#
+ (SPADCALL |p2|
+ (SPADCALL
+ (|spadConstant| $ 16) |e2|
+ (|getShellEntry| $ 34))
+ (|getShellEntry| $ 35))))
(|check-union|
(EQL (CAR #0#) 0)
(|SparseUnivariatePolynomial|
(|getShellEntry| $ 6))
- #0#))
+ #0#)
+ (CDR #0#))
|GCDDOM-;gcdPolynomial;3Sup;4|)))))
(LETT |e1| (MIN |e1| |e2|)
|GCDDOM-;gcdPolynomial;3Sup;4|)
@@ -159,25 +154,24 @@
(SPADCALL
(SPADCALL |c1|
(SPADCALL
- (PROG2
- (LETT #0#
- (SPADCALL
- (SPADCALL |c2| |p|
+ (LET
+ ((#0#
+ (SPADCALL
+ (SPADCALL |c2| |p|
+ (|getShellEntry| $
+ 41))
+ (SPADCALL |p|
+ (|getShellEntry| $
+ 40))
(|getShellEntry| $
- 41))
- (SPADCALL |p|
- (|getShellEntry| $
- 40))
- (|getShellEntry| $
- 27))
- |GCDDOM-;gcdPolynomial;3Sup;4|)
- (CDR #0#)
+ 27))))
(|check-union|
(EQL (CAR #0#) 0)
(|SparseUnivariatePolynomial|
(|getShellEntry| $
6))
- #0#))
+ #0#)
+ (CDR #0#))
(|getShellEntry| $ 42))
(|getShellEntry| $ 41))
(|getShellEntry| $ 25))))))))))
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index 38e24e3d..80d2f9e7 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -474,7 +474,7 @@
(SPADCALL |p| (|getShellEntry| $ 106)))
(DEFUN |INT;factorPolynomial| (|p| $)
- (PROG (|pp| #0=#:G1499)
+ (PROG (|pp|)
(RETURN
(SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 107))
|INT;factorPolynomial|)
@@ -486,17 +486,16 @@
(SPADCALL (SPADCALL |pp| (|getShellEntry| $ 110))
(SPADCALL (CONS #'|INT;factorPolynomial!0| $)
(SPADCALL
- (PROG2 (LETT #0#
- (SPADCALL
- (SPADCALL |p|
- (|getShellEntry| $ 108))
- (SPADCALL |pp|
- (|getShellEntry| $ 108))
- (|getShellEntry| $ 112))
- |INT;factorPolynomial|)
- (CDR #0#)
+ (LET ((#0=#:G1499
+ (SPADCALL
+ (SPADCALL |p|
+ (|getShellEntry| $ 108))
+ (SPADCALL |pp|
+ (|getShellEntry| $ 108))
+ (|getShellEntry| $ 112))))
(|check-union| (EQL (CAR #0#) 0) $
- #0#))
+ #0#)
+ (CDR #0#))
(|getShellEntry| $ 114))
(|getShellEntry| $ 118))
(|getShellEntry| $ 120)))))))))
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index 23b54d95..a5dce2d9 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=#:G1532 #1=#:G1533 |i| #2=#:G1534 |k|)
+ (PROG (|l| |m| |n| |h| |r| #0=#:G1535 #1=#:G1536 |i| #2=#:G1537 |k|)
(RETURN
(SEQ (LETT |l|
(- (SPADCALL |sg| (|getShellEntry| $ 44))
@@ -200,33 +200,34 @@
(EXIT (|error| "index out of range"))))
(LETT |r|
(MAKE-FULL-CVEC
- (LET ((#3=#:G1441
+ (LET ((#3=#:G1444
(+ (- |m| (+ (- |h| |l|) 1)) |n|)))
(|check-subtype| (>= #3# 0)
'(|NonNegativeInteger|) #3#))
(|spadConstant| $ 53))
|ISTRING;replace;$Us2$;15|)
+ (LETT |k| 0 |ISTRING;replace;$Us2$;15|)
(SEQ (LETT |i| 0 |ISTRING;replace;$Us2$;15|)
- (LETT #0# (- |l| 1) |ISTRING;replace;$Us2$;15|)
- (LETT |k| 0 |ISTRING;replace;$Us2$;15|) G190
+ (LETT #0# (- |l| 1) |ISTRING;replace;$Us2$;15|) G190
(COND ((QSGREATERP |i| #0#) (GO G191)))
- (SEQ (EXIT (QESET |r| |k| (CHAR |s| |i|))))
- (SETQ |k| (PROG1 (QSADD1 |k|) (SETQ |i| (QSADD1 |i|))))
- (GO G190) G191 (EXIT NIL))
+ (SEQ (QESET |r| |k| (CHAR |s| |i|))
+ (EXIT (LETT |k| (+ |k| 1)
+ |ISTRING;replace;$Us2$;15|)))
+ (SETQ |i| (QSADD1 |i|)) (GO G190) G191 (EXIT NIL))
(SEQ (LETT |i| 0 |ISTRING;replace;$Us2$;15|)
- (LETT #1# (- |n| 1) |ISTRING;replace;$Us2$;15|)
- (LETT |k| |k| |ISTRING;replace;$Us2$;15|) G190
+ (LETT #1# (- |n| 1) |ISTRING;replace;$Us2$;15|) G190
(COND ((QSGREATERP |i| #1#) (GO G191)))
- (SEQ (EXIT (QESET |r| |k| (CHAR |t| |i|))))
- (SETQ |k| (PROG1 (+ |k| 1) (SETQ |i| (QSADD1 |i|))))
- (GO G190) G191 (EXIT NIL))
+ (SEQ (QESET |r| |k| (CHAR |t| |i|))
+ (EXIT (LETT |k| (+ |k| 1)
+ |ISTRING;replace;$Us2$;15|)))
+ (SETQ |i| (QSADD1 |i|)) (GO G190) G191 (EXIT NIL))
(SEQ (LETT |i| (+ |h| 1) |ISTRING;replace;$Us2$;15|)
- (LETT #2# (- |m| 1) |ISTRING;replace;$Us2$;15|)
- (LETT |k| |k| |ISTRING;replace;$Us2$;15|) G190
+ (LETT #2# (- |m| 1) |ISTRING;replace;$Us2$;15|) G190
(COND ((> |i| #2#) (GO G191)))
- (SEQ (EXIT (QESET |r| |k| (CHAR |s| |i|))))
- (SETQ |k| (PROG1 (+ |k| 1) (SETQ |i| (+ |i| 1))))
- (GO G190) G191 (EXIT NIL))
+ (SEQ (QESET |r| |k| (CHAR |s| |i|))
+ (EXIT (LETT |k| (+ |k| 1)
+ |ISTRING;replace;$Us2$;15|)))
+ (SETQ |i| (+ |i| 1)) (GO G190) G191 (EXIT NIL))
(EXIT |r|)))))
(DEFUN |ISTRING;setelt;$I2C;16| (|s| |i| |c| $)
@@ -239,7 +240,7 @@
(EXIT |c|))))))
(DEFUN |ISTRING;substring?;2$IB;17| (|part| |whole| |startpos| $)
- (PROG (|np| |nw| |iw| |ip| #0=#:G1535)
+ (PROG (|np| |nw| |iw| |ip| #0=#:G1538)
(RETURN
(SEQ (LETT |np| (QCSIZE |part|) |ISTRING;substring?;2$IB;17|)
(LETT |nw| (QCSIZE |whole|) |ISTRING;substring?;2$IB;17|)
@@ -289,7 +290,7 @@
('T (+ |r| (|getShellEntry| $ 6)))))))))))))
(DEFUN |ISTRING;position;C$2I;19| (|c| |t| |startpos| $)
- (PROG (|r| #0=#:G1536)
+ (PROG (|r| #0=#:G1539)
(RETURN
(SEQ (LETT |startpos| (- |startpos| (|getShellEntry| $ 6))
|ISTRING;position;C$2I;19|)
@@ -314,7 +315,7 @@
(EXIT (- (|getShellEntry| $ 6) 1))))))))))
(DEFUN |ISTRING;position;Cc$2I;20| (|cc| |t| |startpos| $)
- (PROG (|r| #0=#:G1537)
+ (PROG (|r| #0=#:G1540)
(RETURN
(SEQ (LETT |startpos| (- |startpos| (|getShellEntry| $ 6))
|ISTRING;position;Cc$2I;20|)
@@ -331,7 +332,7 @@
(SEQ (EXIT
(COND
((SPADCALL (CHAR |t| |r|) |cc|
- (|getShellEntry| $ 64))
+ (|getShellEntry| $ 65))
(RETURN-FROM
|ISTRING;position;Cc$2I;20|
(+ |r| (|getShellEntry| $ 6)))))))
@@ -357,15 +358,17 @@
(RETURN
(SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 47))
|ISTRING;split;$CL;22|)
- (SEQ (LETT |i| (|getShellEntry| $ 6) |ISTRING;split;$CL;22|)
- G190
+ (LETT |i| (|getShellEntry| $ 6) |ISTRING;split;$CL;22|)
+ (SEQ G190
(COND
- ((OR (> |i| |n|)
- (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |c| (|getShellEntry| $ 68))))
+ ((NULL (COND
+ ((> |i| |n|) NIL)
+ ('T
+ (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
+ |c| (|getShellEntry| $ 69)))))
(GO G191)))
- (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1)) (GO G190) G191
- (EXIT NIL))
+ (SEQ (EXIT (LETT |i| (+ |i| 1) |ISTRING;split;$CL;22|)))
+ NIL (GO G190) G191 (EXIT NIL))
(LETT |l| NIL |ISTRING;split;$CL;22|)
(SEQ G190
(COND
@@ -384,19 +387,24 @@
(SPADCALL |i| (- |j| 1)
(|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 71))
+ |l| (|getShellEntry| $ 72))
|ISTRING;split;$CL;22|)
- (EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CL;22|)
- G190
+ (LETT |i| |j| |ISTRING;split;$CL;22|)
+ (EXIT (SEQ G190
(COND
- ((OR (> |i| |n|)
- (NULL
- (SPADCALL
- (|ISTRING;elt;$IC;30| |s| |i| $)
- |c| (|getShellEntry| $ 68))))
+ ((NULL
+ (COND
+ ((> |i| |n|) NIL)
+ ('T
+ (SPADCALL
+ (|ISTRING;elt;$IC;30| |s| |i|
+ $)
+ |c| (|getShellEntry| $ 69)))))
(GO G191)))
- (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1))
- (GO G190) G191 (EXIT NIL))))
+ (SEQ (EXIT
+ (LETT |i| (+ |i| 1)
+ |ISTRING;split;$CL;22|)))
+ NIL (GO G190) G191 (EXIT NIL))))
NIL (GO G190) G191 (EXIT NIL))
(COND
((NOT (> |i| |n|))
@@ -405,7 +413,7 @@
(|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| |n| (|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 71))
+ |l| (|getShellEntry| $ 72))
|ISTRING;split;$CL;22|)))
(EXIT (NREVERSE |l|))))))
@@ -414,16 +422,17 @@
(RETURN
(SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 47))
|ISTRING;split;$CcL;23|)
- (SEQ (LETT |i| (|getShellEntry| $ 6)
- |ISTRING;split;$CcL;23|)
- G190
+ (LETT |i| (|getShellEntry| $ 6) |ISTRING;split;$CcL;23|)
+ (SEQ G190
(COND
- ((OR (> |i| |n|)
- (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |cc| (|getShellEntry| $ 64))))
+ ((NULL (COND
+ ((> |i| |n|) NIL)
+ ('T
+ (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
+ |cc| (|getShellEntry| $ 65)))))
(GO G191)))
- (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1)) (GO G190) G191
- (EXIT NIL))
+ (SEQ (EXIT (LETT |i| (+ |i| 1) |ISTRING;split;$CcL;23|)))
+ NIL (GO G190) G191 (EXIT NIL))
(LETT |l| NIL |ISTRING;split;$CcL;23|)
(SEQ G190
(COND
@@ -442,19 +451,24 @@
(SPADCALL |i| (- |j| 1)
(|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 71))
+ |l| (|getShellEntry| $ 72))
|ISTRING;split;$CcL;23|)
- (EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CcL;23|)
- G190
+ (LETT |i| |j| |ISTRING;split;$CcL;23|)
+ (EXIT (SEQ G190
(COND
- ((OR (> |i| |n|)
- (NULL
- (SPADCALL
- (|ISTRING;elt;$IC;30| |s| |i| $)
- |cc| (|getShellEntry| $ 64))))
+ ((NULL
+ (COND
+ ((> |i| |n|) NIL)
+ ('T
+ (SPADCALL
+ (|ISTRING;elt;$IC;30| |s| |i|
+ $)
+ |cc| (|getShellEntry| $ 65)))))
(GO G191)))
- (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1))
- (GO G190) G191 (EXIT NIL))))
+ (SEQ (EXIT
+ (LETT |i| (+ |i| 1)
+ |ISTRING;split;$CcL;23|)))
+ NIL (GO G190) G191 (EXIT NIL))))
NIL (GO G190) G191 (EXIT NIL))
(COND
((NOT (> |i| |n|))
@@ -463,7 +477,7 @@
(|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| |n| (|getShellEntry| $ 24))
$)
- |l| (|getShellEntry| $ 71))
+ |l| (|getShellEntry| $ 72))
|ISTRING;split;$CcL;23|)))
(EXIT (NREVERSE |l|))))))
@@ -472,16 +486,18 @@
(RETURN
(SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 47))
|ISTRING;leftTrim;$C$;24|)
- (SEQ (LETT |i| (|getShellEntry| $ 6)
- |ISTRING;leftTrim;$C$;24|)
- G190
+ (LETT |i| (|getShellEntry| $ 6) |ISTRING;leftTrim;$C$;24|)
+ (SEQ G190
(COND
- ((OR (> |i| |n|)
- (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |c| (|getShellEntry| $ 68))))
+ ((NULL (COND
+ ((> |i| |n|) NIL)
+ ('T
+ (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
+ |c| (|getShellEntry| $ 69)))))
(GO G191)))
- (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1)) (GO G190) G191
- (EXIT NIL))
+ (SEQ (EXIT (LETT |i| (+ |i| 1)
+ |ISTRING;leftTrim;$C$;24|)))
+ NIL (GO G190) G191 (EXIT NIL))
(EXIT (|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| |n| (|getShellEntry| $ 24)) $))))))
@@ -490,71 +506,75 @@
(RETURN
(SEQ (LETT |n| (SPADCALL |s| (|getShellEntry| $ 47))
|ISTRING;leftTrim;$Cc$;25|)
- (SEQ (LETT |i| (|getShellEntry| $ 6)
- |ISTRING;leftTrim;$Cc$;25|)
- G190
+ (LETT |i| (|getShellEntry| $ 6) |ISTRING;leftTrim;$Cc$;25|)
+ (SEQ G190
(COND
- ((OR (> |i| |n|)
- (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |cc| (|getShellEntry| $ 64))))
+ ((NULL (COND
+ ((> |i| |n|) NIL)
+ ('T
+ (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
+ |cc| (|getShellEntry| $ 65)))))
(GO G191)))
- (SEQ (EXIT 0)) (SETQ |i| (+ |i| 1)) (GO G190) G191
- (EXIT NIL))
+ (SEQ (EXIT (LETT |i| (+ |i| 1)
+ |ISTRING;leftTrim;$Cc$;25|)))
+ NIL (GO G190) G191 (EXIT NIL))
(EXIT (|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| |n| (|getShellEntry| $ 24)) $))))))
(DEFUN |ISTRING;rightTrim;$C$;26| (|s| |c| $)
- (PROG (|j| #0=#:G1538)
+ (PROG (|j|)
(RETURN
- (SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 47))
- |ISTRING;rightTrim;$C$;26|)
- (LETT #0# (|getShellEntry| $ 6)
- |ISTRING;rightTrim;$C$;26|)
- G190
+ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 47))
+ |ISTRING;rightTrim;$C$;26|)
+ (SEQ G190
(COND
- ((OR (< |j| #0#)
- (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $)
- |c| (|getShellEntry| $ 68))))
+ ((NULL (COND
+ ((>= |j| (|getShellEntry| $ 6))
+ (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $)
+ |c| (|getShellEntry| $ 69)))
+ ('T NIL)))
(GO G191)))
- (SEQ (EXIT 0)) (SETQ |j| (+ |j| -1)) (GO G190) G191
- (EXIT NIL))
+ (SEQ (EXIT (LETT |j| (- |j| 1)
+ |ISTRING;rightTrim;$C$;26|)))
+ NIL (GO G190) G191 (EXIT NIL))
(EXIT (|ISTRING;elt;$Us$;31| |s|
(SPADCALL (|ISTRING;minIndex;$I;11| |s| $) |j|
(|getShellEntry| $ 24))
$))))))
(DEFUN |ISTRING;rightTrim;$Cc$;27| (|s| |cc| $)
- (PROG (|j| #0=#:G1539)
+ (PROG (|j|)
(RETURN
- (SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 47))
- |ISTRING;rightTrim;$Cc$;27|)
- (LETT #0# (|getShellEntry| $ 6)
- |ISTRING;rightTrim;$Cc$;27|)
- G190
+ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 47))
+ |ISTRING;rightTrim;$Cc$;27|)
+ (SEQ G190
(COND
- ((OR (< |j| #0#)
- (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $)
- |cc| (|getShellEntry| $ 64))))
+ ((NULL (COND
+ ((>= |j| (|getShellEntry| $ 6))
+ (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $)
+ |cc| (|getShellEntry| $ 65)))
+ ('T NIL)))
(GO G191)))
- (SEQ (EXIT 0)) (SETQ |j| (+ |j| -1)) (GO G190) G191
- (EXIT NIL))
+ (SEQ (EXIT (LETT |j| (- |j| 1)
+ |ISTRING;rightTrim;$Cc$;27|)))
+ NIL (GO G190) G191 (EXIT NIL))
(EXIT (|ISTRING;elt;$Us$;31| |s|
(SPADCALL (|ISTRING;minIndex;$I;11| |s| $) |j|
(|getShellEntry| $ 24))
$))))))
(DEFUN |ISTRING;concat;L$;28| (|l| $)
- (PROG (|t| |s| #0=#:G1541 |i|)
+ (PROG (|t| |s| #0=#:G1542 |i|)
(RETURN
(SEQ (LETT |t|
(MAKE-FULL-CVEC
- (LET ((#1=#:G1494 NIL) (#2=#:G1495 T)
- (#3=#:G1540 |l|))
+ (LET ((#1=#:G1497 NIL) (#2=#:G1498 T)
+ (#3=#:G1541 |l|))
(LOOP
(COND
((ATOM #3#) (RETURN (COND (#2# 0) (T #1#))))
(T (LET ((|s| (CAR #3#)))
- (LET ((#4=#:G1493 (QCSIZE |s|)))
+ (LET ((#4=#:G1496 (QCSIZE |s|)))
(COND
(#2# (SETQ #1# #4#))
(T (SETQ #1# (+ #1# #4#))))
@@ -627,7 +647,7 @@
(SEQ (LETT |n| (SPADCALL |pattern| (|getShellEntry| $ 47))
|ISTRING;match?;2$CB;34|)
(LETT |p|
- (LET ((#0=#:G1522
+ (LET ((#0=#:G1525
(|ISTRING;position;C$2I;19| |dontcare|
|pattern|
(LETT |m|
@@ -642,18 +662,18 @@
((EQL |p| (- |m| 1)) (EQUAL |pattern| |target|))
('T
(SEQ (COND
- ((SPADCALL |p| |m| (|getShellEntry| $ 88))
+ ((SPADCALL |p| |m| (|getShellEntry| $ 87))
(COND
((NOT (SPADCALL
(|ISTRING;elt;$Us$;31| |pattern|
(SPADCALL |m| (- |p| 1)
(|getShellEntry| $ 24))
$)
- |target| (|getShellEntry| $ 89)))
+ |target| (|getShellEntry| $ 88)))
(EXIT NIL)))))
(LETT |i| |p| |ISTRING;match?;2$CB;34|)
(LETT |q|
- (LET ((#1=#:G1523
+ (LET ((#1=#:G1526
(|ISTRING;position;C$2I;19|
|dontcare| |pattern| (+ |p| 1)
$)))
@@ -663,7 +683,7 @@
(SEQ G190
(COND
((NULL (SPADCALL |q| (- |m| 1)
- (|getShellEntry| $ 88)))
+ (|getShellEntry| $ 87)))
(GO G191)))
(SEQ (LETT |s|
(|ISTRING;elt;$Us$;31| |pattern|
@@ -673,7 +693,7 @@
|ISTRING;match?;2$CB;34|)
(LETT |i|
(LET
- ((#2=#:G1524
+ ((#2=#:G1527
(|ISTRING;position;2$2I;18| |s|
|target| |i| $)))
(|check-subtype| (>= #2# 0)
@@ -694,7 +714,7 @@
(EXIT
(LETT |q|
(LET
- ((#3=#:G1525
+ ((#3=#:G1528
(|ISTRING;position;C$2I;19|
|dontcare| |pattern|
(+ |q| 1) $)))
@@ -704,7 +724,7 @@
|ISTRING;match?;2$CB;34|)))))))
NIL (GO G190) G191 (EXIT NIL))
(COND
- ((SPADCALL |p| |n| (|getShellEntry| $ 88))
+ ((SPADCALL |p| |n| (|getShellEntry| $ 87))
(COND
((NOT (|ISTRING;suffix?;2$B;21|
(|ISTRING;elt;$Us$;31| |pattern|
@@ -715,8 +735,8 @@
(EXIT NIL)))))
(EXIT T)))))))))
-(DEFUN |IndexedString| (#0=#:G1542)
- (PROG (#1=#:G1543)
+(DEFUN |IndexedString| (#0=#:G1543)
+ (PROG (#1=#:G1544)
(RETURN
(COND
((SETQ #1#
@@ -732,7 +752,7 @@
(DEFUN |IndexedString;| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|))
- (|dv$| (LIST '|IndexedString| |dv$1|)) ($ (|newShell| 101))
+ (|dv$| (LIST '|IndexedString| |dv$1|)) ($ (|newShell| 100))
(|pv$| (|buildPredVector| 0 0
(LIST (OR (AND (|HasCategory| (|Character|)
'(|OrderedSet|))
@@ -791,43 +811,42 @@
|ISTRING;latex;$S;14| (66 . |lo|) (71 . |hasHi|)
(76 . |hi|) (81 . |maxIndex|) (86 . |Zero|) (90 . <)
(96 . >=) (102 . |One|) (106 . +) (112 . |space|)
- (|PositiveInteger|) (116 . |One|)
- |ISTRING;replace;$Us2$;15| (120 . >)
- |ISTRING;setelt;$I2C;16| (126 . |false|) (130 . |true|)
+ (|PositiveInteger|) (116 . |One|) (120 . +)
+ |ISTRING;replace;$Us2$;15| (126 . >)
+ |ISTRING;setelt;$I2C;16| (132 . |false|) (136 . |true|)
|ISTRING;substring?;2$IB;17| |ISTRING;position;2$2I;18|
- |ISTRING;position;C$2I;19| (134 . |member?|)
+ |ISTRING;position;C$2I;19| (140 . |member?|)
|ISTRING;position;Cc$2I;20| |ISTRING;suffix?;2$B;21|
- |ISTRING;elt;$IC;30| (140 . =) (|List| $$) (146 . |empty|)
- (150 . |concat|) (156 . |reverse!|) (|List| $)
+ |ISTRING;elt;$IC;30| (146 . =) (|List| $$) (152 . |empty|)
+ (156 . |concat|) (162 . |reverse!|) (|List| $)
|ISTRING;split;$CL;22| |ISTRING;split;$CcL;23|
|ISTRING;leftTrim;$C$;24| |ISTRING;leftTrim;$Cc$;25|
- (161 . -) |ISTRING;rightTrim;$C$;26|
- |ISTRING;rightTrim;$Cc$;27| (166 . +)
+ |ISTRING;rightTrim;$C$;26| |ISTRING;rightTrim;$Cc$;27|
|ISTRING;copyInto!;2$I$;29| |ISTRING;concat;L$;28|
- (172 . |max|) (|SingleInteger|) |ISTRING;hash;$Si;32|
- |ISTRING;match;2$CNni;33| (178 . ~=) (184 . |prefix?|)
+ (167 . |max|) (|SingleInteger|) |ISTRING;hash;$Si;32|
+ |ISTRING;match;2$CNni;33| (173 . ~=) (179 . |prefix?|)
|ISTRING;match?;2$CB;34| (|List| 8) (|Equation| 8)
- (|List| 92) (|Mapping| 8 8 8) (|InputForm|)
+ (|List| 91) (|Mapping| 8 8 8) (|InputForm|)
(|Mapping| 13 8) (|Mapping| 13 8 8) (|Void|)
(|Union| 8 '"failed") (|List| 11))
- '#(~= 190 |upperCase!| 196 |upperCase| 201 |trim| 206 |swap!|
- 218 |suffix?| 225 |substring?| 231 |split| 238 |sorted?|
- 250 |sort!| 261 |sort| 272 |size?| 283 |setelt| 289
- |select| 303 |sample| 309 |rightTrim| 313 |reverse!| 325
- |reverse| 330 |replace| 335 |removeDuplicates| 342
- |remove| 347 |reduce| 359 |qsetelt!| 380 |qelt| 387
- |prefix?| 393 |position| 399 |parts| 432 |new| 437 |more?|
- 443 |minIndex| 449 |min| 454 |merge| 460 |members| 473
- |member?| 478 |maxIndex| 484 |max| 489 |match?| 495
- |match| 502 |map!| 509 |map| 515 |lowerCase!| 528
- |lowerCase| 533 |less?| 538 |leftTrim| 544 |latex| 556
- |insert| 561 |indices| 575 |index?| 580 |hash| 586 |first|
- 591 |find| 596 |fill!| 602 |every?| 608 |eval| 614 |eq?|
- 640 |entry?| 646 |entries| 652 |empty?| 657 |empty| 662
- |elt| 666 |delete| 691 |count| 703 |copyInto!| 715 |copy|
- 722 |convert| 727 |construct| 732 |concat| 737 |coerce|
- 760 |before?| 770 |any?| 776 >= 782 > 788 = 794 <= 800 <
- 806 |#| 812)
+ '#(~= 185 |upperCase!| 191 |upperCase| 196 |trim| 201 |swap!|
+ 213 |suffix?| 220 |substring?| 226 |split| 233 |sorted?|
+ 245 |sort!| 256 |sort| 267 |size?| 278 |setelt| 284
+ |select| 298 |sample| 304 |rightTrim| 308 |reverse!| 320
+ |reverse| 325 |replace| 330 |removeDuplicates| 337
+ |remove| 342 |reduce| 354 |qsetelt!| 375 |qelt| 382
+ |prefix?| 388 |position| 394 |parts| 427 |new| 432 |more?|
+ 438 |minIndex| 444 |min| 449 |merge| 455 |members| 468
+ |member?| 473 |maxIndex| 479 |max| 484 |match?| 490
+ |match| 497 |map!| 504 |map| 510 |lowerCase!| 523
+ |lowerCase| 528 |less?| 533 |leftTrim| 539 |latex| 551
+ |insert| 556 |indices| 570 |index?| 575 |hash| 581 |first|
+ 586 |find| 591 |fill!| 597 |every?| 603 |eval| 609 |eq?|
+ 635 |entry?| 641 |entries| 647 |empty?| 652 |empty| 657
+ |elt| 661 |delete| 686 |count| 698 |copyInto!| 710 |copy|
+ 717 |convert| 722 |construct| 727 |concat| 732 |coerce|
+ 755 |before?| 765 |any?| 771 >= 777 > 783 = 789 <= 795 <
+ 801 |#| 807)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 5
'(0 0 0 0 0 0 0 0 5 0 0 0 1 4 0 1 2 3 4))
@@ -851,8 +870,8 @@
(|Eltable| 11 8) (|Evalable| 8)
(|SetCategory|) (|Type|)
(|InnerEvalable| 8 8) (|CoercibleTo| 29)
- (|ConvertibleTo| 95) (|BasicType|))
- (|makeByteWordVec2| 100
+ (|ConvertibleTo| 94) (|BasicType|))
+ (|makeByteWordVec2| 99
'(0 11 0 12 2 11 13 0 0 14 0 11 0 21 2
11 0 0 0 22 2 23 0 11 11 24 1 23 0 11
26 1 29 0 28 30 0 33 0 34 1 8 0 0 35
@@ -860,47 +879,46 @@
28 0 0 0 42 1 23 11 0 44 1 23 13 0 45
1 23 11 0 46 1 0 11 0 47 0 7 0 48 2
11 13 0 0 49 2 11 13 0 0 50 0 7 0 51
- 2 11 0 0 0 52 0 8 0 53 0 54 0 55 2 11
- 13 0 0 57 0 13 0 59 0 13 0 60 2 33 13
- 8 0 64 2 8 13 0 0 68 0 69 0 70 2 69 0
- 2 0 71 1 69 0 0 72 1 11 0 0 78 2 7 0
- 0 0 81 2 11 0 0 0 84 2 11 13 0 0 88 2
- 0 13 0 0 89 2 7 13 0 0 1 1 0 0 0 38 1
- 0 0 0 1 2 0 0 0 8 1 2 0 0 0 33 1 3 0
- 98 0 11 11 1 2 0 13 0 0 66 3 0 13 0 0
- 11 61 2 0 73 0 33 75 2 0 73 0 8 74 1
- 5 13 0 1 2 0 13 97 0 1 1 5 0 0 1 2 0
- 0 97 0 1 1 5 0 0 1 2 0 0 97 0 1 2 0
- 13 0 7 1 3 0 8 0 23 8 1 3 0 8 0 11 8
- 58 2 0 0 96 0 1 0 0 0 1 2 0 0 0 8 79
- 2 0 0 0 33 80 1 0 0 0 1 1 0 0 0 1 3 0
- 0 0 23 0 56 1 7 0 0 1 2 7 0 8 0 1 2 0
- 0 96 0 1 4 7 8 94 0 8 8 1 3 0 8 94 0
- 8 1 2 0 8 94 0 1 3 0 8 0 11 8 1 2 0 8
- 0 11 1 2 0 13 0 0 89 3 7 11 8 0 11 63
- 2 7 11 8 0 1 3 0 11 33 0 11 65 3 0 11
- 0 0 11 62 2 0 11 96 0 1 1 0 91 0 1 2
- 0 0 7 8 9 2 0 13 0 7 1 1 6 11 0 32 2
- 5 0 0 0 1 2 5 0 0 0 1 3 0 0 97 0 0 1
- 1 0 91 0 1 2 7 13 8 0 1 1 6 11 0 47 2
- 5 0 0 0 1 3 0 13 0 0 8 90 3 0 7 0 0 8
- 87 2 0 0 36 0 37 3 0 0 94 0 0 1 2 0 0
- 36 0 1 1 0 0 0 41 1 0 0 0 1 2 0 13 0
- 7 1 2 0 0 0 8 76 2 0 0 0 33 77 1 7 28
- 0 43 3 0 0 8 0 11 1 3 0 0 0 0 11 27 1
- 0 100 0 1 2 0 13 11 0 1 1 7 85 0 86 1
- 6 8 0 1 2 0 99 96 0 1 2 0 0 0 8 1 2 0
- 13 96 0 1 3 9 0 0 91 91 1 3 9 0 0 8 8
- 1 2 9 0 0 93 1 2 9 0 0 92 1 2 0 13 0
- 0 1 2 7 13 8 0 1 1 0 91 0 1 1 0 13 0
- 15 0 0 0 10 2 0 0 0 0 1 2 0 0 0 23 25
- 2 0 8 0 11 67 3 0 8 0 11 8 1 2 0 0 0
- 11 1 2 0 0 0 23 1 2 7 7 8 0 1 2 0 7
- 96 0 1 3 0 0 0 0 11 82 1 0 0 0 20 1 3
- 95 0 1 1 0 0 91 1 2 0 0 0 0 19 1 0 0
- 73 83 2 0 0 8 0 1 2 0 0 0 8 1 1 8 29
- 0 31 1 0 0 8 1 2 7 13 0 0 1 2 0 13 96
- 0 1 2 5 13 0 0 1 2 5 13 0 0 1 2 7 13
- 0 0 17 2 5 13 0 0 1 2 5 13 0 0 18 1 0
- 7 0 16)))))
+ 2 11 0 0 0 52 0 8 0 53 0 54 0 55 2 7
+ 0 0 0 56 2 11 13 0 0 58 0 13 0 60 0
+ 13 0 61 2 33 13 8 0 65 2 8 13 0 0 69
+ 0 70 0 71 2 70 0 2 0 72 1 70 0 0 73 2
+ 11 0 0 0 83 2 11 13 0 0 87 2 0 13 0 0
+ 88 2 7 13 0 0 1 1 0 0 0 38 1 0 0 0 1
+ 2 0 0 0 8 1 2 0 0 0 33 1 3 0 97 0 11
+ 11 1 2 0 13 0 0 67 3 0 13 0 0 11 62 2
+ 0 74 0 33 76 2 0 74 0 8 75 1 5 13 0 1
+ 2 0 13 96 0 1 1 5 0 0 1 2 0 0 96 0 1
+ 1 5 0 0 1 2 0 0 96 0 1 2 0 13 0 7 1 3
+ 0 8 0 23 8 1 3 0 8 0 11 8 59 2 0 0 95
+ 0 1 0 0 0 1 2 0 0 0 8 79 2 0 0 0 33
+ 80 1 0 0 0 1 1 0 0 0 1 3 0 0 0 23 0
+ 57 1 7 0 0 1 2 7 0 8 0 1 2 0 0 95 0 1
+ 4 7 8 93 0 8 8 1 3 0 8 93 0 8 1 2 0 8
+ 93 0 1 3 0 8 0 11 8 1 2 0 8 0 11 1 2
+ 0 13 0 0 88 3 7 11 8 0 11 64 2 7 11 8
+ 0 1 3 0 11 33 0 11 66 3 0 11 0 0 11
+ 63 2 0 11 95 0 1 1 0 90 0 1 2 0 0 7 8
+ 9 2 0 13 0 7 1 1 6 11 0 32 2 5 0 0 0
+ 1 2 5 0 0 0 1 3 0 0 96 0 0 1 1 0 90 0
+ 1 2 7 13 8 0 1 1 6 11 0 47 2 5 0 0 0
+ 1 3 0 13 0 0 8 89 3 0 7 0 0 8 86 2 0
+ 0 36 0 37 3 0 0 93 0 0 1 2 0 0 36 0 1
+ 1 0 0 0 41 1 0 0 0 1 2 0 13 0 7 1 2 0
+ 0 0 8 77 2 0 0 0 33 78 1 7 28 0 43 3
+ 0 0 8 0 11 1 3 0 0 0 0 11 27 1 0 99 0
+ 1 2 0 13 11 0 1 1 7 84 0 85 1 6 8 0 1
+ 2 0 98 95 0 1 2 0 0 0 8 1 2 0 13 95 0
+ 1 3 9 0 0 90 90 1 3 9 0 0 8 8 1 2 9 0
+ 0 92 1 2 9 0 0 91 1 2 0 13 0 0 1 2 7
+ 13 8 0 1 1 0 90 0 1 1 0 13 0 15 0 0 0
+ 10 2 0 0 0 0 1 2 0 0 0 23 25 2 0 8 0
+ 11 68 3 0 8 0 11 8 1 2 0 0 0 11 1 2 0
+ 0 0 23 1 2 7 7 8 0 1 2 0 7 95 0 1 3 0
+ 0 0 0 11 81 1 0 0 0 20 1 3 94 0 1 1 0
+ 0 90 1 2 0 0 0 0 19 1 0 0 74 82 2 0 0
+ 8 0 1 2 0 0 0 8 1 1 8 29 0 31 1 0 0 8
+ 1 2 7 13 0 0 1 2 0 13 95 0 1 2 5 13 0
+ 0 1 2 5 13 0 0 1 2 7 13 0 0 17 2 5 13
+ 0 0 1 2 5 13 0 0 18 1 0 7 0 16)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp
index d55706bc..c563a160 100644
--- a/src/algebra/strap/LSAGG-.lsp
+++ b/src/algebra/strap/LSAGG-.lsp
@@ -426,9 +426,9 @@
(DEFUN |LSAGG-;position;MAI;13| (|f| |x| $)
(PROG (|k|)
(RETURN
- (SEQ (SEQ (LETT |k| (SPADCALL |x| (|getShellEntry| $ 33))
- |LSAGG-;position;MAI;13|)
- G190
+ (SEQ (LETT |k| (SPADCALL |x| (|getShellEntry| $ 33))
+ |LSAGG-;position;MAI;13|)
+ (SEQ G190
(COND
((NULL (COND
((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
@@ -438,10 +438,11 @@
(|getShellEntry| $ 18))
|f|)))))
(GO G191)))
- (SEQ (EXIT (LETT |x|
- (SPADCALL |x| (|getShellEntry| $ 17))
+ (SEQ (LETT |x| (SPADCALL |x| (|getShellEntry| $ 17))
+ |LSAGG-;position;MAI;13|)
+ (EXIT (LETT |k| (+ |k| 1)
|LSAGG-;position;MAI;13|)))
- (SETQ |k| (+ |k| 1)) (GO G190) G191 (EXIT NIL))
+ NIL (GO G190) G191 (EXIT NIL))
(EXIT (COND
((SPADCALL |x| (|getShellEntry| $ 16))
(- (SPADCALL |x| (|getShellEntry| $ 33)) 1))
@@ -457,19 +458,19 @@
(SPADCALL (SPADCALL |p| (|getShellEntry| $ 17))
(|getShellEntry| $ 18))
(SPADCALL |p| (|getShellEntry| $ 18)) |f|)
- (LETT |p| (SPADCALL |p| (|getShellEntry| $ 57))
+ (LETT |p| (SPADCALL |p| (|getShellEntry| $ 55))
|LSAGG-;mergeSort|)))))
(EXIT (COND
((< |n| 3) |p|)
('T
(SEQ (LETT |l|
- (LET ((#0=#:G1510 (QUOTIENT2 |n| 2)))
+ (LET ((#0=#:G1511 (QUOTIENT2 |n| 2)))
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
|LSAGG-;mergeSort|)
(LETT |q|
(SPADCALL |p| |l|
- (|getShellEntry| $ 59))
+ (|getShellEntry| $ 57))
|LSAGG-;mergeSort|)
(LETT |p| (|LSAGG-;mergeSort| |f| |p| |l| $)
|LSAGG-;mergeSort|)
@@ -539,7 +540,7 @@
((NULL (COND
((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
('T
- (SPADCALL |r| |a| (|getShellEntry| $ 63)))))
+ (SPADCALL |r| |a| (|getShellEntry| $ 61)))))
(GO G191)))
(SEQ (LETT |r|
(SPADCALL |r|
@@ -594,7 +595,7 @@
(SPADCALL |y| (|getShellEntry| $ 17))
|LSAGG-;map;M3A;19|)))
NIL (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |z| (|getShellEntry| $ 57)))))))
+ (EXIT (SPADCALL |z| (|getShellEntry| $ 55)))))))
(DEFUN |LSAGG-;reverse!;2A;20| (|x| $)
(PROG (|z| |y|)
@@ -637,7 +638,7 @@
(SEQ (COND
((EQL |k| 1000)
(COND
- ((SPADCALL |x| (|getShellEntry| $ 69))
+ ((SPADCALL |x| (|getShellEntry| $ 67))
(EXIT (|error| "cyclic list"))))))
(LETT |y|
(SPADCALL
@@ -648,7 +649,7 @@
(SPADCALL |x| (|getShellEntry| $ 17))
|LSAGG-;copy;2A;21|)))
(SETQ |k| (QSADD1 |k|)) (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |y| (|getShellEntry| $ 57)))))))
+ (EXIT (SPADCALL |y| (|getShellEntry| $ 55)))))))
(DEFUN |LSAGG-;copyInto!;2AIA;22| (|y| |x| |s| $)
(PROG (|m| |z|)
@@ -660,7 +661,7 @@
('T
(SEQ (LETT |z|
(SPADCALL |y|
- (LET ((#0=#:G1551 (- |s| |m|)))
+ (LET ((#0=#:G1552 (- |s| |m|)))
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 39))
@@ -679,7 +680,7 @@
(SEQ (SPADCALL |z|
(SPADCALL |x|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 71))
+ (|getShellEntry| $ 69))
(LETT |x|
(SPADCALL |x|
(|getShellEntry| $ 17))
@@ -702,13 +703,13 @@
('T
(SEQ (LETT |x|
(SPADCALL |x|
- (LET ((#0=#:G1557 (- |s| |m|)))
+ (LET ((#0=#:G1559 (- |s| |m|)))
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
(|getShellEntry| $ 39))
|LSAGG-;position;SA2I;23|)
- (SEQ (LETT |k| |s| |LSAGG-;position;SA2I;23|)
- G190
+ (LETT |k| |s| |LSAGG-;position;SA2I;23|)
+ (SEQ G190
(COND
((NULL (COND
((SPADCALL |x|
@@ -718,15 +719,16 @@
(SPADCALL |w|
(SPADCALL |x|
(|getShellEntry| $ 18))
- (|getShellEntry| $ 63)))))
+ (|getShellEntry| $ 61)))))
(GO G191)))
- (SEQ (EXIT
- (LETT |x|
- (SPADCALL |x|
- (|getShellEntry| $ 17))
+ (SEQ (LETT |x|
+ (SPADCALL |x|
+ (|getShellEntry| $ 17))
+ |LSAGG-;position;SA2I;23|)
+ (EXIT
+ (LETT |k| (+ |k| 1)
|LSAGG-;position;SA2I;23|)))
- (SETQ |k| (+ |k| 1)) (GO G190) G191
- (EXIT NIL))
+ NIL (GO G190) G191 (EXIT NIL))
(EXIT (COND
((SPADCALL |x| (|getShellEntry| $ 16))
(- (SPADCALL |x|
@@ -750,7 +752,7 @@
(VECTOR $ |p|))
(SPADCALL |p|
(|getShellEntry| $ 17))
- (|getShellEntry| $ 75))
+ (|getShellEntry| $ 73))
(|getShellEntry| $ 27))
|LSAGG-;removeDuplicates!;2A;24|)))
NIL (GO G190) G191 (EXIT NIL))
@@ -760,7 +762,7 @@
(LET (($ (|getShellEntry| $$ 0)))
(SPADCALL |#1|
(SPADCALL (|getShellEntry| $$ 1) (|getShellEntry| $ 18))
- (|getShellEntry| $ 74))))
+ (|getShellEntry| $ 72))))
(DEFUN |LSAGG-;<;2AB;25| (|x| |y| $)
(SEQ (SEQ G190
@@ -773,12 +775,12 @@
((SPADCALL
(SPADCALL |x| (|getShellEntry| $ 18))
(SPADCALL |y| (|getShellEntry| $ 18))
- (|getShellEntry| $ 63))
+ (|getShellEntry| $ 61))
(RETURN-FROM |LSAGG-;<;2AB;25|
(SPADCALL
(SPADCALL |x| (|getShellEntry| $ 18))
(SPADCALL |y| (|getShellEntry| $ 18))
- (|getShellEntry| $ 77))))
+ (|getShellEntry| $ 75))))
('T
(SEQ (LETT |x|
(SPADCALL |x|
@@ -797,7 +799,7 @@
(DEFUN |ListAggregate&| (|#1| |#2|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|))
(|dv$| (LIST '|ListAggregate&| |dv$1| |dv$2|))
- ($ (|newShell| 80)) (|pv$| (|buildPredVector| 0 0 NIL)))
+ ($ (|newShell| 78)) (|pv$| (|buildPredVector| 0 0 NIL)))
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3 |pv$|)
(|stuffDomainSlots| $)
@@ -805,20 +807,20 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|HasCategory| |#2| '(|SetCategory|))
- (|setShellEntry| $ 64
+ (|setShellEntry| $ 62
(CONS (|dispatchFunction| |LSAGG-;reduce;MA3S;17|) $))))
(COND
((|HasCategory| |#2| '(|SetCategory|))
(PROGN
- (|setShellEntry| $ 73
+ (|setShellEntry| $ 71
(CONS (|dispatchFunction| |LSAGG-;position;SA2I;23|) $))
- (|setShellEntry| $ 76
+ (|setShellEntry| $ 74
(CONS (|dispatchFunction|
|LSAGG-;removeDuplicates!;2A;24|)
$)))))
(COND
((|HasCategory| |#2| '(|OrderedSet|))
- (|setShellEntry| $ 78
+ (|setShellEntry| $ 76
(CONS (|dispatchFunction| |LSAGG-;<;2AB;25|) $))))
$))
@@ -840,26 +842,25 @@
(113 . |lo|) (118 . |hasHi|) (123 . |hi|)
(128 . |maxIndex|) (133 . +) |LSAGG-;delete!;AUsA;11|
(|Union| 7 '"failed") |LSAGG-;find;MAU;12|
- (|PositiveInteger|) (139 . |One|) |LSAGG-;position;MAI;13|
- (143 . |reverse!|) (148 . |quo|) (154 . |split!|)
- (160 . |true|) |LSAGG-;sorted?;MAB;15|
- |LSAGG-;reduce;MA2S;16| (164 . ~=) (170 . |reduce|)
+ |LSAGG-;position;MAI;13| (139 . |reverse!|) (144 . |quo|)
+ (150 . |split!|) (156 . |true|) |LSAGG-;sorted?;MAB;15|
+ |LSAGG-;reduce;MA2S;16| (160 . ~=) (166 . |reduce|)
|LSAGG-;new;NniSA;18| |LSAGG-;map;M3A;19|
- |LSAGG-;reverse!;2A;20| (178 . =) (184 . |cyclic?|)
- |LSAGG-;copy;2A;21| (189 . |setfirst!|)
- |LSAGG-;copyInto!;2AIA;22| (195 . |position|) (202 . =)
- (208 . |remove!|) (214 . |removeDuplicates!|) (219 . <)
- (225 . <) (|Mapping| 7 7))
- '#(|sorted?| 231 |sort!| 237 |select!| 243 |reverse!| 249
- |removeDuplicates!| 254 |remove!| 259 |reduce| 265
- |position| 286 |new| 299 |merge!| 305 |merge| 312 |map|
- 319 |list| 326 |insert!| 331 |find| 345 |delete!| 351
- |copyInto!| 363 |copy| 370 < 375)
+ |LSAGG-;reverse!;2A;20| (174 . =) (180 . |cyclic?|)
+ |LSAGG-;copy;2A;21| (185 . |setfirst!|)
+ |LSAGG-;copyInto!;2AIA;22| (191 . |position|) (198 . =)
+ (204 . |remove!|) (210 . |removeDuplicates!|) (215 . <)
+ (221 . <) (|Mapping| 7 7))
+ '#(|sorted?| 227 |sort!| 233 |select!| 239 |reverse!| 245
+ |removeDuplicates!| 250 |remove!| 255 |reduce| 261
+ |position| 282 |new| 295 |merge!| 301 |merge| 308 |map|
+ 315 |list| 322 |insert!| 327 |find| 341 |delete!| 347
+ |copyInto!| 359 |copy| 366 < 371)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 78
+ (|makeByteWordVec2| 76
'(1 6 8 0 9 0 6 0 13 2 6 0 7 0 14 1 6
10 0 16 1 6 0 0 17 1 6 7 0 18 3 6 7
19 0 7 20 1 6 0 0 22 3 6 0 11 0 0 23
@@ -868,20 +869,20 @@
34 2 32 10 0 0 35 0 8 0 36 0 32 0 37
2 32 0 0 0 38 2 6 0 0 8 39 2 6 0 0 0
41 1 45 32 0 46 1 45 10 0 47 1 45 32
- 0 48 1 6 32 0 49 2 32 0 0 0 50 0 54 0
- 55 1 6 0 0 57 2 32 0 0 0 58 2 6 0 0
- 32 59 0 10 0 60 2 7 10 0 0 63 4 0 7
- 19 0 7 7 64 2 8 10 0 0 68 1 6 10 0 69
- 2 6 7 0 7 71 3 0 32 7 0 32 73 2 7 10
- 0 0 74 2 6 0 28 0 75 1 0 0 0 76 2 7
- 10 0 0 77 2 0 10 0 0 78 2 0 10 11 0
- 61 2 0 0 11 0 12 2 0 0 28 0 29 1 0 0
- 0 67 1 0 0 0 76 2 0 0 28 0 43 3 0 7
- 19 0 7 62 4 0 7 19 0 7 7 64 2 0 7 19
- 0 21 2 0 32 28 0 56 3 0 32 7 0 32 73
- 2 0 0 8 7 65 3 0 0 11 0 0 31 3 0 0 11
- 0 0 24 3 0 0 19 0 0 66 1 0 0 7 15 3 0
- 0 7 0 32 40 3 0 0 0 0 32 42 2 0 52 28
- 0 53 2 0 0 0 45 51 2 0 0 0 32 44 3 0
- 0 0 0 32 72 1 0 0 0 70 2 0 10 0 0 78)))))
+ 0 48 1 6 32 0 49 2 32 0 0 0 50 1 6 0
+ 0 55 2 32 0 0 0 56 2 6 0 0 32 57 0 10
+ 0 58 2 7 10 0 0 61 4 0 7 19 0 7 7 62
+ 2 8 10 0 0 66 1 6 10 0 67 2 6 7 0 7
+ 69 3 0 32 7 0 32 71 2 7 10 0 0 72 2 6
+ 0 28 0 73 1 0 0 0 74 2 7 10 0 0 75 2
+ 0 10 0 0 76 2 0 10 11 0 59 2 0 0 11 0
+ 12 2 0 0 28 0 29 1 0 0 0 65 1 0 0 0
+ 74 2 0 0 28 0 43 3 0 7 19 0 7 60 4 0
+ 7 19 0 7 7 62 2 0 7 19 0 21 2 0 32 28
+ 0 54 3 0 32 7 0 32 71 2 0 0 8 7 63 3
+ 0 0 11 0 0 31 3 0 0 11 0 0 24 3 0 0
+ 19 0 0 64 1 0 0 7 15 3 0 0 7 0 32 40
+ 3 0 0 0 0 32 42 2 0 52 28 0 53 2 0 0
+ 0 45 51 2 0 0 0 32 44 3 0 0 0 0 32 70
+ 1 0 0 0 68 2 0 10 0 0 76)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp
index bf2be180..4ca58e41 100644
--- a/src/algebra/strap/POLYCAT-.lsp
+++ b/src/algebra/strap/POLYCAT-.lsp
@@ -324,14 +324,14 @@
(CDR |lv|) (CDR |ln|) (|getShellEntry| $ 70)))))
(DEFUN |POLYCAT-;retract;SVarSet;9| (|p| $)
- (PROG (#0=#:G1478 |q|)
+ (PROG (|q|)
(RETURN
(SEQ (LETT |q|
- (PROG2 (LETT #0# (SPADCALL |p| (|getShellEntry| $ 53))
- |POLYCAT-;retract;SVarSet;9|)
- (CDR #0#)
+ (LET ((#0=#:G1478
+ (SPADCALL |p| (|getShellEntry| $ 53))))
(|check-union| (EQL (CAR #0#) 0)
- (|getShellEntry| $ 9) #0#))
+ (|getShellEntry| $ 9) #0#)
+ (CDR #0#))
|POLYCAT-;retract;SVarSet;9|)
(EXIT (COND
((SPADCALL (SPADCALL |q| (|getShellEntry| $ 72)) |p|
@@ -374,20 +374,19 @@
(SETQ #0# (CDR #0#)))))
(DEFUN |POLYCAT-;totalDegree;SNni;13| (|p| $)
- (PROG (#0=#:G1492 |d| |u|)
+ (PROG (|d| |u|)
(RETURN
(SEQ (COND
((SPADCALL |p| (|getShellEntry| $ 78)) 0)
('T
(SEQ (LETT |u|
(SPADCALL |p|
- (PROG2 (LETT #0#
- (SPADCALL |p|
- (|getShellEntry| $ 53))
- |POLYCAT-;totalDegree;SNni;13|)
- (CDR #0#)
+ (LET ((#0=#:G1492
+ (SPADCALL |p|
+ (|getShellEntry| $ 53))))
(|check-union| (EQL (CAR #0#) 0)
- (|getShellEntry| $ 9) #0#))
+ (|getShellEntry| $ 9) #0#)
+ (CDR #0#))
(|getShellEntry| $ 59))
|POLYCAT-;totalDegree;SNni;13|)
(LETT |d| 0 |POLYCAT-;totalDegree;SNni;13|)
@@ -414,7 +413,7 @@
(EXIT |d|))))))))
(DEFUN |POLYCAT-;totalDegree;SLNni;14| (|p| |lv| $)
- (PROG (#0=#:G1500 |v| |w| |d| |u|)
+ (PROG (|v| |w| |d| |u|)
(RETURN
(SEQ (COND
((SPADCALL |p| (|getShellEntry| $ 78)) 0)
@@ -422,14 +421,13 @@
(SEQ (LETT |u|
(SPADCALL |p|
(LETT |v|
- (PROG2
- (LETT #0#
- (SPADCALL |p|
- (|getShellEntry| $ 53))
- |POLYCAT-;totalDegree;SLNni;14|)
- (CDR #0#)
+ (LET
+ ((#0=#:G1500
+ (SPADCALL |p|
+ (|getShellEntry| $ 53))))
(|check-union| (EQL (CAR #0#) 0)
- (|getShellEntry| $ 9) #0#))
+ (|getShellEntry| $ 9) #0#)
+ (CDR #0#))
|POLYCAT-;totalDegree;SLNni;14|)
(|getShellEntry| $ 59))
|POLYCAT-;totalDegree;SLNni;14|)
@@ -1131,36 +1129,28 @@
(|getShellEntry| $ 204)))
(DEFUN |POLYCAT-;primitivePart;2S;36| (|p| $)
- (PROG (#0=#:G1658)
- (RETURN
- (QVELT (SPADCALL
- (PROG2 (LETT #0#
- (SPADCALL |p|
- (SPADCALL |p|
- (|getShellEntry| $ 206))
- (|getShellEntry| $ 207))
- |POLYCAT-;primitivePart;2S;36|)
- (CDR #0#)
- (|check-union| (EQL (CAR #0#) 0)
- (|getShellEntry| $ 6) #0#))
- (|getShellEntry| $ 209))
- 1))))
+ (QVELT (SPADCALL
+ (LET ((#0=#:G1658
+ (SPADCALL |p|
+ (SPADCALL |p| (|getShellEntry| $ 206))
+ (|getShellEntry| $ 207))))
+ (|check-union| (EQL (CAR #0#) 0) (|getShellEntry| $ 6)
+ #0#)
+ (CDR #0#))
+ (|getShellEntry| $ 209))
+ 1))
(DEFUN |POLYCAT-;primitivePart;SVarSetS;37| (|p| |v| $)
- (PROG (#0=#:G1664)
- (RETURN
- (QVELT (SPADCALL
- (PROG2 (LETT #0#
- (SPADCALL |p|
- (SPADCALL |p| |v|
- (|getShellEntry| $ 211))
- (|getShellEntry| $ 212))
- |POLYCAT-;primitivePart;SVarSetS;37|)
- (CDR #0#)
- (|check-union| (EQL (CAR #0#) 0)
- (|getShellEntry| $ 6) #0#))
- (|getShellEntry| $ 209))
- 1))))
+ (QVELT (SPADCALL
+ (LET ((#0=#:G1664
+ (SPADCALL |p|
+ (SPADCALL |p| |v| (|getShellEntry| $ 211))
+ (|getShellEntry| $ 212))))
+ (|check-union| (EQL (CAR #0#) 0) (|getShellEntry| $ 6)
+ #0#)
+ (CDR #0#))
+ (|getShellEntry| $ 209))
+ 1))
(DEFUN |POLYCAT-;before?;2SB;38| (|p| |q| $)
(PROG (|dp| |dq|)
diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp
index 44f85770..68179ede 100644
--- a/src/algebra/strap/URAGG-.lsp
+++ b/src/algebra/strap/URAGG-.lsp
@@ -228,7 +228,8 @@
(DEFUN |URAGG-;#;ANni;15| (|x| $)
(PROG (|k|)
(RETURN
- (SEQ (SEQ (LETT |k| 0 |URAGG-;#;ANni;15|) G190
+ (SEQ (LETT |k| 0 |URAGG-;#;ANni;15|)
+ (SEQ G190
(COND
((NULL (NOT (SPADCALL |x| (|getShellEntry| $ 20))))
(GO G191)))
@@ -237,10 +238,10 @@
(COND
((SPADCALL |x| (|getShellEntry| $ 48))
(EXIT (|error| "cyclic list"))))))
- (EXIT (LETT |x|
- (SPADCALL |x| (|getShellEntry| $ 14))
- |URAGG-;#;ANni;15|)))
- (SETQ |k| (QSADD1 |k|)) (GO G190) G191 (EXIT NIL))
+ (LETT |x| (SPADCALL |x| (|getShellEntry| $ 14))
+ |URAGG-;#;ANni;15|)
+ (EXIT (LETT |k| (+ |k| 1) |URAGG-;#;ANni;15|)))
+ NIL (GO G190) G191 (EXIT NIL))
(EXIT |k|)))))
(DEFUN |URAGG-;tail;2A;16| (|x| $)
@@ -282,7 +283,7 @@
((NULL (NOT (SPADCALL |y| (|getShellEntry| $ 20))))
(GO G191)))
(SEQ (COND
- ((SPADCALL |x| |y| (|getShellEntry| $ 51))
+ ((SPADCALL |x| |y| (|getShellEntry| $ 54))
(RETURN-FROM |URAGG-;findCycle| |x|)))
(LETT |x| (SPADCALL |x| (|getShellEntry| $ 14))
|URAGG-;findCycle|)
@@ -292,7 +293,7 @@
((SPADCALL |y| (|getShellEntry| $ 20))
(RETURN-FROM |URAGG-;findCycle| |y|)))
(COND
- ((SPADCALL |x| |y| (|getShellEntry| $ 51))
+ ((SPADCALL |x| |y| (|getShellEntry| $ 54))
(RETURN-FROM |URAGG-;findCycle| |y|)))
(EXIT (LETT |y|
(SPADCALL |y| (|getShellEntry| $ 14))
@@ -306,7 +307,7 @@
(SEQ (COND
((SPADCALL
(LETT |y|
- (LETT |x| (SPADCALL |x| (|getShellEntry| $ 52))
+ (LETT |x| (SPADCALL |x| (|getShellEntry| $ 55))
|URAGG-;cycleTail;2A;18|)
|URAGG-;cycleTail;2A;18|)
(|getShellEntry| $ 20))
@@ -317,7 +318,7 @@
(SEQ G190
(COND
((NULL (NOT (SPADCALL |x| |z|
- (|getShellEntry| $ 51))))
+ (|getShellEntry| $ 54))))
(GO G191)))
(SEQ (LETT |y| |z| |URAGG-;cycleTail;2A;18|)
(EXIT (LETT |z|
@@ -328,7 +329,7 @@
(EXIT |y|))))))))
(DEFUN |URAGG-;cycleEntry;2A;19| (|x| $)
- (PROG (|l| |z| |k| |y|)
+ (PROG (|z| |l| |k| |y|)
(RETURN
(SEQ (COND
((SPADCALL |x| (|getShellEntry| $ 20)) |x|)
@@ -340,15 +341,19 @@
('T
(SEQ (LETT |z| (SPADCALL |y| (|getShellEntry| $ 14))
|URAGG-;cycleEntry;2A;19|)
- (SEQ (LETT |l| 1 |URAGG-;cycleEntry;2A;19|) G190
+ (LETT |l| 1 |URAGG-;cycleEntry;2A;19|)
+ (SEQ G190
(COND
((NULL (NOT (SPADCALL |y| |z|
- (|getShellEntry| $ 51))))
+ (|getShellEntry| $ 54))))
(GO G191)))
- (LETT |z| (SPADCALL |z| (|getShellEntry| $ 14))
- |URAGG-;cycleEntry;2A;19|)
- (SETQ |l| (QSADD1 |l|)) (GO G190) G191
- (EXIT NIL))
+ (SEQ (LETT |z|
+ (SPADCALL |z|
+ (|getShellEntry| $ 14))
+ |URAGG-;cycleEntry;2A;19|)
+ (EXIT (LETT |l| (+ |l| 1)
+ |URAGG-;cycleEntry;2A;19|)))
+ NIL (GO G190) G191 (EXIT NIL))
(LETT |y| |x| |URAGG-;cycleEntry;2A;19|)
(SEQ (LETT |k| 1 |URAGG-;cycleEntry;2A;19|) G190
(COND ((QSGREATERP |k| |l|) (GO G191)))
@@ -359,7 +364,7 @@
(SEQ G190
(COND
((NULL (NOT (SPADCALL |x| |y|
- (|getShellEntry| $ 51))))
+ (|getShellEntry| $ 54))))
(GO G191)))
(SEQ (LETT |x|
(SPADCALL |x|
@@ -373,7 +378,7 @@
(EXIT |x|))))))))
(DEFUN |URAGG-;cycleLength;ANni;20| (|x| $)
- (PROG (|k| |y|)
+ (PROG (|y| |k|)
(RETURN
(SEQ (COND
((OR (SPADCALL |x| (|getShellEntry| $ 20))
@@ -385,15 +390,19 @@
('T
(SEQ (LETT |y| (SPADCALL |x| (|getShellEntry| $ 14))
|URAGG-;cycleLength;ANni;20|)
- (SEQ (LETT |k| 1 |URAGG-;cycleLength;ANni;20|) G190
+ (LETT |k| 1 |URAGG-;cycleLength;ANni;20|)
+ (SEQ G190
(COND
((NULL (NOT (SPADCALL |x| |y|
- (|getShellEntry| $ 51))))
+ (|getShellEntry| $ 54))))
(GO G191)))
- (LETT |y| (SPADCALL |y| (|getShellEntry| $ 14))
- |URAGG-;cycleLength;ANni;20|)
- (SETQ |k| (QSADD1 |k|)) (GO G190) G191
- (EXIT NIL))
+ (SEQ (LETT |y|
+ (SPADCALL |y|
+ (|getShellEntry| $ 14))
+ |URAGG-;cycleLength;ANni;20|)
+ (EXIT (LETT |k| (+ |k| 1)
+ |URAGG-;cycleLength;ANni;20|)))
+ NIL (GO G190) G191 (EXIT NIL))
(EXIT |k|))))))))
(DEFUN |URAGG-;rest;ANniA;21| (|x| |n| $)
@@ -415,24 +424,24 @@
(DEFUN |URAGG-;last;ANniA;22| (|x| |n| $)
(PROG (|m|)
(RETURN
- (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 57))
+ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 60))
|URAGG-;last;ANniA;22|)
(EXIT (COND
((> |n| |m|) (|error| "index out of range"))
('T
(SPADCALL
(SPADCALL |x|
- (LET ((#0=#:G1500 (- |m| |n|)))
+ (LET ((#0=#:G1502 (- |m| |n|)))
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 59))
- (|getShellEntry| $ 60)))))))))
+ (|getShellEntry| $ 62))
+ (|getShellEntry| $ 63)))))))))
(DEFUN |URAGG-;=;2AB;23| (|x| |y| $)
(PROG (|k|)
(RETURN
(SEQ (COND
- ((SPADCALL |x| |y| (|getShellEntry| $ 51)) T)
+ ((SPADCALL |x| |y| (|getShellEntry| $ 54)) T)
('T
(SEQ (SEQ (LETT |k| 0 |URAGG-;=;2AB;23|) G190
(COND
@@ -457,7 +466,7 @@
(|getShellEntry| $ 8))
(SPADCALL |y|
(|getShellEntry| $ 8))
- (|getShellEntry| $ 63))
+ (|getShellEntry| $ 66))
(RETURN-FROM |URAGG-;=;2AB;23|
NIL))
('T
@@ -486,7 +495,7 @@
((NULL (NOT (SPADCALL |v| (|getShellEntry| $ 20))))
(GO G191)))
(SEQ (EXIT (COND
- ((SPADCALL |u| |v| (|getShellEntry| $ 65))
+ ((SPADCALL |u| |v| (|getShellEntry| $ 68))
(RETURN-FROM |URAGG-;node?;2AB;24| T))
('T
(SEQ (COND
@@ -501,20 +510,20 @@
(|getShellEntry| $ 14))
|URAGG-;node?;2AB;24|)))))))
(SETQ |k| (QSADD1 |k|)) (GO G190) G191 (EXIT NIL))
- (EXIT (SPADCALL |u| |v| (|getShellEntry| $ 65)))))))
+ (EXIT (SPADCALL |u| |v| (|getShellEntry| $ 68)))))))
(DEFUN |URAGG-;setelt;Afirst2S;25| (|x| T3 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 67)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 70)))
(DEFUN |URAGG-;setelt;Alast2S;26| (|x| T4 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 69)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 72)))
(DEFUN |URAGG-;setelt;Arest2A;27| (|x| T5 |a| $)
- (SPADCALL |x| |a| (|getShellEntry| $ 71)))
+ (SPADCALL |x| |a| (|getShellEntry| $ 74)))
(DEFUN |URAGG-;concat;3A;28| (|x| |y| $)
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 60)) |y|
- (|getShellEntry| $ 73)))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 63)) |y|
+ (|getShellEntry| $ 76)))
(DEFUN |URAGG-;setlast!;A2S;29| (|x| |s| $)
(SEQ (COND
@@ -522,17 +531,17 @@
(|error| "setlast: empty list"))
('T
(SEQ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 24)) |s|
- (|getShellEntry| $ 67))
+ (|getShellEntry| $ 70))
(EXIT |s|))))))
(DEFUN |URAGG-;setchildren!;ALA;30| (|u| |lv| $)
(COND
((EQL (LENGTH |lv|) 1)
- (SPADCALL |u| (|SPADfirst| |lv|) (|getShellEntry| $ 71)))
+ (SPADCALL |u| (|SPADfirst| |lv|) (|getShellEntry| $ 74)))
('T (|error| "wrong number of children specified"))))
(DEFUN |URAGG-;setvalue!;A2S;31| (|u| |s| $)
- (SPADCALL |u| |s| (|getShellEntry| $ 67)))
+ (SPADCALL |u| |s| (|getShellEntry| $ 70)))
(DEFUN |URAGG-;split!;AIA;32| (|p| |n| $)
(PROG (|q|)
@@ -542,15 +551,15 @@
('T
(SEQ (LETT |p|
(SPADCALL |p|
- (LET ((#0=#:G1526 (- |n| 1)))
+ (LET ((#0=#:G1528 (- |n| 1)))
(|check-subtype| (>= #0# 0)
'(|NonNegativeInteger|) #0#))
- (|getShellEntry| $ 59))
+ (|getShellEntry| $ 62))
|URAGG-;split!;AIA;32|)
(LETT |q| (SPADCALL |p| (|getShellEntry| $ 14))
|URAGG-;split!;AIA;32|)
- (SPADCALL |p| (SPADCALL (|getShellEntry| $ 81))
- (|getShellEntry| $ 71))
+ (SPADCALL |p| (SPADCALL (|getShellEntry| $ 84))
+ (|getShellEntry| $ 74))
(EXIT |q|))))))))
(DEFUN |URAGG-;cycleSplit!;2A;33| (|x| $)
@@ -558,10 +567,10 @@
(RETURN
(SEQ (COND
((OR (SPADCALL
- (LETT |y| (SPADCALL |x| (|getShellEntry| $ 52))
+ (LETT |y| (SPADCALL |x| (|getShellEntry| $ 55))
|URAGG-;cycleSplit!;2A;33|)
(|getShellEntry| $ 20))
- (SPADCALL |x| |y| (|getShellEntry| $ 51)))
+ (SPADCALL |x| |y| (|getShellEntry| $ 54)))
|y|)
('T
(SEQ (LETT |z| (SPADCALL |x| (|getShellEntry| $ 14))
@@ -569,7 +578,7 @@
(SEQ G190
(COND
((NULL (NOT (SPADCALL |z| |y|
- (|getShellEntry| $ 51))))
+ (|getShellEntry| $ 54))))
(GO G191)))
(SEQ (LETT |x| |z| |URAGG-;cycleSplit!;2A;33|)
(EXIT (LETT |z|
@@ -577,14 +586,14 @@
(|getShellEntry| $ 14))
|URAGG-;cycleSplit!;2A;33|)))
NIL (GO G190) G191 (EXIT NIL))
- (SPADCALL |x| (SPADCALL (|getShellEntry| $ 81))
- (|getShellEntry| $ 71))
+ (SPADCALL |x| (SPADCALL (|getShellEntry| $ 84))
+ (|getShellEntry| $ 74))
(EXIT |y|))))))))
(DEFUN |UnaryRecursiveAggregate&| (|#1| |#2|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|))
(|dv$| (LIST '|UnaryRecursiveAggregate&| |dv$1| |dv$2|))
- ($ (|newShell| 85))
+ ($ (|newShell| 88))
(|pv$| (|buildPredVector| 0 0
(LIST (|HasAttribute| |#1| '|shallowlyMutable|)))))
(|setShellEntry| $ 0 |dv$|)
@@ -594,35 +603,35 @@
(|setShellEntry| $ 7 |#2|)
(COND
((|HasAttribute| |#1| '|finiteAggregate|)
- (|setShellEntry| $ 61
+ (|setShellEntry| $ 64
(CONS (|dispatchFunction| |URAGG-;last;ANniA;22|) $))))
(COND
((|HasCategory| |#2| '(|SetCategory|))
(PROGN
- (|setShellEntry| $ 64
+ (|setShellEntry| $ 67
(CONS (|dispatchFunction| |URAGG-;=;2AB;23|) $))
- (|setShellEntry| $ 66
+ (|setShellEntry| $ 69
(CONS (|dispatchFunction| |URAGG-;node?;2AB;24|) $)))))
(COND
((|testBitVector| |pv$| 1)
(PROGN
- (|setShellEntry| $ 68
+ (|setShellEntry| $ 71
(CONS (|dispatchFunction| |URAGG-;setelt;Afirst2S;25|) $))
- (|setShellEntry| $ 70
+ (|setShellEntry| $ 73
(CONS (|dispatchFunction| |URAGG-;setelt;Alast2S;26|) $))
- (|setShellEntry| $ 72
+ (|setShellEntry| $ 75
(CONS (|dispatchFunction| |URAGG-;setelt;Arest2A;27|) $))
- (|setShellEntry| $ 74
+ (|setShellEntry| $ 77
(CONS (|dispatchFunction| |URAGG-;concat;3A;28|) $))
- (|setShellEntry| $ 75
- (CONS (|dispatchFunction| |URAGG-;setlast!;A2S;29|) $))
(|setShellEntry| $ 78
+ (CONS (|dispatchFunction| |URAGG-;setlast!;A2S;29|) $))
+ (|setShellEntry| $ 81
(CONS (|dispatchFunction| |URAGG-;setchildren!;ALA;30|) $))
- (|setShellEntry| $ 79
- (CONS (|dispatchFunction| |URAGG-;setvalue!;A2S;31|) $))
(|setShellEntry| $ 82
+ (CONS (|dispatchFunction| |URAGG-;setvalue!;A2S;31|) $))
+ (|setShellEntry| $ 85
(CONS (|dispatchFunction| |URAGG-;split!;AIA;32|) $))
- (|setShellEntry| $ 83
+ (|setShellEntry| $ 86
(CONS (|dispatchFunction| |URAGG-;cycleSplit!;2A;33|) $)))))
$))
@@ -641,57 +650,58 @@
(53 . |Zero|) (57 . >) (63 . |One|) (67 . |One|) (71 . -)
|URAGG-;less?;ANniB;12| (77 . |zero?|)
|URAGG-;more?;ANniB;13| |URAGG-;size?;ANniB;14| (82 . =)
- (88 . |cyclic?|) |URAGG-;#;ANni;15| |URAGG-;tail;2A;16|
- (93 . |eq?|) (99 . |cycleEntry|) |URAGG-;cycleTail;2A;18|
+ (88 . |cyclic?|) (|PositiveInteger|) (93 . |One|) (97 . +)
+ |URAGG-;#;ANni;15| |URAGG-;tail;2A;16| (103 . |eq?|)
+ (109 . |cycleEntry|) |URAGG-;cycleTail;2A;18|
|URAGG-;cycleEntry;2A;19| |URAGG-;cycleLength;ANni;20|
- |URAGG-;rest;ANniA;21| (104 . |#|) (109 . >)
- (115 . |rest|) (121 . |copy|) (126 . |last|)
- (132 . |true|) (136 . ~=) (142 . =) (148 . =)
- (154 . |node?|) (160 . |setfirst!|) (166 . |setelt|)
- (173 . |setlast!|) (179 . |setelt|) (186 . |setrest!|)
- (192 . |setelt|) (199 . |concat!|) (205 . |concat|)
- (211 . |setlast!|) (217 . |#|) (222 . |first|)
- (227 . |setchildren!|) (233 . |setvalue!|) (239 . <)
- (245 . |empty|) (249 . |split!|) (255 . |cycleSplit!|)
+ |URAGG-;rest;ANniA;21| (114 . |#|) (119 . >)
+ (125 . |rest|) (131 . |copy|) (136 . |last|)
+ (142 . |true|) (146 . ~=) (152 . =) (158 . =)
+ (164 . |node?|) (170 . |setfirst!|) (176 . |setelt|)
+ (183 . |setlast!|) (189 . |setelt|) (196 . |setrest!|)
+ (202 . |setelt|) (209 . |concat!|) (215 . |concat|)
+ (221 . |setlast!|) (227 . |#|) (232 . |first|)
+ (237 . |setchildren!|) (243 . |setvalue!|) (249 . <)
+ (255 . |empty|) (259 . |split!|) (265 . |cycleSplit!|)
'"value")
- '#(|value| 260 |third| 265 |tail| 270 |split!| 275 |size?|
- 281 |setvalue!| 287 |setlast!| 293 |setelt| 299
- |setchildren!| 320 |second| 326 |rest| 331 |nodes| 337
- |node?| 342 |more?| 348 |less?| 354 |leaf?| 360 |last| 365
- |elt| 376 |cyclic?| 394 |cycleTail| 399 |cycleSplit!| 404
- |cycleLength| 409 |cycleEntry| 414 |concat| 419 |children|
- 425 = 430 |#| 436)
+ '#(|value| 270 |third| 275 |tail| 280 |split!| 285 |size?|
+ 291 |setvalue!| 297 |setlast!| 303 |setelt| 309
+ |setchildren!| 330 |second| 336 |rest| 341 |nodes| 347
+ |node?| 352 |more?| 358 |less?| 364 |leaf?| 370 |last| 375
+ |elt| 386 |cyclic?| 404 |cycleTail| 409 |cycleSplit!| 414
+ |cycleLength| 419 |cycleEntry| 424 |concat| 429 |children|
+ 435 = 440 |#| 446)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 83
+ (|makeByteWordVec2| 86
'(1 6 7 0 8 1 6 7 0 11 1 6 0 0 14 1 6
19 0 20 0 19 0 21 1 19 0 0 22 1 6 0 0
24 0 26 0 27 2 26 0 6 0 28 1 26 0 0
29 0 35 0 36 0 37 0 38 2 37 19 0 0 39
0 35 0 40 0 37 0 41 2 37 0 0 0 42 1
37 19 0 44 2 35 19 0 0 47 1 6 19 0 48
- 2 6 19 0 0 51 1 6 0 0 52 1 6 35 0 57
- 2 35 19 0 0 58 2 6 0 0 35 59 1 6 0 0
- 60 2 0 0 0 35 61 0 19 0 62 2 7 19 0 0
- 63 2 0 19 0 0 64 2 6 19 0 0 65 2 0 19
- 0 0 66 2 6 7 0 7 67 3 0 7 0 9 7 68 2
- 6 7 0 7 69 3 0 7 0 12 7 70 2 6 0 0 0
- 71 3 0 0 0 15 0 72 2 6 0 0 0 73 2 0 0
- 0 0 74 2 0 7 0 7 75 1 26 35 0 76 1 26
- 6 0 77 2 0 0 0 30 78 2 0 7 0 7 79 2
- 37 19 0 0 80 0 6 0 81 2 0 0 0 37 82 1
- 0 0 0 83 1 0 7 0 34 1 0 7 0 18 1 0 0
- 0 50 2 0 0 0 37 82 2 0 19 0 35 46 2 0
- 7 0 7 79 2 0 7 0 7 75 3 0 7 0 12 7 70
- 3 0 0 0 15 0 72 3 0 7 0 9 7 68 2 0 0
- 0 30 78 1 0 7 0 17 2 0 0 0 35 56 1 0
- 30 0 31 2 0 19 0 0 66 2 0 19 0 35 45
- 2 0 19 0 35 43 1 0 19 0 33 2 0 0 0 35
- 61 1 0 7 0 25 2 0 7 0 12 13 2 0 0 0
- 15 16 2 0 7 0 9 10 1 0 19 0 23 1 0 0
- 0 53 1 0 0 0 83 1 0 35 0 55 1 0 0 0
- 54 2 0 0 0 0 74 1 0 30 0 32 2 0 19 0
- 0 64 1 0 35 0 49)))))
+ 0 49 0 50 2 35 0 0 0 51 2 6 19 0 0 54
+ 1 6 0 0 55 1 6 35 0 60 2 35 19 0 0 61
+ 2 6 0 0 35 62 1 6 0 0 63 2 0 0 0 35
+ 64 0 19 0 65 2 7 19 0 0 66 2 0 19 0 0
+ 67 2 6 19 0 0 68 2 0 19 0 0 69 2 6 7
+ 0 7 70 3 0 7 0 9 7 71 2 6 7 0 7 72 3
+ 0 7 0 12 7 73 2 6 0 0 0 74 3 0 0 0 15
+ 0 75 2 6 0 0 0 76 2 0 0 0 0 77 2 0 7
+ 0 7 78 1 26 35 0 79 1 26 6 0 80 2 0 0
+ 0 30 81 2 0 7 0 7 82 2 37 19 0 0 83 0
+ 6 0 84 2 0 0 0 37 85 1 0 0 0 86 1 0 7
+ 0 34 1 0 7 0 18 1 0 0 0 53 2 0 0 0 37
+ 85 2 0 19 0 35 46 2 0 7 0 7 82 2 0 7
+ 0 7 78 3 0 7 0 12 7 73 3 0 0 0 15 0
+ 75 3 0 7 0 9 7 71 2 0 0 0 30 81 1 0 7
+ 0 17 2 0 0 0 35 59 1 0 30 0 31 2 0 19
+ 0 0 69 2 0 19 0 35 45 2 0 19 0 35 43
+ 1 0 19 0 33 2 0 0 0 35 64 1 0 7 0 25
+ 2 0 7 0 12 13 2 0 0 0 15 16 2 0 7 0 9
+ 10 1 0 19 0 23 1 0 0 0 56 1 0 0 0 86
+ 1 0 35 0 58 1 0 0 0 57 2 0 0 0 0 77 1
+ 0 30 0 32 2 0 19 0 0 67 1 0 35 0 52)))))
'|lookupComplete|))
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 21:36:34 +0000