aboutsummaryrefslogtreecommitdiff
path: root/src/algebra
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-02-26 00:42:53 +0000
committerdos-reis <gdr@axiomatics.org>2011-02-26 00:42:53 +0000
commitb0074cf7a64b5a4070b649924285084e4980f147 (patch)
treec63e9a3f3d4dba857e9c922baa943da06dbed0b3 /src/algebra
parent0ee1ea72c939e760c274f2eaff8afa73a629ae60 (diff)
downloadopen-axiom-b0074cf7a64b5a4070b649924285084e4980f147.tar.gz
* interp/parse.boot (parseLessEqual): Remove.
Diffstat (limited to 'src/algebra')
-rw-r--r--src/algebra/strap/INS-.lsp87
-rw-r--r--src/algebra/strap/ISTRING.lsp220
-rw-r--r--src/algebra/strap/LNAGG-.lsp50
-rw-r--r--src/algebra/strap/OUTFORM.lsp29
4 files changed, 194 insertions, 192 deletions
diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp
index f7993375..c4eb8f59 100644
--- a/src/algebra/strap/INS-.lsp
+++ b/src/algebra/strap/INS-.lsp
@@ -202,13 +202,11 @@
(|shellEntry| $ 16))
(SPADCALL |r| |n| (|shellEntry| $ 67)))
(T |r|)))
- ((NOT (SPADCALL
- (SPADCALL
- (SPADCALL 2 |r|
- (|shellEntry| $ 82))
- |n| (|shellEntry| $ 83))
- (|spadConstant| $ 10)
- (|shellEntry| $ 16)))
+ ((SPADCALL
+ (SPADCALL (SPADCALL 2 |r|
+ (|shellEntry| $ 82))
+ |n| (|shellEntry| $ 83))
+ (|spadConstant| $ 10) (|shellEntry| $ 84))
(SPADCALL |r| |n| (|shellEntry| $ 83)))
(T |r|))))))))
@@ -216,8 +214,8 @@
(PROG (|c| |c1| |d| |d1| |q| |r| |r1|)
(RETURN
(SEQ (COND
- ((SPADCALL |a| (|shellEntry| $ 85))
- (SETQ |a| (SPADCALL |a| |b| (|shellEntry| $ 86)))))
+ ((SPADCALL |a| (|shellEntry| $ 86))
+ (SETQ |a| (SPADCALL |a| |b| (|shellEntry| $ 87)))))
(LETT |c| |a| |INS-;invmod;3S;28|)
(LETT |c1| (|spadConstant| $ 22) |INS-;invmod;3S;28|)
(LETT |d| |b| |INS-;invmod;3S;28|)
@@ -226,26 +224,26 @@
(COND
((NOT (NOT (SPADCALL |d| (|shellEntry| $ 66))))
(RETURN NIL))
- (T (SEQ (LETT |q| (SPADCALL |c| |d| (|shellEntry| $ 87))
+ (T (SEQ (LETT |q| (SPADCALL |c| |d| (|shellEntry| $ 88))
|INS-;invmod;3S;28|)
(LETT |r|
(SPADCALL |c|
- (SPADCALL |q| |d| (|shellEntry| $ 88))
+ (SPADCALL |q| |d| (|shellEntry| $ 89))
(|shellEntry| $ 67))
|INS-;invmod;3S;28|)
(LETT |r1|
(SPADCALL |c1|
(SPADCALL |q| |d1|
- (|shellEntry| $ 88))
+ (|shellEntry| $ 89))
(|shellEntry| $ 67))
|INS-;invmod;3S;28|)
(SETQ |c| |d|) (SETQ |c1| |d1|) (SETQ |d| |r|)
(EXIT (SETQ |d1| |r1|))))))
(COND
- ((NOT (SPADCALL |c| (|shellEntry| $ 89)))
+ ((NOT (SPADCALL |c| (|shellEntry| $ 90)))
(EXIT (|error| "inverse does not exist"))))
(EXIT (COND
- ((SPADCALL |c1| (|shellEntry| $ 85))
+ ((SPADCALL |c1| (|shellEntry| $ 86))
(SPADCALL |c1| |b| (|shellEntry| $ 83)))
(T |c1|)))))))
@@ -253,8 +251,8 @@
(PROG (|y| |z|)
(RETURN
(SEQ (COND
- ((SPADCALL |x| (|shellEntry| $ 85))
- (SETQ |x| (SPADCALL |x| |p| (|shellEntry| $ 86)))))
+ ((SPADCALL |x| (|shellEntry| $ 86))
+ (SETQ |x| (SPADCALL |x| |p| (|shellEntry| $ 87)))))
(EXIT (COND
((SPADCALL |x| (|shellEntry| $ 66))
(|spadConstant| $ 10))
@@ -273,7 +271,7 @@
(|shellEntry| $ 13))
(SETQ |y|
(SPADCALL |y| |z| |p|
- (|shellEntry| $ 91)))))
+ (|shellEntry| $ 92)))))
(EXIT
(COND
((SPADCALL
@@ -290,12 +288,12 @@
(T
(SETQ |z|
(SPADCALL |z| |z| |p|
- (|shellEntry| $ 91)))))))))))))))))))
+ (|shellEntry| $ 92)))))))))))))))))))
(DEFUN |IntegerNumberSystem&| (|#1|)
(LET* ((|dv$1| (|devaluate| |#1|))
(|dv$| (LIST '|IntegerNumberSystem&| |dv$1|))
- ($ (|newShell| 93)) (|pv$| (|buildPredVector| 0 0 NIL)))
+ ($ (|newShell| 94)) (|pv$| (|buildPredVector| 0 0 NIL)))
(SETF (|shellEntry| $ 0) |dv$|)
(SETF (|shellEntry| $ 3) |pv$|)
(|stuffDomainSlots| $)
@@ -334,23 +332,23 @@
(140 . |coerce|) |INS-;rational;SF;25|
(|Union| 75 '"failed") |INS-;rationalIfCan;SU;26|
(145 . |rem|) (|PositiveInteger|) (151 . *) (157 . +)
- |INS-;symmetricRemainder;3S;27| (163 . |negative?|)
- (168 . |positiveRemainder|) (174 . |quo|) (180 . *)
- (186 . |one?|) |INS-;invmod;3S;28| (191 . |mulmod|)
- |INS-;powmod;4S;29|)
- '#(|symmetricRemainder| 198 |squareFree| 204 |retractIfCan|
- 209 |retract| 214 |rationalIfCan| 219 |rational?| 224
- |rational| 229 |prime?| 234 |powmod| 239 |positive?| 246
- |permutation| 251 |patternMatch| 257 |nextItem| 264 |mask|
- 269 |invmod| 274 |init| 280 |factorial| 284 |factor| 289
- |even?| 294 |euclideanSize| 299 |differentiate| 304 |copy|
- 309 |convert| 314 |characteristic| 334 |bit?| 338
- |binomial| 344)
+ (163 . <=) |INS-;symmetricRemainder;3S;27|
+ (169 . |negative?|) (174 . |positiveRemainder|)
+ (180 . |quo|) (186 . *) (192 . |one?|) |INS-;invmod;3S;28|
+ (197 . |mulmod|) |INS-;powmod;4S;29|)
+ '#(|symmetricRemainder| 204 |squareFree| 210 |retractIfCan|
+ 215 |retract| 220 |rationalIfCan| 225 |rational?| 230
+ |rational| 235 |prime?| 240 |powmod| 245 |positive?| 252
+ |permutation| 257 |patternMatch| 263 |nextItem| 270 |mask|
+ 275 |invmod| 280 |init| 286 |factorial| 290 |factor| 295
+ |even?| 300 |euclideanSize| 305 |differentiate| 310 |copy|
+ 315 |convert| 320 |characteristic| 340 |bit?| 344
+ |binomial| 350)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 92
+ (|makeByteWordVec2| 93
'(0 7 0 8 0 6 0 10 1 6 12 0 13 1 12 0 0
14 2 6 12 0 0 16 1 6 0 0 19 2 6 0 0 0
20 0 6 0 22 1 6 0 0 23 0 12 0 25 2 6
@@ -361,16 +359,17 @@
2 56 6 6 6 59 2 56 6 6 6 61 1 6 12 0
66 2 6 0 0 0 67 3 71 70 6 43 70 72 1
75 0 29 76 2 6 0 0 0 80 2 6 0 81 0 82
- 2 6 0 0 0 83 1 6 12 0 85 2 6 0 0 0 86
- 2 6 0 0 0 87 2 6 0 0 0 88 1 6 12 0 89
- 3 6 0 0 0 0 91 2 0 0 0 0 84 1 0 49 0
- 52 1 0 63 0 64 1 0 29 0 42 1 0 78 0
- 79 1 0 12 0 26 1 0 75 0 77 1 0 12 0
- 55 3 0 0 0 0 0 92 1 0 12 0 17 2 0 0 0
- 0 62 3 0 73 0 43 73 74 1 0 68 0 69 1
- 0 0 0 24 2 0 0 0 0 90 0 0 0 65 1 0 0
- 0 58 1 0 49 0 50 1 0 12 0 15 1 0 7 0
- 32 1 0 0 0 11 1 0 0 0 18 1 0 36 0 38
- 1 0 33 0 35 1 0 43 0 45 1 0 39 0 41 0
- 0 7 9 2 0 12 0 0 21 2 0 0 0 0 60)))))
+ 2 6 0 0 0 83 2 6 12 0 0 84 1 6 12 0
+ 86 2 6 0 0 0 87 2 6 0 0 0 88 2 6 0 0
+ 0 89 1 6 12 0 90 3 6 0 0 0 0 92 2 0 0
+ 0 0 85 1 0 49 0 52 1 0 63 0 64 1 0 29
+ 0 42 1 0 78 0 79 1 0 12 0 26 1 0 75 0
+ 77 1 0 12 0 55 3 0 0 0 0 0 93 1 0 12
+ 0 17 2 0 0 0 0 62 3 0 73 0 43 73 74 1
+ 0 68 0 69 1 0 0 0 24 2 0 0 0 0 91 0 0
+ 0 65 1 0 0 0 58 1 0 49 0 50 1 0 12 0
+ 15 1 0 7 0 32 1 0 0 0 11 1 0 0 0 18 1
+ 0 36 0 38 1 0 33 0 35 1 0 43 0 45 1 0
+ 39 0 41 0 0 7 9 2 0 12 0 0 21 2 0 0 0
+ 0 60)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index 7cbede50..75a3bef4 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -326,21 +326,23 @@
(SEQ (LOOP
(COND
((NOT (COND
- ((< |n| |i|) NIL)
- (T (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |c| (|shellEntry| $ 69)))))
+ ((NOT (< |n| |i|))
+ (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
+ |c| (|shellEntry| $ 70)))
+ (T NIL)))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1)))))
(LETT |l| NIL |ISTRING;split;$CL;22|)
(LOOP
(COND
((NOT (COND
- ((< |n| |i|) NIL)
- (T (NOT (< (LETT |j|
- (|ISTRING;position;C$2I;19| |c|
- |s| |i| $)
- |ISTRING;split;$CL;22|)
- (SVREF $ 6))))))
+ ((NOT (< |n| |i|))
+ (NOT (< (LETT |j|
+ (|ISTRING;position;C$2I;19| |c|
+ |s| |i| $)
+ |ISTRING;split;$CL;22|)
+ (SVREF $ 6))))
+ (T NIL)))
(RETURN NIL))
(T (SEQ (SETQ |l|
(SPADCALL
@@ -348,18 +350,18 @@
(SPADCALL |i| (- |j| 1)
(|shellEntry| $ 24))
$)
- |l| (|shellEntry| $ 72)))
+ |l| (|shellEntry| $ 73)))
(SETQ |i| |j|)
(EXIT (LOOP
(COND
((NOT
(COND
- ((< |n| |i|) NIL)
- (T
+ ((NOT (< |n| |i|))
(SPADCALL
(|ISTRING;elt;$IC;30| |s| |i|
$)
- |c| (|shellEntry| $ 69)))))
+ |c| (|shellEntry| $ 70)))
+ (T NIL)))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1))))))))))
(COND
@@ -368,7 +370,7 @@
(SPADCALL
(|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| |n| (|shellEntry| $ 24)) $)
- |l| (|shellEntry| $ 72)))))
+ |l| (|shellEntry| $ 73)))))
(EXIT (NREVERSE |l|)))))))
(DEFUN |ISTRING;split;$CcL;23| (|s| |cc| $)
@@ -378,21 +380,23 @@
(SEQ (LOOP
(COND
((NOT (COND
- ((< |n| |i|) NIL)
- (T (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
- |cc| (|shellEntry| $ 65)))))
+ ((NOT (< |n| |i|))
+ (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $)
+ |cc| (|shellEntry| $ 65)))
+ (T NIL)))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1)))))
(LETT |l| NIL |ISTRING;split;$CcL;23|)
(LOOP
(COND
((NOT (COND
- ((< |n| |i|) NIL)
- (T (NOT (< (LETT |j|
- (|ISTRING;position;Cc$2I;20| |cc|
- |s| |i| $)
- |ISTRING;split;$CcL;23|)
- (SVREF $ 6))))))
+ ((NOT (< |n| |i|))
+ (NOT (< (LETT |j|
+ (|ISTRING;position;Cc$2I;20|
+ |cc| |s| |i| $)
+ |ISTRING;split;$CcL;23|)
+ (SVREF $ 6))))
+ (T NIL)))
(RETURN NIL))
(T (SEQ (SETQ |l|
(SPADCALL
@@ -400,18 +404,18 @@
(SPADCALL |i| (- |j| 1)
(|shellEntry| $ 24))
$)
- |l| (|shellEntry| $ 72)))
+ |l| (|shellEntry| $ 73)))
(SETQ |i| |j|)
(EXIT (LOOP
(COND
((NOT
(COND
- ((< |n| |i|) NIL)
- (T
+ ((NOT (< |n| |i|))
(SPADCALL
(|ISTRING;elt;$IC;30| |s| |i|
$)
- |cc| (|shellEntry| $ 65)))))
+ |cc| (|shellEntry| $ 65)))
+ (T NIL)))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1))))))))))
(COND
@@ -420,7 +424,7 @@
(SPADCALL
(|ISTRING;elt;$Us$;31| |s|
(SPADCALL |i| |n| (|shellEntry| $ 24)) $)
- |l| (|shellEntry| $ 72)))))
+ |l| (|shellEntry| $ 73)))))
(EXIT (NREVERSE |l|)))))))
(DEFUN |ISTRING;leftTrim;$C$;24| (|s| |c| $)
@@ -428,9 +432,10 @@
(SEQ (LOOP
(COND
((NOT (COND
- ((< |n| |i|) NIL)
- (T (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) |c|
- (|shellEntry| $ 69)))))
+ ((NOT (< |n| |i|))
+ (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) |c|
+ (|shellEntry| $ 70)))
+ (T NIL)))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1)))))
(EXIT (|ISTRING;elt;$Us$;31| |s|
@@ -441,9 +446,10 @@
(SEQ (LOOP
(COND
((NOT (COND
- ((< |n| |i|) NIL)
- (T (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) |cc|
- (|shellEntry| $ 65)))))
+ ((NOT (< |n| |i|))
+ (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) |cc|
+ (|shellEntry| $ 65)))
+ (T NIL)))
(RETURN NIL))
(T (SETQ |i| (+ |i| 1)))))
(EXIT (|ISTRING;elt;$Us$;31| |s|
@@ -456,7 +462,7 @@
((NOT (COND
((NOT (< |j| (SVREF $ 6)))
(SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $) |c|
- (|shellEntry| $ 69)))
+ (|shellEntry| $ 70)))
(T NIL)))
(RETURN NIL))
(T (SETQ |j| (- |j| 1)))))
@@ -559,13 +565,13 @@
(EXIT (COND
((EQL |p| (- |m| 1))
(NOT (NULL (STRING= |pattern| |target|))))
- ((AND (SPADCALL |p| |m| (|shellEntry| $ 87))
+ ((AND (SPADCALL |p| |m| (|shellEntry| $ 88))
(NOT (SPADCALL
(|ISTRING;elt;$Us$;31| |pattern|
(SPADCALL |m| (- |p| 1)
(|shellEntry| $ 24))
$)
- |target| (|shellEntry| $ 88))))
+ |target| (|shellEntry| $ 89))))
NIL)
(T (SEQ (LETT |i| |p| |ISTRING;match?;2$CB;34|)
(LETT |q|
@@ -581,7 +587,7 @@
(LOOP
(COND
((NOT (SPADCALL |q| (- |m| 1)
- (|shellEntry| $ 87)))
+ (|shellEntry| $ 88)))
(RETURN NIL))
(T (SEQ
(LETT |s|
@@ -622,7 +628,7 @@
#3#))))))))))))
(COND
((AND (SPADCALL |p| |n|
- (|shellEntry| $ 87))
+ (|shellEntry| $ 88))
(NOT
(|ISTRING;suffix?;2$B;21|
(|ISTRING;elt;$Us$;31| |pattern|
@@ -649,7 +655,7 @@
(DEFUN |IndexedString;| (|#1|)
(DECLARE (SPECIAL |$ConstructorCache|))
(LET* ((|dv$1| (|devaluate| |#1|))
- (|dv$| (LIST '|IndexedString| |dv$1|)) ($ (|newShell| 100))
+ (|dv$| (LIST '|IndexedString| |dv$1|)) ($ (|newShell| 101))
(|pv$| (|buildPredVector| 0 0
(LIST (OR (AND (|HasCategory| (|Character|)
'(|OrderedSet|))
@@ -721,36 +727,36 @@
|ISTRING;substring?;2$IB;17| |ISTRING;position;2$2I;18|
|ISTRING;position;C$2I;19| (140 . |member?|)
|ISTRING;position;Cc$2I;20| |ISTRING;suffix?;2$B;21|
- |ISTRING;elt;$IC;30| (146 . =) (|List| $$) (152 . |empty|)
- (156 . |concat|) (162 . |reverse!|) (|List| $)
- |ISTRING;split;$CL;22| |ISTRING;split;$CcL;23|
+ (146 . <=) |ISTRING;elt;$IC;30| (152 . =) (|List| $$)
+ (158 . |empty|) (162 . |concat|) (168 . |reverse!|)
+ (|List| $) |ISTRING;split;$CL;22| |ISTRING;split;$CcL;23|
|ISTRING;leftTrim;$C$;24| |ISTRING;leftTrim;$Cc$;25|
|ISTRING;rightTrim;$C$;26| |ISTRING;rightTrim;$Cc$;27|
|ISTRING;copyInto!;2$I$;29| |ISTRING;concat;L$;28|
- (167 . |max|) (|SingleInteger|) |ISTRING;hash;$Si;32|
- |ISTRING;match;2$CNni;33| (173 . ~=) (179 . |prefix?|)
+ (173 . |max|) (|SingleInteger|) |ISTRING;hash;$Si;32|
+ |ISTRING;match;2$CNni;33| (179 . ~=) (185 . |prefix?|)
|ISTRING;match?;2$CB;34| (|List| 8) (|Equation| 8)
- (|List| 91) (|Mapping| 8 8 8) (|InputForm|)
+ (|List| 92) (|Mapping| 8 8 8) (|InputForm|)
(|Mapping| 13 8) (|Mapping| 13 8 8) (|Void|)
(|Union| 8 '"failed") (|List| 10))
- '#(~= 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)
+ '#(~= 191 |upperCase!| 197 |upperCase| 202 |trim| 207 |swap!|
+ 219 |suffix?| 226 |substring?| 232 |split| 239 |sorted?|
+ 251 |sort!| 262 |sort| 273 |size?| 284 |setelt| 290
+ |select| 304 |sample| 310 |rightTrim| 314 |reverse!| 326
+ |reverse| 331 |replace| 336 |removeDuplicates| 343
+ |remove| 348 |reduce| 360 |qsetelt!| 381 |qelt| 388
+ |prefix?| 394 |position| 400 |parts| 433 |new| 438 |more?|
+ 444 |minIndex| 450 |min| 455 |merge| 461 |members| 474
+ |member?| 479 |maxIndex| 485 |max| 490 |match?| 496
+ |match| 503 |map!| 510 |map| 516 |lowerCase!| 529
+ |lowerCase| 534 |less?| 539 |leftTrim| 545 |latex| 557
+ |insert| 562 |indices| 576 |index?| 581 |hash| 587 |first|
+ 592 |find| 597 |fill!| 603 |every?| 609 |eval| 615 |eq?|
+ 641 |entry?| 647 |entries| 653 |empty?| 658 |empty| 663
+ |elt| 667 |delete| 692 |count| 704 |copyInto!| 716 |copy|
+ 723 |convert| 728 |construct| 733 |concat| 738 |coerce|
+ 761 |before?| 771 |any?| 777 >= 783 > 789 = 795 <= 801 <
+ 807 |#| 813)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 6
'(0 0 0 0 0 0 0 5 0 4 5 0 0 0 1 6 0 1 2 3))
@@ -776,8 +782,8 @@
(|Eltable| 10 8) (|Evalable| 8)
(|BasicType|) (|Type|)
(|InnerEvalable| 8 8) (|CoercibleTo| 29)
- (|ConvertibleTo| 94))
- (|makeByteWordVec2| 99
+ (|ConvertibleTo| 95))
+ (|makeByteWordVec2| 100
'(0 10 0 11 2 10 13 0 0 14 0 10 0 21 2
10 0 0 0 22 2 23 0 10 10 24 1 23 0 10
26 1 29 0 28 30 0 33 0 34 1 8 0 0 35
@@ -787,45 +793,45 @@
10 13 0 0 49 2 10 13 0 0 50 0 7 0 51
2 10 0 0 0 52 0 8 0 53 0 54 0 55 2 7
0 0 0 56 2 10 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
- 10 0 0 0 83 2 10 13 0 0 87 2 0 13 0 0
- 88 2 10 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 10
- 10 1 2 0 13 0 0 67 3 0 13 0 0 10 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 10 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 8 0 0 1 2 8 0 8 0 1 2 0 0 95 0 1
- 4 8 8 93 0 8 8 1 3 0 8 93 0 8 1 2 0 8
- 93 0 1 3 0 8 0 10 8 1 2 0 8 0 10 1 2
- 0 13 0 0 88 3 8 10 8 0 10 64 2 8 10 8
- 0 1 3 0 10 33 0 10 66 3 0 10 0 0 10
- 63 2 0 10 95 0 1 1 0 90 0 1 2 0 0 7 8
- 9 2 0 13 0 7 1 1 7 10 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 8 13 8 0 1 1 7 10 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 8 28 0 43 3
- 0 0 8 0 10 1 3 0 0 0 0 10 27 1 0 99 0
- 1 2 0 13 10 0 1 1 8 84 0 85 1 7 8 0 1
- 2 0 98 95 0 1 2 0 0 0 8 1 2 0 13 95 0
- 1 3 11 0 0 90 90 1 3 11 0 0 8 8 1 2
- 11 0 0 92 1 2 11 0 0 91 1 2 0 13 0 0
- 1 2 8 13 8 0 1 1 0 90 0 1 1 0 13 0 15
- 0 0 0 12 2 0 0 0 0 1 2 0 0 0 23 25 2
- 0 8 0 10 68 3 0 8 0 10 8 1 2 0 0 0 10
- 1 2 0 0 0 23 1 2 8 7 8 0 1 2 0 7 95 0
- 1 3 0 0 0 0 10 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 9 29 0 31 1
- 0 0 8 1 2 10 13 0 0 1 2 0 13 95 0 1 2
- 5 13 0 0 1 2 5 13 0 0 1 2 10 13 0 0
- 17 2 5 13 0 0 1 2 5 13 0 0 18 1 0 7 0
- 16)))))
+ 13 0 61 2 33 13 8 0 65 2 10 13 0 0 68
+ 2 8 13 0 0 70 0 71 0 72 2 71 0 2 0 73
+ 1 71 0 0 74 2 10 0 0 0 84 2 10 13 0 0
+ 88 2 0 13 0 0 89 2 10 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 10 10 1 2 0 13 0 0 67 3 0
+ 13 0 0 10 62 2 0 75 0 33 77 2 0 75 0
+ 8 76 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
+ 10 8 59 2 0 0 96 0 1 0 0 0 1 2 0 0 0
+ 8 80 2 0 0 0 33 81 1 0 0 0 1 1 0 0 0
+ 1 3 0 0 0 23 0 57 1 8 0 0 1 2 8 0 8 0
+ 1 2 0 0 96 0 1 4 8 8 94 0 8 8 1 3 0 8
+ 94 0 8 1 2 0 8 94 0 1 3 0 8 0 10 8 1
+ 2 0 8 0 10 1 2 0 13 0 0 89 3 8 10 8 0
+ 10 64 2 8 10 8 0 1 3 0 10 33 0 10 66
+ 3 0 10 0 0 10 63 2 0 10 96 0 1 1 0 91
+ 0 1 2 0 0 7 8 9 2 0 13 0 7 1 1 7 10 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 8 13 8 0 1 1 7 10 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 78 2 0 0 0 33 79 1
+ 8 28 0 43 3 0 0 8 0 10 1 3 0 0 0 0 10
+ 27 1 0 100 0 1 2 0 13 10 0 1 1 8 85 0
+ 86 1 7 8 0 1 2 0 99 96 0 1 2 0 0 0 8
+ 1 2 0 13 96 0 1 3 11 0 0 91 91 1 3 11
+ 0 0 8 8 1 2 11 0 0 93 1 2 11 0 0 92 1
+ 2 0 13 0 0 1 2 8 13 8 0 1 1 0 91 0 1
+ 1 0 13 0 15 0 0 0 12 2 0 0 0 0 1 2 0
+ 0 0 23 25 2 0 8 0 10 69 3 0 8 0 10 8
+ 1 2 0 0 0 10 1 2 0 0 0 23 1 2 8 7 8 0
+ 1 2 0 7 96 0 1 3 0 0 0 0 10 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 75 83 2 0 0 8 0 1 2 0 0 0 8
+ 1 1 9 29 0 31 1 0 0 8 1 2 10 13 0 0 1
+ 2 0 13 96 0 1 2 5 13 0 0 1 2 5 13 0 0
+ 1 2 10 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/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp
index 1fa8e5c4..03d465b5 100644
--- a/src/algebra/strap/LNAGG-.lsp
+++ b/src/algebra/strap/LNAGG-.lsp
@@ -37,25 +37,25 @@
(T NIL)))
(DEFUN |LNAGG-;concat;ASA;3| (|a| |x| $)
- (SPADCALL |a| (SPADCALL 1 |x| (|shellEntry| $ 22))
- (|shellEntry| $ 23)))
+ (SPADCALL |a| (SPADCALL 1 |x| (|shellEntry| $ 21))
+ (|shellEntry| $ 22)))
(DEFUN |LNAGG-;concat;S2A;4| (|x| |y| $)
- (SPADCALL (SPADCALL 1 |x| (|shellEntry| $ 22)) |y|
- (|shellEntry| $ 23)))
+ (SPADCALL (SPADCALL 1 |x| (|shellEntry| $ 21)) |y|
+ (|shellEntry| $ 22)))
(DEFUN |LNAGG-;insert;SAIA;5| (|x| |a| |i| $)
- (SPADCALL (SPADCALL 1 |x| (|shellEntry| $ 22)) |a| |i|
- (|shellEntry| $ 26)))
+ (SPADCALL (SPADCALL 1 |x| (|shellEntry| $ 21)) |a| |i|
+ (|shellEntry| $ 25)))
(DEFUN |LNAGG-;maxIndex;AI;6| (|l| $)
- (+ (- (SPADCALL |l| (|shellEntry| $ 28)) 1)
+ (+ (- (SPADCALL |l| (|shellEntry| $ 27)) 1)
(SPADCALL |l| (|shellEntry| $ 9))))
(DEFUN |LinearAggregate&| (|#1| |#2|)
(LET* ((|dv$1| (|devaluate| |#1|)) (|dv$2| (|devaluate| |#2|))
(|dv$| (LIST '|LinearAggregate&| |dv$1| |dv$2|))
- ($ (|newShell| 33))
+ ($ (|newShell| 32))
(|pv$| (|buildPredVector| 0 0
(LIST (|HasAttribute| |#1| '|shallowlyMutable|)))))
(SETF (|shellEntry| $ 0) |dv$|)
@@ -65,32 +65,32 @@
(SETF (|shellEntry| $ 7) |#2|)
(COND
((|HasAttribute| |#1| '|finiteAggregate|)
- (SETF (|shellEntry| $ 31)
+ (SETF (|shellEntry| $ 30)
(CONS (|dispatchFunction| |LNAGG-;maxIndex;AI;6|) $))))
$))
(MAKEPROP '|LinearAggregate&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|)
(|Integer|) (0 . |minIndex|) (5 . |maxIndex|) (|List| 8)
- |LNAGG-;indices;AL;1| (|Boolean|) (10 . >=) (16 . >)
- (22 . |not|) (27 . |false|) |LNAGG-;index?;IAB;2|
- (|NonNegativeInteger|) (31 . |One|) (35 . |One|)
- (39 . |new|) (45 . |concat|) |LNAGG-;concat;ASA;3|
- |LNAGG-;concat;S2A;4| (51 . |insert|)
- |LNAGG-;insert;SAIA;5| (58 . |#|) (63 . -) (69 . +)
- (75 . |maxIndex|) (|List| $))
- '#(|maxIndex| 80 |insert| 85 |indices| 92 |index?| 97
- |concat| 103)
+ |LNAGG-;indices;AL;1| (|Boolean|) (10 . >=) (16 . <=)
+ (22 . |false|) |LNAGG-;index?;IAB;2|
+ (|NonNegativeInteger|) (26 . |One|) (30 . |One|)
+ (34 . |new|) (40 . |concat|) |LNAGG-;concat;ASA;3|
+ |LNAGG-;concat;S2A;4| (46 . |insert|)
+ |LNAGG-;insert;SAIA;5| (53 . |#|) (58 . -) (64 . +)
+ (70 . |maxIndex|) (|List| $))
+ '#(|maxIndex| 75 |insert| 80 |indices| 87 |index?| 92
+ |concat| 98)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 31
+ (|makeByteWordVec2| 30
'(1 6 8 0 9 1 6 8 0 10 2 8 13 0 0 14 2
- 8 13 0 0 15 1 13 0 0 16 0 13 0 17 0
- 19 0 20 0 8 0 21 2 6 0 19 7 22 2 6 0
- 0 0 23 3 6 0 0 0 8 26 1 6 19 0 28 2 8
- 0 0 0 29 2 8 0 0 0 30 1 0 8 0 31 1 0
- 8 0 31 3 0 0 7 0 8 27 1 0 11 0 12 2 0
- 13 8 0 18 2 0 0 0 7 24 2 0 0 7 0 25)))))
+ 8 13 0 0 15 0 13 0 16 0 18 0 19 0 8 0
+ 20 2 6 0 18 7 21 2 6 0 0 0 22 3 6 0 0
+ 0 8 25 1 6 18 0 27 2 8 0 0 0 28 2 8 0
+ 0 0 29 1 0 8 0 30 1 0 8 0 30 3 0 0 7
+ 0 8 26 1 0 11 0 12 2 0 13 8 0 17 2 0
+ 0 0 7 23 2 0 0 7 0 24)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index 7a8ffae9..875112e0 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -616,26 +616,23 @@
(DEFUN |OUTFORM;vspace;I$;28| (|n| $)
(COND
- ((PLUSP |n|)
- (|OUTFORM;vconcat;3$;50| " " (|OUTFORM;vspace;I$;28| (- |n| 1) $)
- $))
- (T (|OUTFORM;empty;$;73| $))))
+ ((NOT (PLUSP |n|)) (|OUTFORM;empty;$;73| $))
+ (T (|OUTFORM;vconcat;3$;50| " "
+ (|OUTFORM;vspace;I$;28| (- |n| 1) $) $))))
(DEFUN |OUTFORM;hspace;I$;29| (|n| $)
(COND
- ((PLUSP |n|) (|fillerSpaces| |n|))
- (T (|OUTFORM;empty;$;73| $))))
+ ((NOT (PLUSP |n|)) (|OUTFORM;empty;$;73| $))
+ (T (|fillerSpaces| |n|))))
(DEFUN |OUTFORM;rspace;2I$;30| (|n| |m| $)
- (SEQ (COND
- ((PLUSP |n|)
- (COND ((NOT (PLUSP |m|)) (EXIT (|OUTFORM;empty;$;73| $)))))
- (T (EXIT (|OUTFORM;empty;$;73| $))))
- (EXIT (|OUTFORM;vconcat;3$;50| (|OUTFORM;hspace;I$;29| |n| $)
- (|OUTFORM;rspace;2I$;30| |n| (- |m| 1) $) $))))
+ (COND
+ ((OR (NOT (PLUSP |n|)) (NOT (PLUSP |m|))) (|OUTFORM;empty;$;73| $))
+ (T (|OUTFORM;vconcat;3$;50| (|OUTFORM;hspace;I$;29| |n| $)
+ (|OUTFORM;rspace;2I$;30| |n| (- |m| 1) $) $))))
(DEFUN |OUTFORM;matrix;L$;31| (|ll| $)
- (LET ((|lv| (LET ((#0=#:G1529 |ll|) (#1=#:G1528 NIL))
+ (LET ((|lv| (LET ((#0=#:G1528 |ll|) (#1=#:G1527 NIL))
(LOOP
(COND
((ATOM #0#) (RETURN (NREVERSE #1#)))
@@ -658,7 +655,7 @@
(DEFUN |OUTFORM;blankSeparate;L$;35| (|l| $)
(LET ((|c| 'CONCATB) (|l1| NIL))
- (SEQ (LET ((#0=#:G1530 (REVERSE |l|)))
+ (SEQ (LET ((#0=#:G1529 (REVERSE |l|)))
(LOOP
(COND
((ATOM #0#) (RETURN NIL))
@@ -969,7 +966,7 @@
(DEFUN |OutputForm| ()
(DECLARE (SPECIAL |$ConstructorCache|))
- (LET ((#0=#:G1532 (HGET |$ConstructorCache| '|OutputForm|)))
+ (LET ((#0=#:G1531 (HGET |$ConstructorCache| '|OutputForm|)))
(COND
(#0# (|CDRwithIncrement| (CDAR #0#)))
(T (UNWIND-PROTECT
@@ -1009,7 +1006,7 @@
|OUTFORM;left;$I$;23| |OUTFORM;right;$I$;24|
|OUTFORM;center;2$;25| |OUTFORM;left;2$;26|
|OUTFORM;right;2$;27| (|NonNegativeInteger|) (33 . |Zero|)
- (37 . |Zero|) (41 . >) (47 . |One|) (51 . |One|)
+ (37 . |Zero|) (41 . <=) (47 . |One|) (51 . |One|)
|OUTFORM;vspace;I$;28| |OUTFORM;vconcat;3$;50|
|OUTFORM;rspace;2I$;30| (|List| $) (|List| 56)
|OUTFORM;matrix;L$;31| |OUTFORM;pile;L$;32|
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 00:22:55 +0000