From 6fff2c66d36bf2f6cacf1d9086ba6c80eb5f7f64 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Mon, 1 Jun 2009 08:01:00 +0000 Subject: * interp/compiler.boot (compGreaterThan): Remove. * interp/parse.boot (parseGreaterEqual): Likewise. --- src/algebra/strap/ABELGRP-.lsp | 4 +- src/algebra/strap/CHAR.lsp | 3 +- src/algebra/strap/DFLOAT.lsp | 239 +++++++++++++++++----------------- src/algebra/strap/FFIELDC-.lsp | 2 +- src/algebra/strap/FPS-.lsp | 2 +- src/algebra/strap/GCDDOM-.lsp | 73 ++++++----- src/algebra/strap/ILIST.lsp | 4 +- src/algebra/strap/INS-.lsp | 227 +++++++++++++++++---------------- src/algebra/strap/INT.lsp | 92 +++++++------- src/algebra/strap/ISTRING.lsp | 282 ++++++++++++++++++++--------------------- src/algebra/strap/LNAGG-.lsp | 56 ++++---- src/algebra/strap/LSAGG-.lsp | 21 ++- src/algebra/strap/NNI.lsp | 48 +++---- src/algebra/strap/ORDRING-.lsp | 42 +++--- src/algebra/strap/OUTFORM.lsp | 198 ++++++++++++++--------------- src/algebra/strap/PI.lsp | 4 +- src/algebra/strap/POLYCAT-.lsp | 232 ++++++++++++++++----------------- src/algebra/strap/RNS-.lsp | 60 ++++----- src/algebra/strap/SINT.lsp | 4 +- src/algebra/strap/STAGG-.lsp | 18 +-- src/algebra/strap/SYMBOL.lsp | 252 ++++++++++++++++++------------------ src/algebra/strap/URAGG-.lsp | 74 +++++------ 22 files changed, 964 insertions(+), 973 deletions(-) (limited to 'src/algebra/strap') diff --git a/src/algebra/strap/ABELGRP-.lsp b/src/algebra/strap/ABELGRP-.lsp index b25c65a5..c07f070e 100644 --- a/src/algebra/strap/ABELGRP-.lsp +++ b/src/algebra/strap/ABELGRP-.lsp @@ -27,7 +27,7 @@ (DEFUN |ABELGRP-;*;I2S;4| (|n| |x| $) (COND ((ZEROP |n|) (|spadConstant| $ 19)) - ((< 0 |n|) (SPADCALL |n| |x| (|getShellEntry| $ 24))) + ((> |n| 0) (SPADCALL |n| |x| (|getShellEntry| $ 24))) ('T (SPADCALL (- |n|) (SPADCALL |x| (|getShellEntry| $ 7)) (|getShellEntry| $ 24))))) @@ -56,7 +56,7 @@ |ABELGRP-;-;3S;1| (11 . -) (|Union| $ '"failed") |ABELGRP-;subtractIfCan;2SU;2| (|Integer|) (17 . *) (|NonNegativeInteger|) |ABELGRP-;*;Nni2S;3| (|Boolean|) - (23 . |zero?|) (28 . |Zero|) (32 . |Zero|) (36 . <) + (23 . |zero?|) (28 . |Zero|) (32 . |Zero|) (36 . >) (|PositiveInteger|) (|RepeatedDoubling| 6) (42 . |double|) (48 . -) (53 . *)) '#(|subtractIfCan| 59 - 65 * 71) 'NIL diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp index 7bd2bfbe..317ee9de 100644 --- a/src/algebra/strap/CHAR.lsp +++ b/src/algebra/strap/CHAR.lsp @@ -127,8 +127,7 @@ (RETURN (CODE-CHAR (PROG1 (LETT #0# (- |n| 1) |CHAR;index;Pi$;7|) - (|check-subtype| (NOT (< #0# 0)) '(|NonNegativeInteger|) - #0#)))))) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)))))) (DEFUN |CHAR;lookup;$Pi;8| (|c| $) (PROG (#0=#:G1407) diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index 3096aacb..e33128f2 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -97,6 +97,8 @@ |%Boolean|) |DFLOAT;>=;2$B;23|)) +(PUT '|DFLOAT;>=;2$B;23| '|SPADreplace| '>=) + (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|) |DFLOAT;-;2$;24|)) @@ -464,7 +466,7 @@ $) (|getShellEntry| $ 35))) |DFLOAT;bits;Pi;10|) - (|check-subtype| (AND (NOT (< #0# 0)) (< 0 #0#)) + (|check-subtype| (AND (>= #0# 0) (< 0 #0#)) '(|PositiveInteger|) #0#))))))) (DEFUN |DFLOAT;max;$;11| ($) @@ -504,7 +506,9 @@ (DEFUN |DFLOAT;<=;2$B;22| (|x| |y| $) (NOT (> |x| |y|))) -(DEFUN |DFLOAT;>=;2$B;23| (|x| |y| $) (NOT (< |x| |y|))) +(DEFUN |DFLOAT;>=;2$B;23| (|x| |y| $) + (DECLARE (IGNORE $)) + (>= |x| |y|)) (DEFUN |DFLOAT;-;2$;24| (|x| $) (DECLARE (IGNORE $)) (- |x|)) @@ -660,8 +664,7 @@ (|DFLOAT;rationalApproximation;$2NniF;87| |x| (PROG1 (LETT #0# (- (FLOAT-DIGITS 0.0) 1) |DFLOAT;retract;$F;80|) - (|check-subtype| (NOT (< #0# 0)) '(|NonNegativeInteger|) - #0#)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (FLOAT-RADIX 0.0) $)))) (DEFUN |DFLOAT;retractIfCan;$U;81| (|x| $) @@ -671,8 +674,8 @@ (|DFLOAT;rationalApproximation;$2NniF;87| |x| (PROG1 (LETT #0# (- (FLOAT-DIGITS 0.0) 1) |DFLOAT;retractIfCan;$U;81|) - (|check-subtype| (NOT (< #0# 0)) - '(|NonNegativeInteger|) #0#)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) + #0#)) (FLOAT-RADIX 0.0) $))))) (DEFUN |DFLOAT;retract;$I;82| (|x| $) @@ -749,14 +752,21 @@ (LETT BASE (FLOAT-RADIX 0.0) |DFLOAT;rationalApproximation;$2NniF;87|) (EXIT (COND - ((< |ex| 0) + ((>= |ex| 0) + (SPADCALL + (* |nu| + (EXPT BASE + (PROG1 |ex| + (|check-subtype| (>= |ex| 0) + '(|NonNegativeInteger|) |ex|)))) + (|getShellEntry| $ 137))) + ('T (SEQ (LETT |de| (EXPT BASE (PROG1 (LETT #0# (- |ex|) |DFLOAT;rationalApproximation;$2NniF;87|) - (|check-subtype| - (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#))) |DFLOAT;rationalApproximation;$2NniF;87|) (EXIT @@ -805,14 +815,14 @@ (- (* |nu| |q2|) (* |de| |p2|))) (|getShellEntry| $ - 145)) + 146)) (* |de| (ABS |p2|)))) (EXIT (PROGN (LETT #1# (SPADCALL |p2| |q2| (|getShellEntry| $ - 143)) + 144)) |DFLOAT;rationalApproximation;$2NniF;87|) (GO #1#))))) (PROGN @@ -844,16 +854,7 @@ (LETT |t| |#G116| |DFLOAT;rationalApproximation;$2NniF;87|)))) NIL (GO G190) G191 - (EXIT NIL))))))))) - ('T - (SPADCALL - (* |nu| - (EXPT BASE - (PROG1 |ex| - (|check-subtype| - (NOT (< |ex| 0)) - '(|NonNegativeInteger|) |ex|)))) - (|getShellEntry| $ 146))))))) + (EXIT NIL))))))))))))) #1# (EXIT #1#))))) (DEFUN |DFLOAT;**;$F$;88| (|x| |r| $) @@ -862,25 +863,25 @@ (SEQ (EXIT (COND ((ZEROP |x|) (COND - ((SPADCALL |r| (|getShellEntry| $ 147)) - (|error| "0**0 is undefined")) ((SPADCALL |r| (|getShellEntry| $ 148)) + (|error| "0**0 is undefined")) + ((SPADCALL |r| (|getShellEntry| $ 149)) (|error| "division by 0")) ('T 0.0))) - ((OR (SPADCALL |r| (|getShellEntry| $ 147)) + ((OR (SPADCALL |r| (|getShellEntry| $ 148)) (= |x| 1.0)) 1.0) ('T (COND - ((SPADCALL |r| (|getShellEntry| $ 149)) |x|) + ((SPADCALL |r| (|getShellEntry| $ 150)) |x|) ('T (SEQ (LETT |n| (SPADCALL |r| - (|getShellEntry| $ 150)) + (|getShellEntry| $ 151)) |DFLOAT;**;$F$;88|) (LETT |d| (SPADCALL |r| - (|getShellEntry| $ 151)) + (|getShellEntry| $ 152)) |DFLOAT;**;$F$;88|) (EXIT (COND ((MINUSP |x|) @@ -940,7 +941,7 @@ (RETURN (PROGN (LETT |dv$| '(|DoubleFloat|) . #0=(|DoubleFloat|)) - (LETT $ (|newShell| 165) . #0#) + (LETT $ (|newShell| 166) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -1004,48 +1005,48 @@ |DFLOAT;retractIfCan;$U;81| |DFLOAT;retract;$I;82| (|Union| 26 '"failed") |DFLOAT;retractIfCan;$U;83| |DFLOAT;sign;$I;84| (113 . *) (119 . **) (125 . |Zero|) - (129 . |Zero|) (133 . <) (139 . -) (144 . **) (150 . <) - (156 . **) + (129 . |Zero|) (133 . >=) (139 . **) (145 . |coerce|) + (150 . -) (155 . <) (161 . **) (|Record| (|:| |quotient| $) (|:| |remainder| $)) - (162 . |divide|) (168 . =) (174 . /) (180 . |abs|) - (185 . *) (191 . |coerce|) (196 . |zero?|) - (201 . |negative?|) (206 . |one?|) (211 . |numer|) - (216 . |denom|) (221 . |odd?|) |DFLOAT;**;$F$;88| + (167 . |divide|) (173 . =) (179 . /) (185 . |abs|) + (190 . *) (196 . <) (202 . |zero?|) (207 . |negative?|) + (212 . |one?|) (217 . |numer|) (222 . |denom|) + (227 . |odd?|) |DFLOAT;**;$F$;88| (|PatternMatchResult| 113 $) (|Pattern| 113) - (|Factored| $) (|List| $) (|Union| 157 '"failed") + (|Factored| $) (|List| $) (|Union| 158 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 160 '"failed") - (|Record| (|:| |coef| 157) (|:| |generator| $)) + (|Union| 161 '"failed") + (|Record| (|:| |coef| 158) (|:| |generator| $)) (|SparseUnivariatePolynomial| $) (|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $))) - '#(~= 226 |zero?| 232 |wholePart| 237 |unitNormal| 242 - |unitCanonical| 247 |unit?| 252 |truncate| 257 |tanh| 262 - |tan| 267 |subtractIfCan| 272 |squareFreePart| 278 - |squareFree| 283 |sqrt| 288 |sizeLess?| 293 |sinh| 299 - |sin| 304 |sign| 309 |sech| 314 |sec| 319 |sample| 324 - |round| 328 |retractIfCan| 333 |retract| 343 |rem| 353 - |recip| 359 |rationalApproximation| 364 |quo| 377 - |principalIdeal| 383 |prime?| 388 |precision| 393 - |positive?| 397 |pi| 402 |patternMatch| 406 |order| 413 - |one?| 418 |nthRoot| 423 |norm| 429 |negative?| 434 - |multiEuclidean| 439 |min| 445 |max| 455 |mantissa| 465 - |log2| 470 |log10| 475 |log| 480 |lcm| 485 |latex| 496 - |inv| 501 |hash| 506 |gcdPolynomial| 511 |gcd| 517 - |fractionPart| 528 |floor| 533 |float| 538 |factor| 551 - |extendedEuclidean| 556 |exquo| 569 |expressIdealMember| - 575 |exponent| 581 |exp1| 586 |exp| 590 |euclideanSize| - 595 |divide| 600 |digits| 606 |differentiate| 610 |csch| - 621 |csc| 626 |coth| 631 |cot| 636 |cosh| 641 |cos| 646 - |convert| 651 |coerce| 671 |characteristic| 701 |ceiling| - 705 |bits| 710 |before?| 714 |base| 720 |atanh| 724 |atan| - 729 |associates?| 740 |asinh| 746 |asin| 751 |asech| 756 - |asec| 761 |acsch| 766 |acsc| 771 |acoth| 776 |acot| 781 - |acosh| 786 |acos| 791 |abs| 796 |Zero| 801 |One| 805 - |OMwrite| 809 |Gamma| 833 D 838 |Beta| 849 >= 855 > 861 = - 867 <= 873 < 879 / 885 - 897 + 908 ** 914 * 944) + '#(~= 232 |zero?| 238 |wholePart| 243 |unitNormal| 248 + |unitCanonical| 253 |unit?| 258 |truncate| 263 |tanh| 268 + |tan| 273 |subtractIfCan| 278 |squareFreePart| 284 + |squareFree| 289 |sqrt| 294 |sizeLess?| 299 |sinh| 305 + |sin| 310 |sign| 315 |sech| 320 |sec| 325 |sample| 330 + |round| 334 |retractIfCan| 339 |retract| 349 |rem| 359 + |recip| 365 |rationalApproximation| 370 |quo| 383 + |principalIdeal| 389 |prime?| 394 |precision| 399 + |positive?| 403 |pi| 408 |patternMatch| 412 |order| 419 + |one?| 424 |nthRoot| 429 |norm| 435 |negative?| 440 + |multiEuclidean| 445 |min| 451 |max| 461 |mantissa| 471 + |log2| 476 |log10| 481 |log| 486 |lcm| 491 |latex| 502 + |inv| 507 |hash| 512 |gcdPolynomial| 517 |gcd| 523 + |fractionPart| 534 |floor| 539 |float| 544 |factor| 557 + |extendedEuclidean| 562 |exquo| 575 |expressIdealMember| + 581 |exponent| 587 |exp1| 592 |exp| 596 |euclideanSize| + 601 |divide| 606 |digits| 612 |differentiate| 616 |csch| + 627 |csc| 632 |coth| 637 |cot| 642 |cosh| 647 |cos| 652 + |convert| 657 |coerce| 677 |characteristic| 707 |ceiling| + 711 |bits| 716 |before?| 720 |base| 726 |atanh| 730 |atan| + 735 |associates?| 746 |asinh| 752 |asin| 757 |asech| 762 + |asec| 767 |acsch| 772 |acsc| 777 |acoth| 782 |acot| 787 + |acosh| 792 |acos| 797 |abs| 802 |Zero| 807 |One| 811 + |OMwrite| 815 |Gamma| 839 D 844 |Beta| 855 >= 861 > 867 = + 873 <= 879 < 885 / 891 - 903 + 914 ** 920 * 950) '((|approximate| . 0) (|canonicalsClosed| . 0) (|canonicalUnitNormal| . 0) (|noZeroDivisors| . 0) ((|commutative| "*") . 0) (|rightUnitary| . 0) @@ -1113,7 +1114,7 @@ (|HyperbolicFunctionCategory|) (|ArcTrigonometricFunctionCategory|) (|TrigonometricFunctionCategory|) - (|OpenMath|) (|ConvertibleTo| 155) + (|OpenMath|) (|ConvertibleTo| 156) (|RadicalCategory|) (|ConvertibleTo| 113) (|ConvertibleTo| 13) @@ -1121,7 +1122,7 @@ (|CoercibleFrom| $$) (|CoercibleFrom| 26) (|BasicType|) (|CoercibleTo| 48)) - (|makeByteWordVec2| 164 + (|makeByteWordVec2| 165 '(0 6 0 7 2 9 0 8 6 10 1 9 11 0 12 2 9 11 0 13 15 1 9 11 0 16 1 9 11 0 17 0 26 0 30 2 24 19 0 0 31 2 24 0 24 0 32 @@ -1131,61 +1132,61 @@ 13 108 2 107 13 13 13 110 1 113 0 13 114 0 26 0 120 0 24 0 123 2 26 0 26 0 131 2 26 0 0 117 132 0 116 0 133 0 - 117 0 134 2 26 19 0 0 135 1 26 0 0 - 136 2 24 0 0 117 137 2 117 19 0 0 138 - 2 117 0 0 117 139 2 26 140 0 0 141 2 - 26 19 0 0 142 2 116 0 26 26 143 1 26 - 0 0 144 2 26 0 117 0 145 1 116 0 26 - 146 1 116 19 0 147 1 116 19 0 148 1 - 116 19 0 149 1 116 26 0 150 1 116 26 - 0 151 1 26 19 0 152 2 0 19 0 0 1 1 0 - 19 0 100 1 0 26 0 36 1 0 164 0 1 1 0 - 0 0 1 1 0 19 0 1 1 0 0 0 1 1 0 0 0 89 - 1 0 0 0 77 2 0 104 0 0 1 1 0 0 0 1 1 - 0 156 0 1 1 0 0 0 68 2 0 19 0 0 1 1 0 - 0 0 87 1 0 0 0 75 1 0 26 0 130 1 0 0 - 0 92 1 0 0 0 79 0 0 0 1 1 0 0 0 1 1 0 - 125 0 126 1 0 128 0 129 1 0 116 0 124 - 1 0 26 0 127 2 0 0 0 0 1 1 0 104 0 - 105 2 0 116 0 117 119 3 0 116 0 117 - 117 118 2 0 0 0 0 1 1 0 162 157 1 1 0 - 19 0 1 0 0 24 29 1 0 19 0 1 0 0 0 47 - 3 0 154 0 155 154 1 1 0 26 0 43 1 0 - 19 0 101 2 0 0 0 26 1 1 0 0 0 1 1 0 - 19 0 99 2 0 158 157 0 1 0 0 0 39 2 0 - 0 0 0 65 0 0 0 38 2 0 0 0 0 64 1 0 26 - 0 27 1 0 0 0 34 1 0 0 0 69 1 0 0 0 74 - 1 0 0 157 1 2 0 0 0 0 1 1 0 8 0 1 1 0 - 0 0 1 1 0 102 0 103 2 0 163 163 163 1 - 1 0 0 157 1 2 0 0 0 0 1 1 0 0 0 1 1 0 - 0 0 1 3 0 0 26 26 24 112 2 0 0 26 26 - 1 1 0 156 0 1 2 0 159 0 0 1 3 0 161 0 - 0 0 1 2 0 104 0 0 1 2 0 158 157 0 1 1 - 0 26 0 28 0 0 0 46 1 0 0 0 73 1 0 117 - 0 1 2 0 140 0 0 1 0 0 24 1 1 0 0 0 - 106 2 0 0 0 117 1 1 0 0 0 90 1 0 0 0 - 80 1 0 0 0 91 1 0 0 0 78 1 0 0 0 88 1 - 0 0 0 76 1 0 51 0 53 1 0 155 0 1 1 0 - 113 0 115 1 0 13 0 14 1 0 0 116 1 1 0 - 0 26 72 1 0 0 116 1 1 0 0 0 1 1 0 0 - 26 72 1 0 48 0 50 0 0 117 1 1 0 0 0 1 - 0 0 24 37 2 0 19 0 0 1 0 0 24 25 1 0 - 0 0 95 2 0 0 0 0 122 1 0 0 0 83 2 0 - 19 0 0 1 1 0 0 0 93 1 0 0 0 81 1 0 0 - 0 98 1 0 0 0 86 1 0 0 0 96 1 0 0 0 84 - 1 0 0 0 97 1 0 0 0 85 1 0 0 0 94 1 0 - 0 0 82 1 0 0 0 121 0 0 0 23 0 0 0 44 - 2 0 11 9 0 21 3 0 11 9 0 19 22 1 0 8 - 0 18 2 0 8 0 19 20 1 0 0 0 109 1 0 0 - 0 1 2 0 0 0 117 1 2 0 0 0 0 111 2 0 - 19 0 0 58 2 0 19 0 0 55 2 0 19 0 0 66 - 2 0 19 0 0 57 2 0 19 0 0 54 2 0 0 0 - 26 67 2 0 0 0 0 45 2 0 0 0 0 61 1 0 0 - 0 59 2 0 0 0 0 60 2 0 0 0 0 71 2 0 0 - 0 116 153 2 0 0 0 26 70 2 0 0 0 117 1 - 2 0 0 0 24 1 2 0 0 116 0 1 2 0 0 0 - 116 1 2 0 0 0 0 62 2 0 0 26 0 63 2 0 - 0 117 0 1 2 0 0 24 0 35))))) + 117 0 134 2 26 19 0 0 135 2 24 0 0 + 117 136 1 116 0 26 137 1 26 0 0 138 2 + 117 19 0 0 139 2 117 0 0 117 140 2 26 + 141 0 0 142 2 26 19 0 0 143 2 116 0 + 26 26 144 1 26 0 0 145 2 26 0 117 0 + 146 2 26 19 0 0 147 1 116 19 0 148 1 + 116 19 0 149 1 116 19 0 150 1 116 26 + 0 151 1 116 26 0 152 1 26 19 0 153 2 + 0 19 0 0 1 1 0 19 0 100 1 0 26 0 36 1 + 0 165 0 1 1 0 0 0 1 1 0 19 0 1 1 0 0 + 0 1 1 0 0 0 89 1 0 0 0 77 2 0 104 0 0 + 1 1 0 0 0 1 1 0 157 0 1 1 0 0 0 68 2 + 0 19 0 0 1 1 0 0 0 87 1 0 0 0 75 1 0 + 26 0 130 1 0 0 0 92 1 0 0 0 79 0 0 0 + 1 1 0 0 0 1 1 0 125 0 126 1 0 128 0 + 129 1 0 116 0 124 1 0 26 0 127 2 0 0 + 0 0 1 1 0 104 0 105 2 0 116 0 117 119 + 3 0 116 0 117 117 118 2 0 0 0 0 1 1 0 + 163 158 1 1 0 19 0 1 0 0 24 29 1 0 19 + 0 1 0 0 0 47 3 0 155 0 156 155 1 1 0 + 26 0 43 1 0 19 0 101 2 0 0 0 26 1 1 0 + 0 0 1 1 0 19 0 99 2 0 159 158 0 1 0 0 + 0 39 2 0 0 0 0 65 0 0 0 38 2 0 0 0 0 + 64 1 0 26 0 27 1 0 0 0 34 1 0 0 0 69 + 1 0 0 0 74 1 0 0 158 1 2 0 0 0 0 1 1 + 0 8 0 1 1 0 0 0 1 1 0 102 0 103 2 0 + 164 164 164 1 1 0 0 158 1 2 0 0 0 0 1 + 1 0 0 0 1 1 0 0 0 1 3 0 0 26 26 24 + 112 2 0 0 26 26 1 1 0 157 0 1 2 0 160 + 0 0 1 3 0 162 0 0 0 1 2 0 104 0 0 1 2 + 0 159 158 0 1 1 0 26 0 28 0 0 0 46 1 + 0 0 0 73 1 0 117 0 1 2 0 141 0 0 1 0 + 0 24 1 1 0 0 0 106 2 0 0 0 117 1 1 0 + 0 0 90 1 0 0 0 80 1 0 0 0 91 1 0 0 0 + 78 1 0 0 0 88 1 0 0 0 76 1 0 51 0 53 + 1 0 156 0 1 1 0 113 0 115 1 0 13 0 14 + 1 0 0 116 1 1 0 0 26 72 1 0 0 116 1 1 + 0 0 0 1 1 0 0 26 72 1 0 48 0 50 0 0 + 117 1 1 0 0 0 1 0 0 24 37 2 0 19 0 0 + 1 0 0 24 25 1 0 0 0 95 2 0 0 0 0 122 + 1 0 0 0 83 2 0 19 0 0 1 1 0 0 0 93 1 + 0 0 0 81 1 0 0 0 98 1 0 0 0 86 1 0 0 + 0 96 1 0 0 0 84 1 0 0 0 97 1 0 0 0 85 + 1 0 0 0 94 1 0 0 0 82 1 0 0 0 121 0 0 + 0 23 0 0 0 44 2 0 11 9 0 21 3 0 11 9 + 0 19 22 1 0 8 0 18 2 0 8 0 19 20 1 0 + 0 0 109 1 0 0 0 1 2 0 0 0 117 1 2 0 0 + 0 0 111 2 0 19 0 0 58 2 0 19 0 0 55 2 + 0 19 0 0 66 2 0 19 0 0 57 2 0 19 0 0 + 54 2 0 0 0 26 67 2 0 0 0 0 45 2 0 0 0 + 0 61 1 0 0 0 59 2 0 0 0 0 60 2 0 0 0 + 0 71 2 0 0 0 116 154 2 0 0 0 26 70 2 + 0 0 0 117 1 2 0 0 0 24 1 2 0 0 116 0 + 1 2 0 0 0 116 1 2 0 0 0 0 62 2 0 0 26 + 0 63 2 0 0 117 0 1 2 0 0 24 0 35))))) '|lookupComplete|)) (MAKEPROP '|DoubleFloat| 'NILADIC T) diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp index c9d9c3e1..e3efcd38 100644 --- a/src/algebra/strap/FFIELDC-.lsp +++ b/src/algebra/strap/FFIELDC-.lsp @@ -110,7 +110,7 @@ (SPADCALL (PROG1 |i| (|check-subtype| - (AND (NOT (< |i| 0)) (< 0 |i|)) + (AND (>= |i| 0) (< 0 |i|)) '(|PositiveInteger|) |i|)) (|getShellEntry| $ 14)) |FFIELDC-;createPrimitiveElement;S;8|) diff --git a/src/algebra/strap/FPS-.lsp b/src/algebra/strap/FPS-.lsp index 20b4f76e..58461486 100644 --- a/src/algebra/strap/FPS-.lsp +++ b/src/algebra/strap/FPS-.lsp @@ -22,7 +22,7 @@ (|getShellEntry| $ 16)) 13301)) |FPS-;digits;Pi;2|) - (|check-subtype| (AND (NOT (< #0# 0)) (< 0 #0#)) + (|check-subtype| (AND (>= #0# 0) (< 0 #0#)) '(|PositiveInteger|) #0#))))) (DEFUN |FloatingPointSystem&| (|#1|) diff --git a/src/algebra/strap/GCDDOM-.lsp b/src/algebra/strap/GCDDOM-.lsp index 37c12aba..678f4829 100644 --- a/src/algebra/strap/GCDDOM-.lsp +++ b/src/algebra/strap/GCDDOM-.lsp @@ -81,15 +81,15 @@ (SPADCALL |p1| (|getShellEntry| $ 29)) |GCDDOM-;gcdPolynomial;3Sup;4|) (EXIT (COND - ((< 0 |e1|) + ((> |e1| 0) (LETT |p1| (PROG2 (LETT #0# (SPADCALL |p1| (SPADCALL (|spadConstant| $ 16) |e1| - (|getShellEntry| $ 36)) - (|getShellEntry| $ 37)) + (|getShellEntry| $ 34)) + (|getShellEntry| $ 35)) |GCDDOM-;gcdPolynomial;3Sup;4|) (QCDR #0#) (|check-union| (QEQCAR #0# 0) @@ -101,15 +101,15 @@ (SPADCALL |p2| (|getShellEntry| $ 29)) |GCDDOM-;gcdPolynomial;3Sup;4|) (EXIT (COND - ((< 0 |e2|) + ((> |e2| 0) (LETT |p2| (PROG2 (LETT #0# (SPADCALL |p2| (SPADCALL (|spadConstant| $ 16) |e2| - (|getShellEntry| $ 36)) - (|getShellEntry| $ 37)) + (|getShellEntry| $ 34)) + (|getShellEntry| $ 35)) |GCDDOM-;gcdPolynomial;3Sup;4|) (QCDR #0#) (|check-union| (QEQCAR #0# 0) @@ -125,32 +125,32 @@ (LETT |p1| (COND ((OR (EQL (SPADCALL |p1| - (|getShellEntry| $ 39)) + (|getShellEntry| $ 37)) 0) (EQL (SPADCALL |p2| - (|getShellEntry| $ 39)) + (|getShellEntry| $ 37)) 0)) - (SPADCALL |c1| 0 (|getShellEntry| $ 36))) + (SPADCALL |c1| 0 (|getShellEntry| $ 34))) ('T (SEQ (LETT |p| (SPADCALL |p1| |p2| - (|getShellEntry| $ 41)) + (|getShellEntry| $ 39)) |GCDDOM-;gcdPolynomial;3Sup;4|) (EXIT (COND ((EQL (SPADCALL |p| - (|getShellEntry| $ 39)) + (|getShellEntry| $ 37)) 0) (SPADCALL |c1| 0 - (|getShellEntry| $ 36))) + (|getShellEntry| $ 34))) ('T (SEQ (LETT |c2| (SPADCALL (SPADCALL |p1| - (|getShellEntry| $ 42)) + (|getShellEntry| $ 40)) (SPADCALL |p2| - (|getShellEntry| $ 42)) + (|getShellEntry| $ 40)) (|getShellEntry| $ 10)) |GCDDOM-;gcdPolynomial;3Sup;4|) (EXIT @@ -162,10 +162,10 @@ (SPADCALL (SPADCALL |c2| |p| (|getShellEntry| $ - 43)) + 41)) (SPADCALL |p| (|getShellEntry| $ - 42)) + 40)) (|getShellEntry| $ 27)) |GCDDOM-;gcdPolynomial;3Sup;4|) @@ -176,8 +176,8 @@ (|getShellEntry| $ 6)) #0#)) - (|getShellEntry| $ 44)) - (|getShellEntry| $ 43)) + (|getShellEntry| $ 42)) + (|getShellEntry| $ 41)) (|getShellEntry| $ 25)))))))))) |GCDDOM-;gcdPolynomial;3Sup;4|) (EXIT (COND @@ -185,8 +185,8 @@ ('T (SPADCALL (SPADCALL (|spadConstant| $ 16) |e1| - (|getShellEntry| $ 36)) - |p1| (|getShellEntry| $ 46)))))))))))) + (|getShellEntry| $ 34)) + |p1| (|getShellEntry| $ 44)))))))))))) (DEFUN |GcdDomain&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -194,7 +194,7 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|GcdDomain&|)) (LETT |dv$| (LIST '|GcdDomain&| |dv$1|) . #0#) - (LETT $ (|newShell| 49) . #0#) + (LETT $ (|newShell| 47) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -211,28 +211,27 @@ (|SparseUnivariatePolynomial| 6) (46 . |zero?|) (51 . |unitCanonical|) (56 . |content|) (61 . |exquo|) (|NonNegativeInteger|) (67 . |minimumDegree|) - (72 . |Zero|) (76 . |Zero|) (|Integer|) (80 . |Zero|) - (84 . <) (90 . |One|) (94 . |monomial|) (100 . |exquo|) - (106 . |min|) (112 . |degree|) (117 . =) - (123 . |subResultantGcd|) (129 . |leadingCoefficient|) - (134 . *) (140 . |primitivePart|) (145 . |zero?|) - (150 . *) (|SparseUnivariatePolynomial| $) + (72 . |Zero|) (76 . |Zero|) (80 . >) (86 . |One|) + (90 . |monomial|) (96 . |exquo|) (102 . |min|) + (108 . |degree|) (113 . =) (119 . |subResultantGcd|) + (125 . |leadingCoefficient|) (130 . *) + (136 . |primitivePart|) (141 . |zero?|) (146 . *) + (|SparseUnivariatePolynomial| $) |GCDDOM-;gcdPolynomial;3Sup;4|) - '#(|lcm| 156 |gcdPolynomial| 167 |gcd| 173) 'NIL + '#(|lcm| 152 |gcdPolynomial| 163 |gcd| 169) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 48 + (|makeByteWordVec2| 46 '(0 6 0 7 2 6 8 0 0 9 2 6 0 0 0 10 2 6 11 0 0 12 2 6 0 0 0 13 2 6 0 0 0 15 0 6 0 16 4 18 6 17 0 6 6 19 1 23 8 0 24 1 23 0 0 25 1 23 6 0 26 2 23 11 0 6 - 27 1 23 28 0 29 0 23 0 30 0 28 0 31 0 - 32 0 33 2 28 8 0 0 34 0 23 0 35 2 23 - 0 6 28 36 2 23 11 0 0 37 2 28 0 0 0 - 38 1 23 28 0 39 2 28 8 0 0 40 2 23 0 - 0 0 41 1 23 6 0 42 2 23 0 6 0 43 1 23 - 0 0 44 1 28 8 0 45 2 23 0 0 0 46 1 0 - 0 20 21 2 0 0 0 0 14 2 0 47 47 47 48 - 1 0 0 20 22))))) + 27 1 23 28 0 29 0 23 0 30 0 28 0 31 2 + 28 8 0 0 32 0 23 0 33 2 23 0 6 28 34 + 2 23 11 0 0 35 2 28 0 0 0 36 1 23 28 + 0 37 2 28 8 0 0 38 2 23 0 0 0 39 1 23 + 6 0 40 2 23 0 6 0 41 1 23 0 0 42 1 28 + 8 0 43 2 23 0 0 0 44 1 0 0 20 21 2 0 + 0 0 0 14 2 0 45 45 45 46 1 0 0 20 22))))) '|lookupComplete|)) diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index ee920771..774a8248 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -437,7 +437,7 @@ (|ILIST;rest;$Nni$;19| |p| (PROG1 (LETT #0# (- |n| 1) |ILIST;split!;$I$;29|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) $) |ILIST;split!;$I$;29|) @@ -459,7 +459,7 @@ (SEQ (LETT |l| (PROG1 (LETT #0# (QUOTIENT2 |n| 2) |ILIST;mergeSort|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) |ILIST;mergeSort|) (LETT |q| (|ILIST;split!;$I$;29| |p| |l| $) diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp index 20c9737a..f0301013 100644 --- a/src/algebra/strap/INS-.lsp +++ b/src/algebra/strap/INS-.lsp @@ -103,7 +103,7 @@ (NOT (SPADCALL |x| (|getShellEntry| $ 13)))) (DEFUN |INS-;positive?;SB;4| (|x| $) - (SPADCALL (|spadConstant| $ 10) |x| (|getShellEntry| $ 16))) + (SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 16))) (DEFUN |INS-;copy;2S;5| (|x| $) (DECLARE (IGNORE $)) |x|) @@ -125,84 +125,82 @@ (COND ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 27)) (|error| "euclideanSize called on zero")) - ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 16)) - (PROG1 (LETT #0# (- (SPADCALL |x| (|getShellEntry| $ 29))) + ((SPADCALL |x| (|spadConstant| $ 10) (|getShellEntry| $ 28)) + (PROG1 (LETT #0# (- (SPADCALL |x| (|getShellEntry| $ 30))) |INS-;euclideanSize;SNni;9|) - (|check-subtype| (NOT (< #0# 0)) '(|NonNegativeInteger|) - #0#))) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#))) ('T - (PROG1 (LETT #1# (SPADCALL |x| (|getShellEntry| $ 29)) + (PROG1 (LETT #1# (SPADCALL |x| (|getShellEntry| $ 30)) |INS-;euclideanSize;SNni;9|) - (|check-subtype| (NOT (< #1# 0)) '(|NonNegativeInteger|) - #1#))))))) + (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#))))))) (DEFUN |INS-;convert;SF;10| (|x| $) - (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29)) - (|getShellEntry| $ 33))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30)) + (|getShellEntry| $ 34))) (DEFUN |INS-;convert;SDf;11| (|x| $) - (FLOAT (SPADCALL |x| (|getShellEntry| $ 29)) |$DoubleFloatMaximum|)) + (FLOAT (SPADCALL |x| (|getShellEntry| $ 30)) |$DoubleFloatMaximum|)) (DEFUN |INS-;convert;SIf;12| (|x| $) - (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29)) - (|getShellEntry| $ 39))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30)) + (|getShellEntry| $ 40))) (DEFUN |INS-;retract;SI;13| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 29))) + (SPADCALL |x| (|getShellEntry| $ 30))) (DEFUN |INS-;convert;SP;14| (|x| $) - (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29)) - (|getShellEntry| $ 43))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30)) + (|getShellEntry| $ 44))) (DEFUN |INS-;factor;SF;15| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 47))) + (SPADCALL |x| (|getShellEntry| $ 48))) (DEFUN |INS-;squareFree;SF;16| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 50))) + (SPADCALL |x| (|getShellEntry| $ 51))) (DEFUN |INS-;prime?;SB;17| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 53))) + (SPADCALL |x| (|getShellEntry| $ 54))) (DEFUN |INS-;factorial;2S;18| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 56))) + (SPADCALL |x| (|getShellEntry| $ 57))) (DEFUN |INS-;binomial;3S;19| (|n| |m| $) - (SPADCALL |n| |m| (|getShellEntry| $ 58))) + (SPADCALL |n| |m| (|getShellEntry| $ 59))) (DEFUN |INS-;permutation;3S;20| (|n| |m| $) - (SPADCALL |n| |m| (|getShellEntry| $ 60))) + (SPADCALL |n| |m| (|getShellEntry| $ 61))) (DEFUN |INS-;retractIfCan;SU;21| (|x| $) - (CONS 0 (SPADCALL |x| (|getShellEntry| $ 29)))) + (CONS 0 (SPADCALL |x| (|getShellEntry| $ 30)))) (DEFUN |INS-;init;S;22| ($) (|spadConstant| $ 10)) (DEFUN |INS-;nextItem;SU;23| (|n| $) (COND - ((SPADCALL |n| (|getShellEntry| $ 65)) + ((SPADCALL |n| (|getShellEntry| $ 66)) (CONS 0 (|spadConstant| $ 22))) - ((SPADCALL (|spadConstant| $ 10) |n| (|getShellEntry| $ 16)) + ((SPADCALL |n| (|spadConstant| $ 10) (|getShellEntry| $ 16)) (CONS 0 (SPADCALL |n| (|getShellEntry| $ 19)))) ('T (CONS 0 - (SPADCALL (|spadConstant| $ 22) |n| (|getShellEntry| $ 66)))))) + (SPADCALL (|spadConstant| $ 22) |n| (|getShellEntry| $ 67)))))) (DEFUN |INS-;patternMatch;SP2Pmr;24| (|x| |p| |l| $) - (SPADCALL |x| |p| |l| (|getShellEntry| $ 71))) + (SPADCALL |x| |p| |l| (|getShellEntry| $ 72))) (DEFUN |INS-;rational;SF;25| (|x| $) - (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29)) - (|getShellEntry| $ 75))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30)) + (|getShellEntry| $ 76))) (DEFUN |INS-;rationalIfCan;SU;26| (|x| $) (CONS 0 - (SPADCALL (SPADCALL |x| (|getShellEntry| $ 29)) - (|getShellEntry| $ 75)))) + (SPADCALL (SPADCALL |x| (|getShellEntry| $ 30)) + (|getShellEntry| $ 76)))) (DEFUN |INS-;symmetricRemainder;3S;27| (|x| |n| $) (PROG (|r|) (RETURN - (SEQ (LETT |r| (SPADCALL |x| |n| (|getShellEntry| $ 79)) + (SEQ (LETT |r| (SPADCALL |x| |n| (|getShellEntry| $ 80)) |INS-;symmetricRemainder;3S;27|) (EXIT (COND ((SPADCALL |r| (|spadConstant| $ 10) @@ -211,37 +209,38 @@ ('T (SEQ (COND ((SPADCALL |n| (|spadConstant| $ 10) - (|getShellEntry| $ 16)) + (|getShellEntry| $ 28)) (LETT |n| (SPADCALL |n| (|getShellEntry| $ 19)) |INS-;symmetricRemainder;3S;27|))) (EXIT (COND - ((SPADCALL (|spadConstant| $ 10) |r| + ((SPADCALL |r| (|spadConstant| $ 10) (|getShellEntry| $ 16)) (COND - ((SPADCALL |n| + ((SPADCALL (SPADCALL 2 |r| - (|getShellEntry| $ 81)) - (|getShellEntry| $ 16)) + (|getShellEntry| $ 82)) + |n| (|getShellEntry| $ 16)) (SPADCALL |r| |n| - (|getShellEntry| $ 66))) + (|getShellEntry| $ 67))) ('T |r|))) - ((NOT (SPADCALL (|spadConstant| $ 10) + ((NOT (SPADCALL (SPADCALL (SPADCALL 2 |r| - (|getShellEntry| $ 81)) - |n| (|getShellEntry| $ 82)) + (|getShellEntry| $ 82)) + |n| (|getShellEntry| $ 83)) + (|spadConstant| $ 10) (|getShellEntry| $ 16))) (SPADCALL |r| |n| - (|getShellEntry| $ 82))) + (|getShellEntry| $ 83))) ('T |r|))))))))))) (DEFUN |INS-;invmod;3S;28| (|a| |b| $) (PROG (|q| |r| |r1| |c| |c1| |d| |d1|) (RETURN (SEQ (COND - ((SPADCALL |a| (|getShellEntry| $ 84)) - (LETT |a| (SPADCALL |a| |b| (|getShellEntry| $ 85)) + ((SPADCALL |a| (|getShellEntry| $ 85)) + (LETT |a| (SPADCALL |a| |b| (|getShellEntry| $ 86)) |INS-;invmod;3S;28|))) (LETT |c| |a| |INS-;invmod;3S;28|) (LETT |c1| (|spadConstant| $ 22) |INS-;invmod;3S;28|) @@ -249,22 +248,22 @@ (LETT |d1| (|spadConstant| $ 10) |INS-;invmod;3S;28|) (SEQ G190 (COND - ((NULL (NOT (SPADCALL |d| (|getShellEntry| $ 65)))) + ((NULL (NOT (SPADCALL |d| (|getShellEntry| $ 66)))) (GO G191))) (SEQ (LETT |q| - (SPADCALL |c| |d| (|getShellEntry| $ 86)) + (SPADCALL |c| |d| (|getShellEntry| $ 87)) |INS-;invmod;3S;28|) (LETT |r| (SPADCALL |c| (SPADCALL |q| |d| - (|getShellEntry| $ 87)) - (|getShellEntry| $ 66)) + (|getShellEntry| $ 88)) + (|getShellEntry| $ 67)) |INS-;invmod;3S;28|) (LETT |r1| (SPADCALL |c1| (SPADCALL |q| |d1| - (|getShellEntry| $ 87)) - (|getShellEntry| $ 66)) + (|getShellEntry| $ 88)) + (|getShellEntry| $ 67)) |INS-;invmod;3S;28|) (LETT |c| |d| |INS-;invmod;3S;28|) (LETT |c1| |d1| |INS-;invmod;3S;28|) @@ -272,26 +271,26 @@ (EXIT (LETT |d1| |r1| |INS-;invmod;3S;28|))) NIL (GO G190) G191 (EXIT NIL)) (COND - ((NOT (SPADCALL |c| (|getShellEntry| $ 88))) + ((NOT (SPADCALL |c| (|getShellEntry| $ 89))) (EXIT (|error| "inverse does not exist")))) (EXIT (COND - ((SPADCALL |c1| (|getShellEntry| $ 84)) - (SPADCALL |c1| |b| (|getShellEntry| $ 82))) + ((SPADCALL |c1| (|getShellEntry| $ 85)) + (SPADCALL |c1| |b| (|getShellEntry| $ 83))) ('T |c1|))))))) (DEFUN |INS-;powmod;4S;29| (|x| |n| |p| $) (PROG (|y| #0=#:G1484 |z|) (RETURN (SEQ (EXIT (SEQ (COND - ((SPADCALL |x| (|getShellEntry| $ 84)) + ((SPADCALL |x| (|getShellEntry| $ 85)) (LETT |x| (SPADCALL |x| |p| - (|getShellEntry| $ 85)) + (|getShellEntry| $ 86)) |INS-;powmod;4S;29|))) (EXIT (COND - ((SPADCALL |x| (|getShellEntry| $ 65)) + ((SPADCALL |x| (|getShellEntry| $ 66)) (|spadConstant| $ 10)) - ((SPADCALL |n| (|getShellEntry| $ 65)) + ((SPADCALL |n| (|getShellEntry| $ 66)) (|spadConstant| $ 22)) ('T (SEQ (LETT |y| (|spadConstant| $ 22) @@ -305,7 +304,7 @@ (|getShellEntry| $ 13)) (LETT |y| (SPADCALL |y| |z| |p| - (|getShellEntry| $ 90)) + (|getShellEntry| $ 91)) |INS-;powmod;4S;29|))) (EXIT (COND @@ -317,7 +316,7 @@ (|getShellEntry| $ 19)) (|getShellEntry| $ 20)) |INS-;powmod;4S;29|) - (|getShellEntry| $ 65)) + (|getShellEntry| $ 66)) (PROGN (LETT #0# |y| |INS-;powmod;4S;29|) @@ -325,7 +324,7 @@ ('T (LETT |z| (SPADCALL |z| |z| |p| - (|getShellEntry| $ 90)) + (|getShellEntry| $ 91)) |INS-;powmod;4S;29|))))) NIL (GO G190) G191 (EXIT NIL))))))))) #0# (EXIT #0#))))) @@ -336,7 +335,7 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|IntegerNumberSystem&|)) (LETT |dv$| (LIST '|IntegerNumberSystem&| |dv$1|) . #0#) - (LETT $ (|newShell| 92) . #0#) + (LETT $ (|newShell| 93) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -349,70 +348,70 @@ (|NonNegativeInteger|) (0 . |Zero|) |INS-;characteristic;Nni;1| (4 . |Zero|) |INS-;differentiate;2S;2| (|Boolean|) (8 . |odd?|) - (13 . |not|) |INS-;even?;SB;3| (18 . <) + (13 . |not|) |INS-;even?;SB;3| (18 . >) |INS-;positive?;SB;4| |INS-;copy;2S;5| (24 . -) (29 . |shift|) |INS-;bit?;2SB;6| (35 . |One|) (39 . |dec|) |INS-;mask;2S;7| (44 . |true|) |INS-;rational?;SB;8| - (48 . =) (|Integer|) (54 . |convert|) (59 . -) - |INS-;euclideanSize;SNni;9| (|Float|) (64 . |coerce|) - |INS-;convert;SF;10| (|DoubleFloat|) (69 . |coerce|) - |INS-;convert;SDf;11| (|InputForm|) (74 . |convert|) - |INS-;convert;SIf;12| |INS-;retract;SI;13| (|Pattern| 28) - (79 . |coerce|) |INS-;convert;SP;14| (|Factored| 6) - (|IntegerFactorizationPackage| 6) (84 . |factor|) - (|Factored| $) |INS-;factor;SF;15| (89 . |squareFree|) + (48 . =) (54 . <) (|Integer|) (60 . |convert|) (65 . -) + |INS-;euclideanSize;SNni;9| (|Float|) (70 . |coerce|) + |INS-;convert;SF;10| (|DoubleFloat|) (75 . |coerce|) + |INS-;convert;SDf;11| (|InputForm|) (80 . |convert|) + |INS-;convert;SIf;12| |INS-;retract;SI;13| (|Pattern| 29) + (85 . |coerce|) |INS-;convert;SP;14| (|Factored| 6) + (|IntegerFactorizationPackage| 6) (90 . |factor|) + (|Factored| $) |INS-;factor;SF;15| (95 . |squareFree|) |INS-;squareFree;SF;16| (|IntegerPrimesPackage| 6) - (94 . |prime?|) |INS-;prime?;SB;17| - (|IntegerCombinatoricFunctions| 6) (99 . |factorial|) - |INS-;factorial;2S;18| (104 . |binomial|) - |INS-;binomial;3S;19| (110 . |permutation|) - |INS-;permutation;3S;20| (|Union| 28 '"failed") - |INS-;retractIfCan;SU;21| |INS-;init;S;22| (116 . |zero?|) - (121 . -) (|Union| $ '"failed") |INS-;nextItem;SU;23| - (|PatternMatchResult| 28 6) + (100 . |prime?|) |INS-;prime?;SB;17| + (|IntegerCombinatoricFunctions| 6) (105 . |factorial|) + |INS-;factorial;2S;18| (110 . |binomial|) + |INS-;binomial;3S;19| (116 . |permutation|) + |INS-;permutation;3S;20| (|Union| 29 '"failed") + |INS-;retractIfCan;SU;21| |INS-;init;S;22| (122 . |zero?|) + (127 . -) (|Union| $ '"failed") |INS-;nextItem;SU;23| + (|PatternMatchResult| 29 6) (|PatternMatchIntegerNumberSystem| 6) - (127 . |patternMatch|) (|PatternMatchResult| 28 $) - |INS-;patternMatch;SP2Pmr;24| (|Fraction| 28) - (134 . |coerce|) |INS-;rational;SF;25| - (|Union| 74 '"failed") |INS-;rationalIfCan;SU;26| - (139 . |rem|) (|PositiveInteger|) (145 . *) (151 . +) - |INS-;symmetricRemainder;3S;27| (157 . |negative?|) - (162 . |positiveRemainder|) (168 . |quo|) (174 . *) - (180 . |one?|) |INS-;invmod;3S;28| (185 . |mulmod|) + (133 . |patternMatch|) (|PatternMatchResult| 29 $) + |INS-;patternMatch;SP2Pmr;24| (|Fraction| 29) + (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| 192 |squareFree| 198 |retractIfCan| - 203 |retract| 208 |rationalIfCan| 213 |rational?| 218 - |rational| 223 |prime?| 228 |powmod| 233 |positive?| 240 - |permutation| 245 |patternMatch| 251 |nextItem| 258 |mask| - 263 |invmod| 268 |init| 274 |factorial| 278 |factor| 283 - |even?| 288 |euclideanSize| 293 |differentiate| 298 |copy| - 303 |convert| 308 |characteristic| 328 |bit?| 332 - |binomial| 338) + '#(|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) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 91 + (|makeByteWordVec2| 92 '(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 - 12 0 0 27 1 6 28 0 29 1 28 0 0 30 1 - 32 0 28 33 1 35 0 28 36 1 38 0 28 39 - 1 42 0 28 43 1 46 45 6 47 1 46 45 6 - 50 1 52 12 6 53 1 55 6 6 56 2 55 6 6 - 6 58 2 55 6 6 6 60 1 6 12 0 65 2 6 0 - 0 0 66 3 70 69 6 42 69 71 1 74 0 28 - 75 2 6 0 0 0 79 2 6 0 80 0 81 2 6 0 0 - 0 82 1 6 12 0 84 2 6 0 0 0 85 2 6 0 0 - 0 86 2 6 0 0 0 87 1 6 12 0 88 3 6 0 0 - 0 0 90 2 0 0 0 0 83 1 0 48 0 51 1 0 - 62 0 63 1 0 28 0 41 1 0 77 0 78 1 0 - 12 0 26 1 0 74 0 76 1 0 12 0 54 3 0 0 - 0 0 0 91 1 0 12 0 17 2 0 0 0 0 61 3 0 - 72 0 42 72 73 1 0 67 0 68 1 0 0 0 24 - 2 0 0 0 0 89 0 0 0 64 1 0 0 0 57 1 0 - 48 0 49 1 0 12 0 15 1 0 7 0 31 1 0 0 - 0 11 1 0 0 0 18 1 0 35 0 37 1 0 32 0 - 34 1 0 42 0 44 1 0 38 0 40 0 0 7 9 2 - 0 12 0 0 21 2 0 0 0 0 59))))) + 12 0 0 27 2 6 12 0 0 28 1 6 29 0 30 1 + 29 0 0 31 1 33 0 29 34 1 36 0 29 37 1 + 39 0 29 40 1 43 0 29 44 1 47 46 6 48 + 1 47 46 6 51 1 53 12 6 54 1 56 6 6 57 + 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))))) '|lookupComplete|)) diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index 6ec84ec3..2447d8a2 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -160,6 +160,8 @@ (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Boolean|) |INT;>=;2$B;38|)) +(PUT '|INT;>=;2$B;38| '|SPADreplace| '>=) + (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Integer|) |INT;-;2$;39|)) @@ -344,17 +346,10 @@ (INTEGER-LENGTH |a|)) (DEFUN |INT;addmod;4$;20| (|a| |b| |p| $) - (PROG (|c| #0=#:G1432) + (PROG (|c|) (RETURN - (SEQ (EXIT (SEQ (SEQ (LETT |c| (+ |a| |b|) |INT;addmod;4$;20|) - (EXIT (COND - ((NOT (< |c| |p|)) - (PROGN - (LETT #0# (- |c| |p|) - |INT;addmod;4$;20|) - (GO #0#)))))) - (EXIT |c|))) - #0# (EXIT #0#))))) + (SEQ (LETT |c| (+ |a| |b|) |INT;addmod;4$;20|) + (EXIT (COND ((>= |c| |p|) (- |c| |p|)) ('T |c|))))))) (DEFUN |INT;submod;4$;21| (|a| |b| |p| $) (PROG (|c|) @@ -366,14 +361,14 @@ (REMAINDER2 (* |a| |b|) |p|)) (DEFUN |INT;convert;$F;23| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 56))) + (SPADCALL |x| (|getShellEntry| $ 57))) (DEFUN |INT;convert;$Df;24| (|x| $) (DECLARE (IGNORE $)) (FLOAT |x| |$DoubleFloatMaximum|)) (DEFUN |INT;convert;$If;25| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 62))) + (SPADCALL |x| (|getShellEntry| $ 63))) (DEFUN |INT;convert;$S;26| (|x| $) (DECLARE (IGNORE $)) @@ -413,7 +408,7 @@ (DEFUN |INT;<=;2$B;37| (|x| |y| $) (NOT (> |x| |y|))) -(DEFUN |INT;>=;2$B;38| (|x| |y| $) (NOT (< |x| |y|))) +(DEFUN |INT;>=;2$B;38| (|x| |y| $) (DECLARE (IGNORE $)) (>= |x| |y|)) (DEFUN |INT;-;2$;39| (|x| $) (DECLARE (IGNORE $)) (- |x|)) @@ -472,7 +467,7 @@ (SPADCALL |p| (|getShellEntry| $ 107))) (DEFUN |INT;factorPolynomial| (|p| $) - (PROG (|pp| #0=#:G1501) + (PROG (|pp| #0=#:G1500) (RETURN (SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 108)) |INT;factorPolynomial|) @@ -515,7 +510,7 @@ (DEFUN |Integer| () (PROG () (RETURN - (PROG (#0=#:G1526) + (PROG (#0=#:G1525) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|Integer|) |Integer|) @@ -541,7 +536,7 @@ (|haddProp| |$ConstructorCache| '|Integer| NIL (CONS 1 $)) (|stuffDomainSlots| $) (|setShellEntry| $ 84 - (|setShellEntry| $ 52 + (|setShellEntry| $ 53 (CONS (|dispatchFunction| |INT;*;3$;43|) $))) $)))) @@ -567,25 +562,24 @@ (|SingleInteger|) |INT;hash;$Si;14| |INT;negative?;$B;15| (|OutputForm|) (56 . |outputForm|) |INT;coerce;$Of;16| |INT;coerce;2$;17| |INT;convert;2$;18| |INT;length;2$;19| - |INT;addmod;4$;20| |INT;submod;4$;21| NIL |INT;rem;3$;50| - |INT;mulmod;4$;22| (|Float|) (61 . |coerce|) - |INT;convert;$F;23| (|DoubleFloat|) (66 . |coerce|) - |INT;convert;$Df;24| (|InputForm|) (71 . |convert|) - |INT;convert;$If;25| (76 . |string|) |INT;convert;$S;26| - (81 . <) (87 . |concat|) |INT;latex;$S;27| - |INT;positiveRemainder;3$;28| (|Matrix| 17) (|Matrix| $) - |INT;reducedSystem;2M;29| (|Vector| 17) - (|Record| (|:| |mat| 70) (|:| |vec| 73)) (|Vector| $) - |INT;reducedSystem;MVR;30| |INT;abs;2$;31| + |INT;>=;2$B;38| |INT;addmod;4$;20| |INT;submod;4$;21| NIL + |INT;rem;3$;50| |INT;mulmod;4$;22| (|Float|) + (61 . |coerce|) |INT;convert;$F;23| (|DoubleFloat|) + (66 . |coerce|) |INT;convert;$Df;24| (|InputForm|) + (71 . |convert|) |INT;convert;$If;25| (76 . |string|) + |INT;convert;$S;26| (81 . <) (87 . |concat|) + |INT;latex;$S;27| |INT;positiveRemainder;3$;28| + (|Matrix| 17) (|Matrix| $) |INT;reducedSystem;2M;29| + (|Vector| 17) (|Record| (|:| |mat| 71) (|:| |vec| 74)) + (|Vector| $) |INT;reducedSystem;MVR;30| |INT;abs;2$;31| |INT;random;$;32| |INT;random;2$;33| |INT;>;2$B;36| - (93 . |not|) |INT;<=;2$B;37| |INT;>=;2$B;38| NIL - |INT;**;$Nni$;44| |INT;odd?;$B;45| |INT;max;3$;46| - |INT;min;3$;47| + (93 . |not|) |INT;<=;2$B;37| NIL |INT;**;$Nni$;44| + |INT;odd?;$B;45| |INT;max;3$;46| |INT;min;3$;47| (|Record| (|:| |quotient| $) (|:| |remainder| $)) |INT;divide;2$R;48| |INT;quo;3$;49| |INT;shift;3$;51| (|Union| $ '"failed") |INT;recip;$U;52| |INT;gcd;3$;53| (|Record| (|:| |unit| $) (|:| |canonical| $) - (|:| |associate| $)) + (|:| |associate| $)) |INT;unitNormal;$R;54| |INT;unitCanonical;2$;55| (|SparseUnivariatePolynomial| 17) (|List| 99) (|Union| 100 '"failed") @@ -683,11 +677,11 @@ (|LeftLinearSet| 17) (|RealConstant|) (|RetractableTo| 17) (|SetCategory|) (|OpenMath|) (|ConvertibleTo| 14) - (|ConvertibleTo| 55) - (|ConvertibleTo| 58) + (|ConvertibleTo| 56) + (|ConvertibleTo| 59) (|CombinatorialFunctionCategory|) (|ConvertibleTo| 133) - (|ConvertibleTo| 61) + (|ConvertibleTo| 62) (|ConvertibleTo| 17) (|CoercibleFrom| $$) (|CoercibleFrom| 17) (|BasicType|) @@ -697,9 +691,9 @@ 15 2 12 11 0 17 18 1 12 11 0 19 0 20 0 21 2 12 0 14 20 22 1 12 11 0 23 1 12 11 0 24 1 12 11 0 25 0 7 0 32 1 44 - 0 17 45 1 55 0 17 56 1 58 0 17 59 1 - 61 0 17 62 1 14 0 17 64 2 17 9 0 0 66 - 2 14 0 0 0 67 1 9 0 0 81 2 102 101 + 0 17 45 1 56 0 17 57 1 59 0 17 60 1 + 62 0 17 63 1 14 0 17 65 2 17 9 0 0 67 + 2 14 0 0 0 68 1 9 0 0 82 2 102 101 100 99 103 1 106 105 104 107 1 104 0 0 108 1 104 2 0 109 1 110 105 104 111 1 104 0 2 112 2 0 93 0 0 113 1 0 114 @@ -708,38 +702,38 @@ 0 123 1 104 0 0 124 1 126 104 125 127 2 0 9 0 0 1 1 0 9 0 30 1 0 96 0 97 1 0 0 0 98 1 0 9 0 1 2 0 0 0 0 1 2 0 93 - 0 0 1 3 0 0 0 0 0 51 1 0 0 0 1 1 0 + 0 0 1 3 0 0 0 0 0 52 1 0 0 0 1 1 0 114 0 1 2 0 9 0 0 1 1 0 17 0 1 2 0 0 0 0 92 0 0 0 1 1 0 134 0 1 1 0 17 0 1 - 2 0 0 0 0 53 2 0 74 71 75 76 1 0 70 - 71 72 1 0 93 0 94 1 0 131 0 1 1 0 9 0 - 1 1 0 130 0 1 0 0 0 78 1 0 0 0 79 2 0 + 2 0 0 0 0 54 2 0 75 72 76 77 1 0 71 + 72 73 1 0 93 0 94 1 0 131 0 1 1 0 9 0 + 1 1 0 130 0 1 0 0 0 79 1 0 0 0 80 2 0 0 0 0 91 1 0 137 135 1 1 0 9 0 1 3 0 - 0 0 0 0 1 2 0 0 0 0 69 1 0 9 0 1 2 0 + 0 0 0 0 1 2 0 0 0 0 70 1 0 9 0 1 2 0 0 0 0 1 3 0 132 0 133 132 1 1 0 9 0 34 1 0 9 0 86 1 0 93 0 1 1 0 9 0 43 2 - 0 136 135 0 1 3 0 0 0 0 0 54 2 0 0 0 + 0 136 135 0 1 3 0 0 0 0 0 55 2 0 0 0 0 88 2 0 0 0 0 87 1 0 0 0 1 1 0 0 0 49 1 0 0 135 1 2 0 0 0 0 1 1 0 14 0 - 68 2 0 0 0 0 1 0 0 0 1 1 0 0 0 38 1 0 + 69 2 0 0 0 0 1 0 0 0 1 1 0 0 0 38 1 0 41 0 42 2 0 128 128 128 129 1 0 0 135 1 2 0 0 0 0 95 1 0 0 0 1 1 0 114 0 115 3 0 139 0 0 0 1 2 0 140 0 0 1 2 0 93 0 0 113 2 0 136 135 0 1 1 0 9 0 1 1 0 7 0 1 2 0 89 0 0 90 1 0 0 0 1 2 0 0 0 7 1 1 0 0 0 40 1 0 0 0 36 1 0 14 - 0 65 1 0 58 0 60 1 0 55 0 57 1 0 61 0 - 63 1 0 133 0 1 1 0 17 0 48 1 0 0 17 + 0 66 1 0 59 0 61 1 0 56 0 58 1 0 62 0 + 64 1 0 133 0 1 1 0 17 0 48 1 0 0 17 47 1 0 0 0 1 1 0 0 17 47 1 0 44 0 46 0 0 7 1 2 0 9 0 0 1 2 0 0 0 0 1 2 0 9 0 0 1 0 0 0 35 2 0 9 0 0 1 3 0 0 0 0 - 0 50 1 0 0 0 77 0 0 0 6 0 0 0 31 3 0 + 0 51 1 0 0 0 78 0 0 0 6 0 0 0 31 3 0 11 12 0 9 29 2 0 14 0 9 27 2 0 11 12 0 28 1 0 14 0 26 1 0 0 0 1 2 0 0 0 7 - 1 2 0 9 0 0 83 2 0 9 0 0 80 2 0 9 0 0 - 33 2 0 9 0 0 82 2 0 9 0 0 10 1 0 0 0 + 1 2 0 9 0 0 50 2 0 9 0 0 81 2 0 9 0 0 + 33 2 0 9 0 0 83 2 0 9 0 0 10 1 0 0 0 16 2 0 0 0 0 39 2 0 0 0 0 37 2 0 0 0 - 7 85 2 0 0 0 141 1 2 0 0 0 0 52 2 0 0 + 7 85 2 0 0 0 141 1 2 0 0 0 0 53 2 0 0 17 0 84 2 0 0 7 0 1 2 0 0 141 0 1))))) '|lookupComplete|)) diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp index f0cba6fe..53fd9c9e 100644 --- a/src/algebra/strap/ISTRING.lsp +++ b/src/algebra/strap/ISTRING.lsp @@ -200,15 +200,15 @@ (|getShellEntry| $ 6)))) |ISTRING;replace;$Us2$;15|) (COND - ((OR (OR (< |l| 0) (NOT (< |h| |m|))) (< |h| (- |l| 1))) + ((OR (OR (< |l| 0) (>= |h| |m|)) (< |h| (- |l| 1))) (EXIT (|error| "index out of range")))) (LETT |r| (MAKE-FULL-CVEC (PROG1 (LETT #0# (+ (- |m| (+ (- |h| |l|) 1)) |n|) |ISTRING;replace;$Us2$;15|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (SPADCALL (|getShellEntry| $ 52))) + (SPADCALL (|getShellEntry| $ 53))) |ISTRING;replace;$Us2$;15|) (SEQ (LETT |i| 0 |ISTRING;replace;$Us2$;15|) (LETT #1# (- |l| 1) |ISTRING;replace;$Us2$;15|) @@ -247,7 +247,7 @@ (DEFUN |ISTRING;setelt;$I2C;16| (|s| |i| |c| $) (SEQ (COND ((OR (< |i| (|getShellEntry| $ 6)) - (< (SPADCALL |s| (|getShellEntry| $ 47)) |i|)) + (> |i| (SPADCALL |s| (|getShellEntry| $ 47)))) (|error| "index out of range")) ('T (SEQ (QESET |s| (- |i| (|getShellEntry| $ 6)) |c|) @@ -266,7 +266,7 @@ (EXIT (COND ((< |startpos| 0) (|error| "index out of bounds")) - ((< (- |nw| |startpos|) |np|) 'NIL) + ((> |np| (- |nw| |startpos|)) 'NIL) ('T (SEQ (SEQ (EXIT @@ -312,7 +312,7 @@ |ISTRING;position;2$2I;18|) (EXIT (COND ((< |startpos| 0) (|error| "index out of bounds")) - ((NOT (< |startpos| (QCSIZE |t|))) + ((>= |startpos| (QCSIZE |t|)) (- (|getShellEntry| $ 6) 1)) ('T (SEQ (LETT |r| (STRPOS |s| |t| |startpos| NIL) @@ -331,7 +331,7 @@ (EXIT (COND ((< |startpos| 0) (|error| "index out of bounds")) - ((NOT (< |startpos| (QCSIZE |t|))) + ((>= |startpos| (QCSIZE |t|)) (- (|getShellEntry| $ 6) 1)) ('T (SEQ (SEQ @@ -367,7 +367,7 @@ (EXIT (COND ((< |startpos| 0) (|error| "index out of bounds")) - ((NOT (< |startpos| (QCSIZE |t|))) + ((>= |startpos| (QCSIZE |t|)) (- (|getShellEntry| $ 6) 1)) ('T (SEQ (SEQ @@ -382,7 +382,7 @@ (EXIT (COND ((SPADCALL (CHAR |t| |r|) |cc| - (|getShellEntry| $ 64)) + (|getShellEntry| $ 66)) (PROGN (LETT #1# (+ |r| @@ -396,14 +396,14 @@ #1# (EXIT #1#))))) (DEFUN |ISTRING;suffix?;2$B;21| (|s| |t| $) - (PROG (|n| |m|) + (PROG (|m| |n|) (RETURN - (SEQ (LETT |n| (SPADCALL |t| (|getShellEntry| $ 47)) + (SEQ (LETT |m| (SPADCALL |s| (|getShellEntry| $ 47)) |ISTRING;suffix?;2$B;21|) - (LETT |m| (SPADCALL |s| (|getShellEntry| $ 47)) + (LETT |n| (SPADCALL |t| (|getShellEntry| $ 47)) |ISTRING;suffix?;2$B;21|) (EXIT (COND - ((< |n| |m|) 'NIL) + ((> |m| |n|) 'NIL) ('T (|ISTRING;substring?;2$IB;17| |s| |t| (- (+ (|getShellEntry| $ 6) |n|) |m|) $)))))))) @@ -418,23 +418,23 @@ (COND ((OR (> |i| |n|) (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) - |c| (|getShellEntry| $ 68)))) + |c| (|getShellEntry| $ 70)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) |ISTRING;split;$CL;22|) (GO G190) G191 (EXIT NIL)) - (LETT |l| (SPADCALL (|getShellEntry| $ 70)) + (LETT |l| (SPADCALL (|getShellEntry| $ 72)) |ISTRING;split;$CL;22|) (SEQ G190 (COND ((NULL (COND - ((< |n| |i|) 'NIL) + ((> |i| |n|) 'NIL) ('T - (NOT (< (LETT |j| - (|ISTRING;position;C$2I;19| |c| - |s| |i| $) - |ISTRING;split;$CL;22|) - (|getShellEntry| $ 6)))))) + (>= (LETT |j| + (|ISTRING;position;C$2I;19| |c| + |s| |i| $) + |ISTRING;split;$CL;22|) + (|getShellEntry| $ 6))))) (GO G191))) (SEQ (LETT |l| (SPADCALL @@ -442,7 +442,7 @@ (SPADCALL |i| (- |j| 1) (|getShellEntry| $ 24)) $) - |l| (|getShellEntry| $ 72)) + |l| (|getShellEntry| $ 73)) |ISTRING;split;$CL;22|) (EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CL;22|) G190 @@ -451,7 +451,7 @@ (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) - |c| (|getShellEntry| $ 68)))) + |c| (|getShellEntry| $ 70)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) @@ -459,15 +459,15 @@ (GO G190) G191 (EXIT NIL)))) NIL (GO G190) G191 (EXIT NIL)) (COND - ((NOT (< |n| |i|)) + ((NOT (> |i| |n|)) (LETT |l| (SPADCALL (|ISTRING;elt;$Us$;31| |s| (SPADCALL |i| |n| (|getShellEntry| $ 24)) $) - |l| (|getShellEntry| $ 72)) + |l| (|getShellEntry| $ 73)) |ISTRING;split;$CL;22|))) - (EXIT (SPADCALL |l| (|getShellEntry| $ 73))))))) + (EXIT (SPADCALL |l| (|getShellEntry| $ 74))))))) (DEFUN |ISTRING;split;$CcL;23| (|s| |cc| $) (PROG (|n| |j| |i| |l|) @@ -480,23 +480,23 @@ (COND ((OR (> |i| |n|) (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) - |cc| (|getShellEntry| $ 64)))) + |cc| (|getShellEntry| $ 66)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) |ISTRING;split;$CcL;23|) (GO G190) G191 (EXIT NIL)) - (LETT |l| (SPADCALL (|getShellEntry| $ 70)) + (LETT |l| (SPADCALL (|getShellEntry| $ 72)) |ISTRING;split;$CcL;23|) (SEQ G190 (COND ((NULL (COND - ((< |n| |i|) 'NIL) + ((> |i| |n|) 'NIL) ('T - (NOT (< (LETT |j| - (|ISTRING;position;Cc$2I;20| |cc| - |s| |i| $) - |ISTRING;split;$CcL;23|) - (|getShellEntry| $ 6)))))) + (>= (LETT |j| + (|ISTRING;position;Cc$2I;20| |cc| + |s| |i| $) + |ISTRING;split;$CcL;23|) + (|getShellEntry| $ 6))))) (GO G191))) (SEQ (LETT |l| (SPADCALL @@ -504,7 +504,7 @@ (SPADCALL |i| (- |j| 1) (|getShellEntry| $ 24)) $) - |l| (|getShellEntry| $ 72)) + |l| (|getShellEntry| $ 73)) |ISTRING;split;$CcL;23|) (EXIT (SEQ (LETT |i| |j| |ISTRING;split;$CcL;23|) G190 @@ -513,7 +513,7 @@ (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) - |cc| (|getShellEntry| $ 64)))) + |cc| (|getShellEntry| $ 66)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) @@ -521,15 +521,15 @@ (GO G190) G191 (EXIT NIL)))) NIL (GO G190) G191 (EXIT NIL)) (COND - ((NOT (< |n| |i|)) + ((NOT (> |i| |n|)) (LETT |l| (SPADCALL (|ISTRING;elt;$Us$;31| |s| (SPADCALL |i| |n| (|getShellEntry| $ 24)) $) - |l| (|getShellEntry| $ 72)) + |l| (|getShellEntry| $ 73)) |ISTRING;split;$CcL;23|))) - (EXIT (SPADCALL |l| (|getShellEntry| $ 73))))))) + (EXIT (SPADCALL |l| (|getShellEntry| $ 74))))))) (DEFUN |ISTRING;leftTrim;$C$;24| (|s| |c| $) (PROG (|n| |i|) @@ -542,7 +542,7 @@ (COND ((OR (> |i| |n|) (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) - |c| (|getShellEntry| $ 68)))) + |c| (|getShellEntry| $ 70)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) |ISTRING;leftTrim;$C$;24|) @@ -561,7 +561,7 @@ (COND ((OR (> |i| |n|) (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |i| $) - |cc| (|getShellEntry| $ 64)))) + |cc| (|getShellEntry| $ 66)))) (GO G191))) (SEQ (EXIT 0)) (LETT |i| (+ |i| 1) |ISTRING;leftTrim;$Cc$;25|) @@ -580,7 +580,7 @@ (COND ((OR (< |j| #0#) (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $) - |c| (|getShellEntry| $ 68)))) + |c| (|getShellEntry| $ 70)))) (GO G191))) (SEQ (EXIT 0)) (LETT |j| (+ |j| -1) |ISTRING;rightTrim;$C$;26|) @@ -601,7 +601,7 @@ (COND ((OR (< |j| #0#) (NULL (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $) - |cc| (|getShellEntry| $ 64)))) + |cc| (|getShellEntry| $ 66)))) (GO G191))) (SEQ (EXIT 0)) (LETT |j| (+ |j| -1) |ISTRING;rightTrim;$Cc$;27|) @@ -644,7 +644,7 @@ (LETT #0# (CDR #0#) |ISTRING;concat;L$;28|) (GO G190) G191 (EXIT NIL)) (COND (#3# #2#) ('T 0))) - (SPADCALL (|getShellEntry| $ 52))) + (SPADCALL (|getShellEntry| $ 53))) |ISTRING;concat;L$;28|) (LETT |i| (|getShellEntry| $ 6) |ISTRING;concat;L$;28|) (SEQ (LETT |s| NIL |ISTRING;concat;L$;28|) @@ -670,14 +670,14 @@ (LETT |s| (- |s| (|getShellEntry| $ 6)) |ISTRING;copyInto!;2$I$;29|) (COND - ((OR (< |s| 0) (< |n| (+ |s| |m|))) + ((OR (< |s| 0) (> (+ |s| |m|) |n|)) (EXIT (|error| "index out of range")))) (RPLACSTR |y| |s| |m| |x| 0 |m|) (EXIT |y|))))) (DEFUN |ISTRING;elt;$IC;30| (|s| |i| $) (COND ((OR (< |i| (|getShellEntry| $ 6)) - (< (SPADCALL |s| (|getShellEntry| $ 47)) |i|)) + (> |i| (SPADCALL |s| (|getShellEntry| $ 47)))) (|error| "index out of range")) ('T (CHAR |s| (- |i| (|getShellEntry| $ 6)))))) @@ -698,7 +698,7 @@ (|getShellEntry| $ 6)))) |ISTRING;elt;$Us$;31|) (COND - ((OR (< |l| 0) (NOT (< |h| (QCSIZE |s|)))) + ((OR (< |l| 0) (>= |h| (QCSIZE |s|))) (EXIT (|error| "index out of bound")))) (EXIT (SUBSTRING |s| |l| (MAX 0 (+ (- |h| |l|) 1)))))))) @@ -712,23 +712,23 @@ (SPADCALL (|ISTRING;elt;$IC;30| |s| (|getShellEntry| $ 6) $) - (|getShellEntry| $ 88))) + (|getShellEntry| $ 89))) ('T (* (* (SPADCALL (|ISTRING;elt;$IC;30| |s| (|getShellEntry| $ 6) $) - (|getShellEntry| $ 88)) + (|getShellEntry| $ 89)) (SPADCALL (|ISTRING;elt;$IC;30| |s| (- (+ (|getShellEntry| $ 6) |n|) 1) $) - (|getShellEntry| $ 88))) + (|getShellEntry| $ 89))) (SPADCALL (|ISTRING;elt;$IC;30| |s| (+ (|getShellEntry| $ 6) (QUOTIENT2 |n| 2)) $) - (|getShellEntry| $ 88)))))))))) + (|getShellEntry| $ 89)))))))))) (DEFUN |ISTRING;match;2$CNni;33| (|pattern| |target| |wildcard| $) (|stringMatch| |pattern| |target| (CHARACTER |wildcard|))) @@ -750,7 +750,7 @@ |ISTRING;match?;2$CB;34|) $) |ISTRING;match?;2$CB;34|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) |ISTRING;match?;2$CB;34|) (EXIT (COND @@ -759,7 +759,7 @@ ('T (SEQ (COND ((SPADCALL |p| |m| - (|getShellEntry| $ 93)) + (|getShellEntry| $ 94)) (COND ((NOT (SPADCALL @@ -769,7 +769,7 @@ (|getShellEntry| $ 24)) $) |target| - (|getShellEntry| $ 94))) + (|getShellEntry| $ 95))) (EXIT 'NIL))))) (LETT |i| |p| |ISTRING;match?;2$CB;34|) @@ -780,14 +780,14 @@ |dontcare| |pattern| (+ |p| 1) $) |ISTRING;match?;2$CB;34|) - (|check-subtype| (NOT (< #1# 0)) + (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#)) |ISTRING;match?;2$CB;34|) (SEQ G190 (COND ((NULL (SPADCALL |q| (- |m| 1) - (|getShellEntry| $ 93))) + (|getShellEntry| $ 94))) (GO G191))) (SEQ (LETT |s| @@ -802,8 +802,7 @@ (|ISTRING;position;2$2I;18| |s| |target| |i| $) |ISTRING;match?;2$CB;34|) - (|check-subtype| - (NOT (< #2# 0)) + (|check-subtype| (>= #2# 0) '(|NonNegativeInteger|) #2#)) |ISTRING;match?;2$CB;34|) (EXIT @@ -829,14 +828,14 @@ (+ |q| 1) $) |ISTRING;match?;2$CB;34|) (|check-subtype| - (NOT (< #4# 0)) + (>= #4# 0) '(|NonNegativeInteger|) #4#)) |ISTRING;match?;2$CB;34|))))))) NIL (GO G190) G191 (EXIT NIL)) (COND ((SPADCALL |p| |n| - (|getShellEntry| $ 93)) + (|getShellEntry| $ 94)) (COND ((NOT (|ISTRING;suffix?;2$B;21| @@ -876,7 +875,7 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|IndexedString|)) (LETT |dv$| (LIST '|IndexedString| |dv$1|) . #0#) - (LETT $ (|newShell| 106) . #0#) + (LETT $ (|newShell| 107) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| @@ -936,44 +935,45 @@ |ISTRING;lowerCase!;2$;13| (60 . |concat|) |ISTRING;latex;$S;14| (66 . |lo|) (71 . |hasHi|) (76 . |hi|) (81 . |maxIndex|) (86 . |Zero|) (90 . <) - (96 . |One|) (100 . +) (106 . |space|) (|SingleInteger|) - (110 . |Zero|) (114 . |One|) |ISTRING;replace;$Us2$;15| - |ISTRING;setelt;$I2C;16| (118 . |false|) (122 . |true|) + (96 . >=) (102 . |One|) (106 . +) (112 . |space|) + (|SingleInteger|) (116 . |Zero|) (120 . |One|) + |ISTRING;replace;$Us2$;15| (124 . >) + |ISTRING;setelt;$I2C;16| (130 . |false|) (134 . |true|) |ISTRING;substring?;2$IB;17| |ISTRING;position;2$2I;18| - (126 . -) |ISTRING;position;C$2I;19| (132 . |member?|) + (138 . -) |ISTRING;position;C$2I;19| (144 . |member?|) |ISTRING;position;Cc$2I;20| |ISTRING;suffix?;2$B;21| - |ISTRING;elt;$IC;30| (138 . =) (|List| $$) (144 . |empty|) - (148 . |not|) (153 . |concat|) (159 . |reverse!|) - (|List| $) |ISTRING;split;$CL;22| |ISTRING;split;$CcL;23| + |ISTRING;elt;$IC;30| (150 . =) (|List| $$) (156 . |empty|) + (160 . |concat|) (166 . |reverse!|) (|List| $) + |ISTRING;split;$CL;22| |ISTRING;split;$CcL;23| |ISTRING;leftTrim;$C$;24| |ISTRING;leftTrim;$Cc$;25| - (164 . -) |ISTRING;rightTrim;$C$;26| - |ISTRING;rightTrim;$Cc$;27| (169 . +) + (171 . -) |ISTRING;rightTrim;$C$;26| + |ISTRING;rightTrim;$Cc$;27| (176 . +) |ISTRING;copyInto!;2$I$;29| |ISTRING;concat;L$;28| - (175 . |max|) (181 . |zero?|) (186 . |one?|) (191 . |ord|) - (196 . *) (202 . |quo|) |ISTRING;hash;$I;32| - |ISTRING;match;2$CNni;33| (208 . ~=) (214 . |prefix?|) + (182 . |max|) (188 . |zero?|) (193 . |one?|) (198 . |ord|) + (203 . *) (209 . |quo|) |ISTRING;hash;$I;32| + |ISTRING;match;2$CNni;33| (215 . ~=) (221 . |prefix?|) |ISTRING;match?;2$CB;34| (|List| 8) (|Equation| 8) - (|List| 97) (|Mapping| 8 8 8) (|InputForm|) + (|List| 98) (|Mapping| 8 8 8) (|InputForm|) (|Mapping| 13 8) (|Mapping| 13 8 8) (|Void|) (|Union| 8 '"failed") (|List| 11)) - '#(~= 220 |upperCase!| 226 |upperCase| 231 |trim| 236 |swap!| - 248 |suffix?| 255 |substring?| 261 |split| 268 |sorted?| - 280 |sort!| 291 |sort| 302 |size?| 313 |setelt| 319 - |select| 333 |sample| 339 |rightTrim| 343 |reverse!| 355 - |reverse| 360 |replace| 365 |removeDuplicates| 372 - |remove| 377 |reduce| 389 |qsetelt!| 410 |qelt| 417 - |prefix?| 423 |position| 429 |parts| 462 |new| 467 |more?| - 473 |minIndex| 479 |min| 484 |merge| 490 |members| 503 - |member?| 508 |maxIndex| 514 |max| 519 |match?| 525 - |match| 532 |map!| 539 |map| 545 |lowerCase!| 558 - |lowerCase| 563 |less?| 568 |leftTrim| 574 |latex| 586 - |insert| 591 |indices| 605 |index?| 610 |hash| 616 |first| - 626 |find| 631 |fill!| 637 |every?| 643 |eval| 649 |eq?| - 675 |entry?| 681 |entries| 687 |empty?| 692 |empty| 697 - |elt| 701 |delete| 726 |count| 738 |copyInto!| 750 |copy| - 757 |convert| 762 |construct| 767 |concat| 772 |coerce| - 795 |before?| 805 |any?| 811 >= 817 > 823 = 829 <= 835 < - 841 |#| 847) + '#(~= 227 |upperCase!| 233 |upperCase| 238 |trim| 243 |swap!| + 255 |suffix?| 262 |substring?| 268 |split| 275 |sorted?| + 287 |sort!| 298 |sort| 309 |size?| 320 |setelt| 326 + |select| 340 |sample| 346 |rightTrim| 350 |reverse!| 362 + |reverse| 367 |replace| 372 |removeDuplicates| 379 + |remove| 384 |reduce| 396 |qsetelt!| 417 |qelt| 424 + |prefix?| 430 |position| 436 |parts| 469 |new| 474 |more?| + 480 |minIndex| 486 |min| 491 |merge| 497 |members| 510 + |member?| 515 |maxIndex| 521 |max| 526 |match?| 532 + |match| 539 |map!| 546 |map| 552 |lowerCase!| 565 + |lowerCase| 570 |less?| 575 |leftTrim| 581 |latex| 593 + |insert| 598 |indices| 612 |index?| 617 |hash| 623 |first| + 633 |find| 638 |fill!| 644 |every?| 650 |eval| 656 |eq?| + 682 |entry?| 688 |entries| 694 |empty?| 699 |empty| 704 + |elt| 708 |delete| 733 |count| 745 |copyInto!| 757 |copy| + 764 |convert| 769 |construct| 774 |concat| 779 |coerce| + 802 |before?| 812 |any?| 818 >= 824 > 830 = 836 <= 842 < + 848 |#| 854) '((|shallowlyMutable| . 0) (|finiteAggregate| . 0)) (CONS (|makeByteWordVec2| 5 '(0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4)) @@ -996,60 +996,60 @@ (|EltableAggregate| 11 8) (|Evalable| 8) (|SetCategory|) (|Type|) (|Eltable| 11 8) (|InnerEvalable| 8 8) - (|CoercibleTo| 29) (|ConvertibleTo| 100) + (|CoercibleTo| 29) (|ConvertibleTo| 101) (|BasicType|)) - (|makeByteWordVec2| 105 + (|makeByteWordVec2| 106 '(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 2 0 0 36 0 37 0 33 0 39 1 8 0 0 40 2 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 0 7 0 50 2 11 0 0 0 51 0 - 8 0 52 0 53 0 54 0 53 0 55 0 13 0 58 - 0 13 0 59 2 53 0 0 0 62 2 33 13 8 0 - 64 2 8 13 0 0 68 0 69 0 70 1 13 0 0 - 71 2 69 0 2 0 72 1 69 0 0 73 1 53 0 0 - 79 2 7 0 0 0 82 2 11 0 0 0 85 1 11 13 - 0 86 1 11 13 0 87 1 8 7 0 88 2 11 0 - 11 0 89 2 11 0 0 0 90 2 11 13 0 0 93 - 2 0 13 0 0 94 2 7 13 0 0 1 1 0 0 0 38 - 1 0 0 0 1 2 0 0 0 33 1 2 0 0 0 8 1 3 - 0 103 0 11 11 1 2 0 13 0 0 66 3 0 13 - 0 0 11 60 2 0 74 0 8 75 2 0 74 0 33 - 76 1 5 13 0 1 2 0 13 102 0 1 1 5 0 0 - 1 2 0 0 102 0 1 1 5 0 0 1 2 0 0 102 0 - 1 2 0 13 0 7 1 3 0 8 0 23 8 1 3 0 8 0 - 11 8 57 2 0 0 101 0 1 0 0 0 1 2 0 0 0 - 33 81 2 0 0 0 8 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 101 0 1 4 7 8 99 0 8 8 1 2 0 - 8 99 0 1 3 0 8 99 0 8 1 3 0 8 0 11 8 - 1 2 0 8 0 11 1 2 0 13 0 0 94 2 7 11 8 - 0 1 3 7 11 8 0 11 63 3 0 11 0 0 11 61 - 3 0 11 33 0 11 65 2 0 11 101 0 1 1 0 - 96 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 - 102 0 0 1 1 0 96 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 95 3 - 0 7 0 0 8 92 2 0 0 36 0 37 3 0 0 99 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 33 78 2 0 0 0 8 - 77 1 7 28 0 43 3 0 0 0 0 11 27 3 0 0 - 8 0 11 1 1 0 105 0 1 2 0 13 11 0 1 1 - 7 53 0 1 1 0 11 0 91 1 6 8 0 1 2 0 - 104 101 0 1 2 0 0 0 8 1 2 0 13 101 0 - 1 3 9 0 0 96 96 1 3 9 0 0 8 8 1 2 9 0 - 0 98 1 2 9 0 0 97 1 2 0 13 0 0 1 2 7 - 13 8 0 1 1 0 96 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 23 1 2 0 - 0 0 11 1 2 7 7 8 0 1 2 0 7 101 0 1 3 - 0 0 0 0 11 83 1 0 0 0 20 1 3 100 0 1 - 1 0 0 96 1 1 0 0 74 84 2 0 0 8 0 1 2 - 0 0 0 0 19 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 101 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))))) + 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 0 54 + 0 56 2 11 13 0 0 58 0 13 0 60 0 13 0 + 61 2 54 0 0 0 64 2 33 13 8 0 66 2 8 + 13 0 0 70 0 71 0 72 2 71 0 2 0 73 1 + 71 0 0 74 1 54 0 0 80 2 7 0 0 0 83 2 + 11 0 0 0 86 1 11 13 0 87 1 11 13 0 88 + 1 8 7 0 89 2 11 0 11 0 90 2 11 0 0 0 + 91 2 11 13 0 0 94 2 0 13 0 0 95 2 7 + 13 0 0 1 1 0 0 0 38 1 0 0 0 1 2 0 0 0 + 33 1 2 0 0 0 8 1 3 0 104 0 11 11 1 2 + 0 13 0 0 68 3 0 13 0 0 11 62 2 0 75 0 + 8 76 2 0 75 0 33 77 1 5 13 0 1 2 0 13 + 103 0 1 1 5 0 0 1 2 0 0 103 0 1 1 5 0 + 0 1 2 0 0 103 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 102 0 + 1 0 0 0 1 2 0 0 0 33 82 2 0 0 0 8 81 + 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 102 0 1 4 7 + 8 100 0 8 8 1 2 0 8 100 0 1 3 0 8 100 + 0 8 1 3 0 8 0 11 8 1 2 0 8 0 11 1 2 0 + 13 0 0 95 2 7 11 8 0 1 3 7 11 8 0 11 + 65 3 0 11 0 0 11 63 3 0 11 33 0 11 67 + 2 0 11 102 0 1 1 0 97 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 103 0 0 1 1 0 97 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 96 3 0 7 0 0 8 93 2 0 + 0 36 0 37 3 0 0 100 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 33 79 2 0 0 0 8 78 1 7 28 0 43 + 3 0 0 0 0 11 27 3 0 0 8 0 11 1 1 0 + 106 0 1 2 0 13 11 0 1 1 7 54 0 1 1 0 + 11 0 92 1 6 8 0 1 2 0 105 102 0 1 2 0 + 0 0 8 1 2 0 13 102 0 1 3 9 0 0 97 97 + 1 3 9 0 0 8 8 1 2 9 0 0 99 1 2 9 0 0 + 98 1 2 0 13 0 0 1 2 7 13 8 0 1 1 0 97 + 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 69 3 0 8 0 + 11 8 1 2 0 0 0 23 1 2 0 0 0 11 1 2 7 + 7 8 0 1 2 0 7 102 0 1 3 0 0 0 0 11 84 + 1 0 0 0 20 1 3 101 0 1 1 0 0 97 1 1 0 + 0 75 85 2 0 0 8 0 1 2 0 0 0 0 19 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 102 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/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp index 912a1dcb..7182758d 100644 --- a/src/algebra/strap/LNAGG-.lsp +++ b/src/algebra/strap/LNAGG-.lsp @@ -37,23 +37,24 @@ (DEFUN |LNAGG-;index?;IAB;2| (|i| |a| $) (COND - ((< |i| (SPADCALL |a| (|getShellEntry| $ 9))) 'NIL) - ('T (NOT (< (SPADCALL |a| (|getShellEntry| $ 10)) |i|))))) + ((>= |i| (SPADCALL |a| (|getShellEntry| $ 9))) + (NOT (> |i| (SPADCALL |a| (|getShellEntry| $ 10))))) + ('T 'NIL))) (DEFUN |LNAGG-;concat;ASA;3| (|a| |x| $) - (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 21)) - (|getShellEntry| $ 22))) + (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 22)) + (|getShellEntry| $ 23))) (DEFUN |LNAGG-;concat;S2A;4| (|x| |y| $) - (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 21)) |y| - (|getShellEntry| $ 22))) + (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 22)) |y| + (|getShellEntry| $ 23))) (DEFUN |LNAGG-;insert;SAIA;5| (|x| |a| |i| $) - (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 21)) |a| |i| - (|getShellEntry| $ 25))) + (SPADCALL (SPADCALL 1 |x| (|getShellEntry| $ 22)) |a| |i| + (|getShellEntry| $ 26))) (DEFUN |LNAGG-;maxIndex;AI;6| (|l| $) - (+ (- (SPADCALL |l| (|getShellEntry| $ 27)) 1) + (+ (- (SPADCALL |l| (|getShellEntry| $ 28)) 1) (SPADCALL |l| (|getShellEntry| $ 9)))) (DEFUN |LinearAggregate&| (|#1| |#2|) @@ -63,7 +64,7 @@ (LETT |dv$1| (|devaluate| |#1|) . #0=(|LinearAggregate&|)) (LETT |dv$2| (|devaluate| |#2|) . #0#) (LETT |dv$| (LIST '|LinearAggregate&| |dv$1| |dv$2|) . #0#) - (LETT $ (|newShell| 32) . #0#) + (LETT $ (|newShell| 33) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| @@ -74,31 +75,32 @@ (|setShellEntry| $ 7 |#2|) (COND ((|HasAttribute| |#1| '|finiteAggregate|) - (|setShellEntry| $ 30 + (|setShellEntry| $ 31 (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 . |false|) - (20 . |not|) |LNAGG-;index?;IAB;2| (|NonNegativeInteger|) - (25 . |One|) (29 . |One|) (33 . |new|) (39 . |concat|) - |LNAGG-;concat;ASA;3| |LNAGG-;concat;S2A;4| - (45 . |insert|) |LNAGG-;insert;SAIA;5| (52 . |#|) (57 . -) - (63 . +) (69 . |maxIndex|) (|List| $)) - '#(|maxIndex| 74 |insert| 79 |indices| 86 |index?| 91 - |concat| 97) + |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) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 30 - '(1 6 8 0 9 1 6 8 0 10 2 8 13 0 0 14 0 - 13 0 15 1 13 0 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))))) + (|makeByteWordVec2| 31 + '(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))))) '|lookupComplete|)) diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp index 72f15b22..1c940eea 100644 --- a/src/algebra/strap/LSAGG-.lsp +++ b/src/algebra/strap/LSAGG-.lsp @@ -252,7 +252,7 @@ (PROG1 (LETT #0# (- (- |i| 1) |m|) |LSAGG-;insert!;SAIA;7|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) |LSAGG-;insert!;SAIA;7|) @@ -279,7 +279,7 @@ (PROG1 (LETT #0# (- (- |i| 1) |m|) |LSAGG-;insert!;2AIA;8|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) |LSAGG-;insert!;2AIA;8|) @@ -358,7 +358,7 @@ (PROG1 (LETT #0# (- (- |i| 1) |m|) |LSAGG-;delete!;AIA;10|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) |LSAGG-;delete!;AIA;10|) @@ -391,8 +391,7 @@ (PROG1 (LETT #0# (- (+ |h| 1) |m|) |LSAGG-;delete!;AUsA;11|) - (|check-subtype| - (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39))) ('T @@ -401,8 +400,7 @@ (PROG1 (LETT #1# (- (- |l| 1) |m|) |LSAGG-;delete!;AUsA;11|) - (|check-subtype| - (NOT (< #1# 0)) + (|check-subtype| (>= #1# 0) '(|NonNegativeInteger|) #1#)) (|getShellEntry| $ 39)) @@ -412,8 +410,7 @@ (PROG1 (LETT #2# (+ (- |h| |l|) 2) |LSAGG-;delete!;AUsA;11|) - (|check-subtype| - (NOT (< #2# 0)) + (|check-subtype| (>= #2# 0) '(|NonNegativeInteger|) #2#)) (|getShellEntry| $ 39)) @@ -481,7 +478,7 @@ (SEQ (LETT |l| (PROG1 (LETT #0# (QUOTIENT2 |n| 2) |LSAGG-;mergeSort|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) |LSAGG-;mergeSort|) (LETT |q| @@ -690,7 +687,7 @@ (PROG1 (LETT #0# (- |s| |m|) |LSAGG-;copyInto!;2AIA;22|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) |LSAGG-;copyInto!;2AIA;22|) @@ -734,7 +731,7 @@ (PROG1 (LETT #0# (- |s| |m|) |LSAGG-;position;SA2I;23|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 39)) |LSAGG-;position;SA2I;23|) diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index 1c9a7a9c..09094de7 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -1,8 +1,7 @@ (/VERSIONCHECK 2) -(|noteSubDomainInfo| '|NonNegativeInteger| '(|Integer|) - '(NOT (< |#1| 0))) +(|noteSubDomainInfo| '|NonNegativeInteger| '(|Integer|) '(>= |#1| 0)) (DECLAIM (FTYPE (FUNCTION ((|%IntegerSection| 0) (|%IntegerSection| 0) @@ -39,7 +38,7 @@ ('T (CONS 0 (PROG1 |c| - (|check-subtype| (NOT (< |c| 0)) + (|check-subtype| (>= |c| 0) '(|NonNegativeInteger|) |c|)))))))))) (DEFUN |NonNegativeInteger| () @@ -69,7 +68,7 @@ (PROGN (LETT |dv$| '(|NonNegativeInteger|) . #0=(|NonNegativeInteger|)) - (LETT $ (|newShell| 21) . #0#) + (LETT $ (|newShell| 22) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -80,17 +79,18 @@ (MAKEPROP '|NonNegativeInteger| '|infovec| (LIST '#(NIL NIL NIL NIL NIL (|Integer|) (0 . |Zero|) (4 . |Zero|) - (|Boolean|) (8 . <) |NNI;sup;3$;1| |NNI;shift;$I$;2| - (14 . -) (|Union| $ '"failed") |NNI;subtractIfCan;2$U;3| + (|Boolean|) (8 . >=) |NNI;sup;3$;1| |NNI;shift;$I$;2| + (14 . -) (20 . <) (|Union| $ '"failed") + |NNI;subtractIfCan;2$U;3| (|Record| (|:| |quotient| $) (|:| |remainder| $)) (|PositiveInteger|) (|NonNegativeInteger|) (|SingleInteger|) (|String|) (|OutputForm|)) - '#(~= 20 |zero?| 26 |sup| 31 |subtractIfCan| 37 |shift| 43 - |sample| 49 |rem| 53 |recip| 59 |random| 64 |quo| 69 - |one?| 75 |min| 80 |max| 86 |latex| 92 |hash| 97 |gcd| 102 - |exquo| 108 |divide| 114 |coerce| 120 |before?| 125 |Zero| - 131 |One| 135 >= 139 > 145 = 151 <= 157 < 163 + 169 ** 175 - * 187) + '#(~= 26 |zero?| 32 |sup| 37 |subtractIfCan| 43 |shift| 49 + |sample| 55 |rem| 59 |recip| 65 |random| 70 |quo| 75 + |one?| 81 |min| 86 |max| 92 |latex| 98 |hash| 103 |gcd| + 108 |exquo| 114 |divide| 120 |coerce| 126 |before?| 131 + |Zero| 137 |One| 141 >= 145 > 151 = 157 <= 163 < 169 + 175 + ** 181 * 193) '(((|commutative| "*") . 0)) (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0)) (CONS '#(NIL NIL NIL NIL NIL |Monoid&| |AbelianMonoid&| @@ -104,20 +104,20 @@ (|AbelianMonoid|) (|OrderedSet|) (|SemiGroup|) (|AbelianSemiGroup|) (|SetCategory|) (|BasicType|) - (|CoercibleTo| 20)) - (|makeByteWordVec2| 20 + (|CoercibleTo| 21)) + (|makeByteWordVec2| 21 '(0 0 0 6 0 5 0 7 2 5 8 0 0 9 2 5 0 0 0 - 12 2 0 8 0 0 1 1 0 8 0 1 2 0 0 0 0 10 - 2 0 13 0 0 14 2 0 0 0 5 11 0 0 0 1 2 - 0 0 0 0 1 1 0 13 0 1 1 0 0 0 1 2 0 0 - 0 0 1 1 0 8 0 1 2 0 0 0 0 1 2 0 0 0 0 - 1 1 0 19 0 1 1 0 18 0 1 2 0 0 0 0 1 2 - 0 13 0 0 1 2 0 15 0 0 1 1 0 20 0 1 2 - 0 8 0 0 1 0 0 0 6 0 0 0 1 2 0 8 0 0 1 + 12 2 5 8 0 0 13 2 0 8 0 0 1 1 0 8 0 1 + 2 0 0 0 0 10 2 0 14 0 0 15 2 0 0 0 5 + 11 0 0 0 1 2 0 0 0 0 1 1 0 14 0 1 1 0 + 0 0 1 2 0 0 0 0 1 1 0 8 0 1 2 0 0 0 0 + 1 2 0 0 0 0 1 1 0 20 0 1 1 0 19 0 1 2 + 0 0 0 0 1 2 0 14 0 0 1 2 0 16 0 0 1 1 + 0 21 0 1 2 0 8 0 0 1 0 0 0 6 0 0 0 1 2 0 8 0 0 1 2 0 8 0 0 1 2 0 8 0 0 1 2 - 0 8 0 0 1 2 0 0 0 0 1 2 0 0 0 16 1 2 - 0 0 0 17 1 2 0 0 0 0 1 2 0 0 17 0 1 2 - 0 0 16 0 1))))) + 0 8 0 0 1 2 0 8 0 0 1 2 0 0 0 0 1 2 0 + 0 0 17 1 2 0 0 0 18 1 2 0 0 0 0 1 2 0 + 0 18 0 1 2 0 0 17 0 1))))) '|lookupComplete|)) (MAKEPROP '|NonNegativeInteger| 'NILADIC T) diff --git a/src/algebra/strap/ORDRING-.lsp b/src/algebra/strap/ORDRING-.lsp index 5a7d725e..c4dedafa 100644 --- a/src/algebra/strap/ORDRING-.lsp +++ b/src/algebra/strap/ORDRING-.lsp @@ -14,24 +14,24 @@ |ORDRING-;abs;2S;4|)) (DEFUN |ORDRING-;positive?;SB;1| (|x| $) - (SPADCALL (|spadConstant| $ 7) |x| (|getShellEntry| $ 9))) + (SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 9))) (DEFUN |ORDRING-;negative?;SB;2| (|x| $) - (SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 9))) + (SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 11))) (DEFUN |ORDRING-;sign;SI;3| (|x| $) (COND - ((SPADCALL |x| (|getShellEntry| $ 12)) 1) - ((SPADCALL |x| (|getShellEntry| $ 15)) -1) - ((SPADCALL |x| (|getShellEntry| $ 18)) 0) + ((SPADCALL |x| (|getShellEntry| $ 13)) 1) + ((SPADCALL |x| (|getShellEntry| $ 16)) -1) + ((SPADCALL |x| (|getShellEntry| $ 19)) 0) ('T (|error| "x satisfies neither positive?, negative? or zero?")))) (DEFUN |ORDRING-;abs;2S;4| (|x| $) (COND - ((SPADCALL |x| (|getShellEntry| $ 12)) |x|) - ((SPADCALL |x| (|getShellEntry| $ 15)) - (SPADCALL |x| (|getShellEntry| $ 21))) - ((SPADCALL |x| (|getShellEntry| $ 18)) (|spadConstant| $ 7)) + ((SPADCALL |x| (|getShellEntry| $ 13)) |x|) + ((SPADCALL |x| (|getShellEntry| $ 16)) + (SPADCALL |x| (|getShellEntry| $ 22))) + ((SPADCALL |x| (|getShellEntry| $ 19)) (|spadConstant| $ 7)) ('T (|error| "x satisfies neither positive?, negative? or zero?")))) (DEFUN |OrderedRing&| (|#1|) @@ -40,7 +40,7 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|OrderedRing&|)) (LETT |dv$| (LIST '|OrderedRing&| |dv$1|) . #0#) - (LETT $ (|newShell| 23) . #0#) + (LETT $ (|newShell| 24) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -50,19 +50,19 @@ (MAKEPROP '|OrderedRing&| '|infovec| (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . |Zero|) - (|Boolean|) (4 . <) |ORDRING-;positive?;SB;1| - |ORDRING-;negative?;SB;2| (10 . |positive?|) (|Integer|) - (15 . |One|) (19 . |negative?|) (24 . |One|) (28 . -) - (33 . |zero?|) (38 . |Zero|) |ORDRING-;sign;SI;3| (42 . -) + (|Boolean|) (4 . >) |ORDRING-;positive?;SB;1| (10 . <) + |ORDRING-;negative?;SB;2| (16 . |positive?|) (|Integer|) + (21 . |One|) (25 . |negative?|) (30 . |One|) (34 . -) + (39 . |zero?|) (44 . |Zero|) |ORDRING-;sign;SI;3| (48 . -) |ORDRING-;abs;2S;4|) - '#(|sign| 47 |positive?| 52 |negative?| 57 |abs| 62) 'NIL + '#(|sign| 53 |positive?| 58 |negative?| 63 |abs| 68) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 22 - '(0 6 0 7 2 6 8 0 0 9 1 6 8 0 12 0 13 0 - 14 1 6 8 0 15 0 6 0 16 1 13 0 0 17 1 - 6 8 0 18 0 13 0 19 1 6 0 0 21 1 0 13 - 0 20 1 0 8 0 10 1 0 8 0 11 1 0 0 0 - 22))))) + (|makeByteWordVec2| 23 + '(0 6 0 7 2 6 8 0 0 9 2 6 8 0 0 11 1 6 + 8 0 13 0 14 0 15 1 6 8 0 16 0 6 0 17 + 1 14 0 0 18 1 6 8 0 19 0 14 0 20 1 6 + 0 0 22 1 0 14 0 21 1 0 8 0 10 1 0 8 0 + 12 1 0 0 0 23))))) '|lookupComplete|)) diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp index 7da2c093..4205b99e 100644 --- a/src/algebra/strap/OUTFORM.lsp +++ b/src/algebra/strap/OUTFORM.lsp @@ -504,20 +504,20 @@ (DEFUN |OUTFORM;vspace;I$;28| (|n| $) (COND - ((< 0 |n|) + ((> |n| 0) (|OUTFORM;vconcat;3$;50| " " (|OUTFORM;vspace;I$;28| (- |n| 1) $) $)) ('T (|OUTFORM;empty;$;73| $)))) (DEFUN |OUTFORM;hspace;I$;29| (|n| $) (COND - ((< 0 |n|) (|fillerSpaces| |n|)) + ((> |n| 0) (|fillerSpaces| |n|)) ('T (|OUTFORM;empty;$;73| $)))) (DEFUN |OUTFORM;rspace;2I$;30| (|n| |m| $) (SEQ (COND - ((< 0 |n|) - (COND ((NOT (< 0 |m|)) (EXIT (|OUTFORM;empty;$;73| $))))) + ((> |n| 0) + (COND ((NOT (> |m| 0)) (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) $) $)))) @@ -556,7 +556,7 @@ (SEQ (LETT |c| 'CONCATB |OUTFORM;blankSeparate;L$;35|) (LETT |l1| NIL |OUTFORM;blankSeparate;L$;35|) (SEQ (LETT |u| NIL |OUTFORM;blankSeparate;L$;35|) - (LETT #0# (SPADCALL |l| (|getShellEntry| $ 64)) + (LETT #0# (SPADCALL |l| (|getShellEntry| $ 63)) |OUTFORM;blankSeparate;L$;35|) G190 (COND @@ -570,7 +570,7 @@ ((EQCAR |u| |c|) (LETT |l1| (SPADCALL (CDR |u|) |l1| - (|getShellEntry| $ 65)) + (|getShellEntry| $ 64)) |OUTFORM;blankSeparate;L$;35|)) ('T (LETT |l1| (CONS |u| |l1|) @@ -606,18 +606,18 @@ (DEFUN |OUTFORM;scripts;$L$;46| (|a| |l| $) (COND - ((SPADCALL |l| (|getShellEntry| $ 77)) |a|) - ((SPADCALL (SPADCALL |l| (|getShellEntry| $ 78)) - (|getShellEntry| $ 77)) - (|OUTFORM;sub;3$;42| |a| (SPADCALL |l| (|getShellEntry| $ 79)) $)) + ((SPADCALL |l| (|getShellEntry| $ 76)) |a|) + ((SPADCALL (SPADCALL |l| (|getShellEntry| $ 77)) + (|getShellEntry| $ 76)) + (|OUTFORM;sub;3$;42| |a| (SPADCALL |l| (|getShellEntry| $ 78)) $)) ('T (CONS 'SUPERSUB (CONS |a| |l|))))) (DEFUN |OUTFORM;supersub;$L$;47| (|a| |l| $) (SEQ (COND - ((ODDP (SPADCALL |l| (|getShellEntry| $ 81))) + ((ODDP (SPADCALL |l| (|getShellEntry| $ 80))) (LETT |l| (SPADCALL |l| (LIST (|OUTFORM;empty;$;73| $)) - (|getShellEntry| $ 65)) + (|getShellEntry| $ 64)) |OUTFORM;supersub;$L$;47|))) (EXIT (CONS 'ALTSUPERSUB (CONS |a| |l|))))) @@ -737,16 +737,16 @@ (DEFUN |OUTFORM;infix;$L$;77| (|a| |l| $) (COND - ((SPADCALL |l| (|getShellEntry| $ 77)) (|OUTFORM;empty;$;73| $)) - ((SPADCALL (SPADCALL |l| (|getShellEntry| $ 78)) - (|getShellEntry| $ 77)) - (SPADCALL |l| (|getShellEntry| $ 79))) + ((SPADCALL |l| (|getShellEntry| $ 76)) (|OUTFORM;empty;$;73| $)) + ((SPADCALL (SPADCALL |l| (|getShellEntry| $ 77)) + (|getShellEntry| $ 76)) + (SPADCALL |l| (|getShellEntry| $ 78))) ((|OUTFORM;infix?;$B;74| |a| $) (CONS |a| |l|)) ('T (|OUTFORM;hconcat;L$;49| - (LIST (SPADCALL |l| (|getShellEntry| $ 79)) |a| + (LIST (SPADCALL |l| (|getShellEntry| $ 78)) |a| (|OUTFORM;infix;$L$;77| |a| - (SPADCALL |l| (|getShellEntry| $ 78)) $)) + (SPADCALL |l| (|getShellEntry| $ 77)) $)) $)))) (DEFUN |OUTFORM;infix;4$;78| (|a| |b| |c| $) @@ -773,7 +773,7 @@ (RETURN (SEQ (LETT |s| (MAKE-FULL-CVEC |nn| - (SPADCALL "." (|getShellEntry| $ 120))) + (SPADCALL "." (|getShellEntry| $ 119))) |OUTFORM;dot;$Nni$;85|) (EXIT (|OUTFORM;super;3$;43| |a| |s| $)))))) @@ -782,7 +782,7 @@ (RETURN (SEQ (LETT |s| (MAKE-FULL-CVEC |nn| - (SPADCALL "," (|getShellEntry| $ 120))) + (SPADCALL "," (|getShellEntry| $ 119))) |OUTFORM;prime;$Nni$;86|) (EXIT (|OUTFORM;super;3$;43| |a| |s| $)))))) @@ -819,9 +819,9 @@ (PROG1 |nn| (|check-subtype| (< 0 |nn|) '(|PositiveInteger|) |nn|)) - (|getShellEntry| $ 138)) + (|getShellEntry| $ 137)) |OUTFORM;differentiate;$Nni$;97|) - (LETT |s| (SPADCALL |r| (|getShellEntry| $ 139)) + (LETT |s| (SPADCALL |r| (|getShellEntry| $ 138)) |OUTFORM;differentiate;$Nni$;97|) (EXIT (|OUTFORM;super;3$;43| |a| (|OUTFORM;paren;2$;40| |s| $) $))))))))) @@ -873,7 +873,7 @@ (RETURN (PROGN (LETT |dv$| '(|OutputForm|) . #0=(|OutputForm|)) - (LETT $ (|newShell| 151) . #0#) + (LETT $ (|newShell| 150) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -901,21 +901,21 @@ |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 . |Zero|) (45 . <) (51 . |One|) - (55 . |One|) |OUTFORM;vspace;I$;28| - |OUTFORM;vconcat;3$;50| |OUTFORM;rspace;2I$;30| (|List| $) - (|List| 57) |OUTFORM;matrix;L$;31| |OUTFORM;pile;L$;32| + (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| |OUTFORM;commaSeparate;L$;33| |OUTFORM;semicolonSeparate;L$;34| (|List| $$) - (59 . |reverse|) (64 . |append|) + (55 . |reverse|) (60 . |append|) |OUTFORM;blankSeparate;L$;35| |OUTFORM;brace;2$;36| |OUTFORM;brace;L$;37| |OUTFORM;bracket;2$;38| |OUTFORM;bracket;L$;39| |OUTFORM;paren;2$;40| |OUTFORM;paren;L$;41| |OUTFORM;sub;3$;42| |OUTFORM;super;3$;43| |OUTFORM;presub;3$;44| - |OUTFORM;presuper;3$;45| (70 . |null|) (75 . |rest|) - (80 . |first|) |OUTFORM;scripts;$L$;46| (85 . |#|) - (90 . |odd?|) |OUTFORM;supersub;$L$;47| + |OUTFORM;presuper;3$;45| (66 . |null|) (71 . |rest|) + (76 . |first|) |OUTFORM;scripts;$L$;46| (81 . |#|) + (86 . |odd?|) |OUTFORM;supersub;$L$;47| |OUTFORM;hconcat;L$;49| |OUTFORM;vconcat;L$;51| |OUTFORM;~=;3$;52| |OUTFORM;<;3$;53| |OUTFORM;>;3$;54| |OUTFORM;<=;3$;55| |OUTFORM;>=;3$;56| |OUTFORM;+;3$;57| @@ -925,97 +925,97 @@ |OUTFORM;exquo;3$;66| |OUTFORM;and;3$;67| |OUTFORM;or;3$;68| |OUTFORM;not;2$;69| |OUTFORM;SEGMENT;3$;70| |OUTFORM;SEGMENT;2$;71| - |OUTFORM;binomial;3$;72| (95 . |false|) (99 . |true|) + |OUTFORM;binomial;3$;72| (91 . |false|) (95 . |true|) |OUTFORM;infix?;$B;74| |OUTFORM;elt;$L$;75| |OUTFORM;prefix;$L$;76| |OUTFORM;infix;$L$;77| |OUTFORM;infix;4$;78| |OUTFORM;postfix;3$;79| |OUTFORM;string;2$;80| |OUTFORM;quote;2$;81| |OUTFORM;overbar;2$;82| |OUTFORM;dot;2$;83| - |OUTFORM;prime;2$;84| (103 . |char|) (108 . |new|) + |OUTFORM;prime;2$;84| (99 . |char|) (104 . |new|) |OUTFORM;dot;$Nni$;85| |OUTFORM;prime;$Nni$;86| |OUTFORM;overlabel;3$;87| |OUTFORM;box;2$;88| |OUTFORM;zag;3$;89| |OUTFORM;root;2$;90| |OUTFORM;root;3$;91| |OUTFORM;over;3$;92| |OUTFORM;slash;3$;93| |OUTFORM;assign;3$;94| |OUTFORM;label;3$;95| |OUTFORM;rarrow;3$;96| - (114 . |zero?|) (119 . <) (|PositiveInteger|) - (|NumberFormats|) (125 . |FormatRoman|) - (130 . |lowerCase|) |OUTFORM;differentiate;$Nni$;97| + (110 . |zero?|) (115 . <) (|PositiveInteger|) + (|NumberFormats|) (121 . |FormatRoman|) + (126 . |lowerCase|) |OUTFORM;differentiate;$Nni$;97| |OUTFORM;sum;2$;98| |OUTFORM;sum;3$;99| |OUTFORM;sum;4$;100| |OUTFORM;prod;2$;101| |OUTFORM;prod;3$;102| |OUTFORM;prod;4$;103| |OUTFORM;int;2$;104| |OUTFORM;int;3$;105| |OUTFORM;int;4$;106| (|SingleInteger|)) - '#(~= 135 |zag| 147 |width| 153 |vspace| 162 |vconcat| 167 - |supersub| 178 |superHeight| 184 |super| 189 |sum| 195 - |subHeight| 213 |sub| 218 |string| 224 |slash| 229 - |semicolonSeparate| 235 |scripts| 240 |rspace| 246 |root| - 252 |right| 263 |rem| 274 |rarrow| 280 |quote| 286 |quo| - 291 |prod| 297 |print| 315 |prime| 320 |presuper| 331 - |presub| 337 |prefix| 343 |postfix| 349 |pile| 355 |paren| - 360 |overlabel| 370 |overbar| 376 |over| 381 |outputForm| - 387 |or| 407 |not| 413 |messagePrint| 418 |message| 423 - |matrix| 428 |left| 433 |latex| 444 |label| 449 |int| 455 - |infix?| 473 |infix| 478 |hspace| 491 |height| 496 - |hconcat| 505 |hash| 516 |exquo| 521 |empty| 527 |elt| 531 - |doubleFloatFormat| 537 |dot| 542 |div| 553 - |differentiate| 559 |commaSeparate| 565 |coerce| 570 - |center| 575 |bracket| 586 |brace| 596 |box| 606 - |blankSeparate| 611 |binomial| 616 |before?| 622 |assign| - 628 |and| 634 SEGMENT 640 >= 651 > 657 = 663 <= 675 < 681 - / 687 - 693 + 704 ** 710 * 716) + '#(~= 131 |zag| 143 |width| 149 |vspace| 158 |vconcat| 163 + |supersub| 174 |superHeight| 180 |super| 185 |sum| 191 + |subHeight| 209 |sub| 214 |string| 220 |slash| 225 + |semicolonSeparate| 231 |scripts| 236 |rspace| 242 |root| + 248 |right| 259 |rem| 270 |rarrow| 276 |quote| 282 |quo| + 287 |prod| 293 |print| 311 |prime| 316 |presuper| 327 + |presub| 333 |prefix| 339 |postfix| 345 |pile| 351 |paren| + 356 |overlabel| 366 |overbar| 372 |over| 377 |outputForm| + 383 |or| 403 |not| 409 |messagePrint| 414 |message| 419 + |matrix| 424 |left| 429 |latex| 440 |label| 445 |int| 451 + |infix?| 469 |infix| 474 |hspace| 487 |height| 492 + |hconcat| 501 |hash| 512 |exquo| 517 |empty| 523 |elt| 527 + |doubleFloatFormat| 533 |dot| 538 |div| 549 + |differentiate| 555 |commaSeparate| 561 |coerce| 566 + |center| 571 |bracket| 582 |brace| 592 |box| 602 + |blankSeparate| 607 |binomial| 612 |before?| 618 |assign| + 624 |and| 630 SEGMENT 636 >= 647 > 653 = 659 <= 671 < 677 + / 683 - 689 + 700 ** 706 * 712) 'NIL (CONS (|makeByteWordVec2| 1 '(0 0 0)) (CONS '#(|SetCategory&| |BasicType&| NIL) (CONS '#((|SetCategory|) (|BasicType|) (|CoercibleTo| 18)) - (|makeByteWordVec2| 150 + (|makeByteWordVec2| 149 '(1 7 11 0 12 0 26 0 27 2 7 0 0 26 28 2 7 0 26 0 29 2 20 0 0 0 37 2 20 0 0 0 - 38 0 47 0 48 0 20 0 49 0 24 0 50 2 20 - 11 0 0 51 0 47 0 52 0 20 0 53 1 63 0 - 0 64 2 63 0 0 0 65 1 63 11 0 77 1 63 - 0 0 78 1 63 2 0 79 1 63 47 0 81 1 20 - 11 0 82 0 11 0 107 0 11 0 108 1 26 0 - 7 120 2 7 0 47 26 121 1 47 11 0 134 2 - 47 11 0 0 135 1 137 7 136 138 1 7 0 0 - 139 2 0 0 0 0 86 2 0 11 0 0 1 2 0 0 0 - 0 126 0 0 20 36 1 0 20 0 31 1 0 0 20 - 54 1 0 0 57 85 2 0 0 0 0 55 2 0 0 0 - 57 83 1 0 20 0 34 2 0 0 0 0 74 2 0 0 - 0 0 142 3 0 0 0 0 0 143 1 0 0 0 141 1 - 0 20 0 33 2 0 0 0 0 73 1 0 0 0 115 2 - 0 0 0 0 130 1 0 0 57 62 2 0 0 0 57 80 - 2 0 0 20 20 56 2 0 0 0 0 128 1 0 0 0 - 127 1 0 0 0 46 2 0 0 0 20 43 2 0 0 0 - 0 98 2 0 0 0 0 133 1 0 0 0 116 2 0 0 - 0 0 99 3 0 0 0 0 0 146 1 0 0 0 144 2 - 0 0 0 0 145 1 0 9 0 10 1 0 0 0 119 2 - 0 0 0 47 123 2 0 0 0 0 76 2 0 0 0 0 - 75 2 0 0 0 57 111 2 0 0 0 0 114 1 0 0 - 57 60 1 0 0 57 72 1 0 0 0 71 2 0 0 0 - 0 124 1 0 0 0 117 2 0 0 0 0 129 1 0 0 - 7 30 1 0 0 24 25 1 0 0 20 21 1 0 0 22 - 23 2 0 0 0 0 102 1 0 0 0 103 1 0 9 7 - 15 1 0 0 7 14 1 0 0 58 59 1 0 0 0 45 - 2 0 0 0 20 42 1 0 7 0 1 2 0 0 0 0 132 - 3 0 0 0 0 0 149 2 0 0 0 0 148 1 0 0 0 - 147 1 0 11 0 109 3 0 0 0 0 0 113 2 0 - 0 0 57 112 1 0 0 20 39 0 0 20 35 1 0 - 20 0 32 1 0 0 57 84 2 0 0 0 0 40 1 0 - 150 0 1 2 0 0 0 0 100 0 0 0 13 2 0 0 - 0 57 110 1 0 7 7 8 1 0 0 0 118 2 0 0 - 0 47 122 2 0 0 0 0 97 2 0 0 0 47 140 - 1 0 0 57 61 1 0 18 0 19 1 0 0 0 44 2 - 0 0 0 20 41 1 0 0 0 69 1 0 0 57 70 1 - 0 0 57 68 1 0 0 0 67 1 0 0 0 125 1 0 - 0 57 66 2 0 0 0 0 106 2 0 11 0 0 1 2 - 0 0 0 0 131 2 0 0 0 0 101 1 0 0 0 105 - 2 0 0 0 0 104 2 0 0 0 0 90 2 0 0 0 0 - 88 2 0 0 0 0 17 2 0 11 0 0 16 2 0 0 0 - 0 89 2 0 0 0 0 87 2 0 0 0 0 95 1 0 0 - 0 93 2 0 0 0 0 92 2 0 0 0 0 91 2 0 0 - 0 0 96 2 0 0 0 0 94))))) + 38 0 47 0 48 0 20 0 49 2 20 11 0 0 50 + 0 47 0 51 0 20 0 52 1 62 0 0 63 2 62 + 0 0 0 64 1 62 11 0 76 1 62 0 0 77 1 + 62 2 0 78 1 62 47 0 80 1 20 11 0 81 0 + 11 0 106 0 11 0 107 1 26 0 7 119 2 7 + 0 47 26 120 1 47 11 0 133 2 47 11 0 0 + 134 1 136 7 135 137 1 7 0 0 138 2 0 0 + 0 0 85 2 0 11 0 0 1 2 0 0 0 0 125 0 0 + 20 36 1 0 20 0 31 1 0 0 20 53 1 0 0 + 56 84 2 0 0 0 0 54 2 0 0 0 56 82 1 0 + 20 0 34 2 0 0 0 0 73 2 0 0 0 0 141 3 + 0 0 0 0 0 142 1 0 0 0 140 1 0 20 0 33 + 2 0 0 0 0 72 1 0 0 0 114 2 0 0 0 0 + 129 1 0 0 56 61 2 0 0 0 56 79 2 0 0 + 20 20 55 2 0 0 0 0 127 1 0 0 0 126 1 + 0 0 0 46 2 0 0 0 20 43 2 0 0 0 0 97 2 + 0 0 0 0 132 1 0 0 0 115 2 0 0 0 0 98 + 3 0 0 0 0 0 145 1 0 0 0 143 2 0 0 0 0 + 144 1 0 9 0 10 1 0 0 0 118 2 0 0 0 47 + 122 2 0 0 0 0 75 2 0 0 0 0 74 2 0 0 0 + 56 110 2 0 0 0 0 113 1 0 0 56 59 1 0 + 0 56 71 1 0 0 0 70 2 0 0 0 0 123 1 0 + 0 0 116 2 0 0 0 0 128 1 0 0 7 30 1 0 + 0 24 25 1 0 0 20 21 1 0 0 22 23 2 0 0 + 0 0 101 1 0 0 0 102 1 0 9 7 15 1 0 0 + 7 14 1 0 0 57 58 1 0 0 0 45 2 0 0 0 + 20 42 1 0 7 0 1 2 0 0 0 0 131 3 0 0 0 + 0 0 148 2 0 0 0 0 147 1 0 0 0 146 1 0 + 11 0 108 3 0 0 0 0 0 112 2 0 0 0 56 + 111 1 0 0 20 39 0 0 20 35 1 0 20 0 32 + 1 0 0 56 83 2 0 0 0 0 40 1 0 149 0 1 + 2 0 0 0 0 99 0 0 0 13 2 0 0 0 56 109 + 1 0 7 7 8 1 0 0 0 117 2 0 0 0 47 121 + 2 0 0 0 0 96 2 0 0 0 47 139 1 0 0 56 + 60 1 0 18 0 19 1 0 0 0 44 2 0 0 0 20 + 41 1 0 0 0 68 1 0 0 56 69 1 0 0 56 67 + 1 0 0 0 66 1 0 0 0 124 1 0 0 56 65 2 + 0 0 0 0 105 2 0 11 0 0 1 2 0 0 0 0 + 130 2 0 0 0 0 100 1 0 0 0 104 2 0 0 0 + 0 103 2 0 0 0 0 89 2 0 0 0 0 87 2 0 0 + 0 0 17 2 0 11 0 0 16 2 0 0 0 0 88 2 0 + 0 0 0 86 2 0 0 0 0 94 1 0 0 0 92 2 0 + 0 0 0 91 2 0 0 0 0 90 2 0 0 0 0 95 2 + 0 0 0 0 93))))) '|lookupComplete|)) (MAKEPROP '|OutputForm| 'NILADIC T) diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp index f39edf0a..ec59ac28 100644 --- a/src/algebra/strap/PI.lsp +++ b/src/algebra/strap/PI.lsp @@ -2,7 +2,7 @@ (/VERSIONCHECK 2) (|noteSubDomainInfo| '|PositiveInteger| '(|NonNegativeInteger|) - '(< 0 |#1|)) + '(> |#1| 0)) (DEFUN |PositiveInteger| () (PROG () @@ -41,7 +41,7 @@ (MAKEPROP '|PositiveInteger| '|infovec| (LIST '#(NIL NIL NIL NIL NIL (|NonNegativeInteger|) (0 . |Zero|) - (|Integer|) (4 . |Zero|) (|Boolean|) (8 . <) + (|Integer|) (4 . |Zero|) (|Boolean|) (8 . >) (|PositiveInteger|) (|Union| $ '"failed") (|SingleInteger|) (|String|) (|OutputForm|)) '#(~= 14 |sample| 20 |recip| 24 |one?| 29 |min| 34 |max| 40 diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp index 3c1f11fa..5901853e 100644 --- a/src/algebra/strap/POLYCAT-.lsp +++ b/src/algebra/strap/POLYCAT-.lsp @@ -1071,7 +1071,7 @@ (QCDR |nd|) |POLYCAT-;conditionP;MU;27|) (|check-subtype| - (NOT (< #11# 0)) + (>= #11# 0) '(|NonNegativeInteger|) #11#)))))) #8#) @@ -1305,7 +1305,7 @@ |POLYCAT-;charthRootlv|) (LETT |ans| (|spadConstant| $ 27) |POLYCAT-;charthRootlv|) - (SEQ G190 (COND ((NULL (< 0 |d|)) (GO G191))) + (SEQ G190 (COND ((NULL (> |d| 0)) (GO G191))) (SEQ (LETT |dd| (SPADCALL |d| |ch| (|getShellEntry| $ 173)) @@ -1321,13 +1321,13 @@ (SEQ (LETT |cp| (SPADCALL |p| |v| |d| - (|getShellEntry| $ 190)) + (|getShellEntry| $ 188)) |POLYCAT-;charthRootlv|) (LETT |p| (SPADCALL |p| (SPADCALL |cp| |v| |d| (|getShellEntry| $ 47)) - (|getShellEntry| $ 191)) + (|getShellEntry| $ 189)) |POLYCAT-;charthRootlv|) (LETT |ansx| (|POLYCAT-;charthRootlv| |cp| @@ -1356,7 +1356,7 @@ (LETT #0# (QCDR |dd|) |POLYCAT-;charthRootlv|) (|check-subtype| - (NOT (< #0# 0)) + (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 47)) @@ -1390,7 +1390,7 @@ (SPADCALL (SPADCALL |p1| |mvar| (|getShellEntry| $ 59)) (SPADCALL |p2| |mvar| (|getShellEntry| $ 59)) - (|getShellEntry| $ 193)) + (|getShellEntry| $ 191)) |POLYCAT-;monicDivide;2SVarSetR;30|) (EXIT (CONS (SPADCALL (QCAR |result|) |mvar| (|getShellEntry| $ 161)) @@ -1398,26 +1398,26 @@ (|getShellEntry| $ 161)))))))) (DEFUN |POLYCAT-;squareFree;SF;31| (|p| $) - (SPADCALL |p| (|getShellEntry| $ 196))) + (SPADCALL |p| (|getShellEntry| $ 194))) (DEFUN |POLYCAT-;squareFree;SF;32| (|p| $) - (SPADCALL |p| (|getShellEntry| $ 199))) + (SPADCALL |p| (|getShellEntry| $ 197))) (DEFUN |POLYCAT-;squareFree;SF;33| (|p| $) - (SPADCALL |p| (|getShellEntry| $ 199))) + (SPADCALL |p| (|getShellEntry| $ 197))) (DEFUN |POLYCAT-;squareFreePart;2S;34| (|p| $) (PROG (|s| |f| #0=#:G1733 #1=#:G1653 #2=#:G1651 #3=#:G1652) (RETURN (SEQ (SPADCALL (SPADCALL - (LETT |s| (SPADCALL |p| (|getShellEntry| $ 200)) + (LETT |s| (SPADCALL |p| (|getShellEntry| $ 198)) |POLYCAT-;squareFreePart;2S;34|) - (|getShellEntry| $ 201)) + (|getShellEntry| $ 199)) (PROGN (LETT #3# NIL |POLYCAT-;squareFreePart;2S;34|) (SEQ (LETT |f| NIL |POLYCAT-;squareFreePart;2S;34|) - (LETT #0# (SPADCALL |s| (|getShellEntry| $ 204)) + (LETT #0# (SPADCALL |s| (|getShellEntry| $ 202)) |POLYCAT-;squareFreePart;2S;34|) G190 (COND @@ -1450,7 +1450,7 @@ (DEFUN |POLYCAT-;content;SVarSetS;35| (|p| |v| $) (SPADCALL (SPADCALL |p| |v| (|getShellEntry| $ 59)) - (|getShellEntry| $ 206))) + (|getShellEntry| $ 204))) (DEFUN |POLYCAT-;primitivePart;2S;36| (|p| $) (PROG (#0=#:G1657) @@ -1459,13 +1459,13 @@ (PROG2 (LETT #0# (SPADCALL |p| (SPADCALL |p| - (|getShellEntry| $ 208)) - (|getShellEntry| $ 209)) + (|getShellEntry| $ 206)) + (|getShellEntry| $ 207)) |POLYCAT-;primitivePart;2S;36|) (QCDR #0#) (|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 6) #0#)) - (|getShellEntry| $ 211)) + (|getShellEntry| $ 209)) 1)))) (DEFUN |POLYCAT-;primitivePart;SVarSetS;37| (|p| |v| $) @@ -1475,13 +1475,13 @@ (PROG2 (LETT #0# (SPADCALL |p| (SPADCALL |p| |v| - (|getShellEntry| $ 213)) - (|getShellEntry| $ 214)) + (|getShellEntry| $ 211)) + (|getShellEntry| $ 212)) |POLYCAT-;primitivePart;SVarSetS;37|) (QCDR #0#) (|check-union| (QEQCAR #0# 0) (|getShellEntry| $ 6) #0#)) - (|getShellEntry| $ 211)) + (|getShellEntry| $ 209)) 1)))) (DEFUN |POLYCAT-;before?;2SB;38| (|p| |q| $) @@ -1492,34 +1492,34 @@ (LETT |dq| (SPADCALL |q| (|getShellEntry| $ 75)) |POLYCAT-;before?;2SB;38|) (EXIT (COND - ((SPADCALL |dp| |dq| (|getShellEntry| $ 216)) + ((SPADCALL |dp| |dq| (|getShellEntry| $ 214)) (SPADCALL (|spadConstant| $ 28) (SPADCALL |q| (|getShellEntry| $ 48)) - (|getShellEntry| $ 217))) - ((SPADCALL |dq| |dp| (|getShellEntry| $ 216)) + (|getShellEntry| $ 215))) + ((SPADCALL |dq| |dp| (|getShellEntry| $ 214)) (SPADCALL (SPADCALL |p| (|getShellEntry| $ 48)) - (|spadConstant| $ 28) (|getShellEntry| $ 217))) + (|spadConstant| $ 28) (|getShellEntry| $ 215))) ('T (SPADCALL (SPADCALL (SPADCALL |p| |q| - (|getShellEntry| $ 191)) + (|getShellEntry| $ 189)) (|getShellEntry| $ 48)) - (|spadConstant| $ 28) (|getShellEntry| $ 217))))))))) + (|spadConstant| $ 28) (|getShellEntry| $ 215))))))))) (DEFUN |POLYCAT-;patternMatch;SP2Pmr;39| (|p| |pat| |l| $) - (SPADCALL |p| |pat| |l| (|getShellEntry| $ 222))) + (SPADCALL |p| |pat| |l| (|getShellEntry| $ 220))) (DEFUN |POLYCAT-;patternMatch;SP2Pmr;40| (|p| |pat| |l| $) - (SPADCALL |p| |pat| |l| (|getShellEntry| $ 229))) + (SPADCALL |p| |pat| |l| (|getShellEntry| $ 227))) (DEFUN |POLYCAT-;convert;SP;41| (|x| $) - (SPADCALL (ELT $ 232) (ELT $ 233) |x| (|getShellEntry| $ 237))) + (SPADCALL (ELT $ 230) (ELT $ 231) |x| (|getShellEntry| $ 235))) (DEFUN |POLYCAT-;convert;SP;42| (|x| $) - (SPADCALL (ELT $ 239) (ELT $ 240) |x| (|getShellEntry| $ 244))) + (SPADCALL (ELT $ 237) (ELT $ 238) |x| (|getShellEntry| $ 242))) (DEFUN |POLYCAT-;convert;SIf;43| (|p| $) - (SPADCALL (ELT $ 247) (ELT $ 248) |p| (|getShellEntry| $ 252))) + (SPADCALL (ELT $ 245) (ELT $ 246) |p| (|getShellEntry| $ 250))) (DEFUN |PolynomialCategory&| (|#1| |#2| |#3| |#4|) (PROG (|dv$1| |dv$2| |dv$3| |dv$4| |dv$| $ |pv$|) @@ -1531,7 +1531,7 @@ (LETT |dv$4| (|devaluate| |#4|) . #0#) (LETT |dv$| (LIST '|PolynomialCategory&| |dv$1| |dv$2| |dv$3| |dv$4|) . #0#) - (LETT $ (|newShell| 261) . #0#) + (LETT $ (|newShell| 259) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| @@ -1634,33 +1634,33 @@ ((|HasCategory| |#2| '(|EuclideanDomain|)) (COND ((|HasCategory| |#2| '(|CharacteristicZero|)) - (|setShellEntry| $ 197 + (|setShellEntry| $ 195 (CONS (|dispatchFunction| |POLYCAT-;squareFree;SF;31|) $))) ('T - (|setShellEntry| $ 197 + (|setShellEntry| $ 195 (CONS (|dispatchFunction| |POLYCAT-;squareFree;SF;32|) $))))) ('T - (|setShellEntry| $ 197 + (|setShellEntry| $ 195 (CONS (|dispatchFunction| |POLYCAT-;squareFree;SF;33|) $)))) - (|setShellEntry| $ 205 + (|setShellEntry| $ 203 (CONS (|dispatchFunction| |POLYCAT-;squareFreePart;2S;34|) $)) - (|setShellEntry| $ 207 + (|setShellEntry| $ 205 (CONS (|dispatchFunction| |POLYCAT-;content;SVarSetS;35|) $)) - (|setShellEntry| $ 212 + (|setShellEntry| $ 210 (CONS (|dispatchFunction| |POLYCAT-;primitivePart;2S;36|) $)) - (|setShellEntry| $ 215 + (|setShellEntry| $ 213 (CONS (|dispatchFunction| |POLYCAT-;primitivePart;SVarSetS;37|) $))))) @@ -1668,7 +1668,7 @@ ((|testBitVector| |pv$| 8) (COND ((|testBitVector| |pv$| 7) - (|setShellEntry| $ 224 + (|setShellEntry| $ 222 (CONS (|dispatchFunction| |POLYCAT-;patternMatch;SP2Pmr;39|) $)))))) @@ -1676,7 +1676,7 @@ ((|testBitVector| |pv$| 6) (COND ((|testBitVector| |pv$| 5) - (|setShellEntry| $ 231 + (|setShellEntry| $ 229 (CONS (|dispatchFunction| |POLYCAT-;patternMatch;SP2Pmr;40|) $)))))) @@ -1684,21 +1684,21 @@ ((|testBitVector| |pv$| 12) (COND ((|testBitVector| |pv$| 11) - (|setShellEntry| $ 238 + (|setShellEntry| $ 236 (CONS (|dispatchFunction| |POLYCAT-;convert;SP;41|) $)))))) (COND ((|testBitVector| |pv$| 10) (COND ((|testBitVector| |pv$| 9) - (|setShellEntry| $ 245 + (|setShellEntry| $ 243 (CONS (|dispatchFunction| |POLYCAT-;convert;SP;42|) $)))))) (COND ((|testBitVector| |pv$| 14) (COND ((|testBitVector| |pv$| 13) - (|setShellEntry| $ 253 + (|setShellEntry| $ 251 (CONS (|dispatchFunction| |POLYCAT-;convert;SIf;43|) $)))))) $)))) @@ -1782,58 +1782,58 @@ (568 . |cons|) (574 . |transpose|) (|Union| 130 '"failed") (579 . |conditionP|) (584 . |elt|) (590 . *) (596 . +) (602 . |conditionP|) (607 . |charthRoot|) - (612 . |charthRoot|) (617 . |Zero|) (621 . |Zero|) - (625 . <) (631 . |coefficient|) (638 . -) + (612 . |charthRoot|) (617 . >) (623 . |coefficient|) + (630 . -) (|Record| (|:| |quotient| $) (|:| |remainder| $)) - (644 . |monicDivide|) |POLYCAT-;monicDivide;2SVarSetR;30| - (|MultivariateSquareFree| 8 9 7 6) (650 . |squareFree|) - (655 . |squareFree|) (|PolynomialSquareFree| 9 8 7 6) - (660 . |squareFree|) (665 . |squareFree|) (670 . |unit|) + (636 . |monicDivide|) |POLYCAT-;monicDivide;2SVarSetR;30| + (|MultivariateSquareFree| 8 9 7 6) (642 . |squareFree|) + (647 . |squareFree|) (|PolynomialSquareFree| 9 8 7 6) + (652 . |squareFree|) (657 . |squareFree|) (662 . |unit|) (|Record| (|:| |factor| 6) (|:| |exponent| 103)) - (|List| 202) (675 . |factors|) (680 . |squareFreePart|) - (685 . |content|) (690 . |content|) (696 . |content|) - (701 . |exquo|) + (|List| 200) (667 . |factors|) (672 . |squareFreePart|) + (677 . |content|) (682 . |content|) (688 . |content|) + (693 . |exquo|) (|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $)) - (707 . |unitNormal|) (712 . |primitivePart|) - (717 . |content|) (723 . |exquo|) (729 . |primitivePart|) - (735 . <) (741 . |before?|) |POLYCAT-;before?;2SB;38| + (699 . |unitNormal|) (704 . |primitivePart|) + (709 . |content|) (715 . |exquo|) (721 . |primitivePart|) + (727 . <) (733 . |before?|) |POLYCAT-;before?;2SB;38| (|PatternMatchResult| 103 6) (|Pattern| 103) (|PatternMatchPolynomialCategory| 103 8 9 7 6) - (747 . |patternMatch|) (|PatternMatchResult| 103 $) - (754 . |patternMatch|) (|Float|) - (|PatternMatchResult| 225 6) (|Pattern| 225) - (|PatternMatchPolynomialCategory| 225 8 9 7 6) - (761 . |patternMatch|) (|PatternMatchResult| 225 $) - (768 . |patternMatch|) (775 . |convert|) (780 . |convert|) - (|Mapping| 220 9) (|Mapping| 220 7) - (|PolynomialCategoryLifting| 8 9 7 6 220) (785 . |map|) - (792 . |convert|) (797 . |convert|) (802 . |convert|) - (|Mapping| 227 9) (|Mapping| 227 7) - (|PolynomialCategoryLifting| 8 9 7 6 227) (807 . |map|) - (814 . |convert|) (|InputForm|) (819 . |convert|) - (824 . |convert|) (|Mapping| 246 9) (|Mapping| 246 7) - (|PolynomialCategoryLifting| 8 9 7 6 246) (829 . |map|) - (836 . |convert|) (|Matrix| 103) (|Vector| 103) - (|Record| (|:| |mat| 254) (|:| |vec| 255)) + (739 . |patternMatch|) (|PatternMatchResult| 103 $) + (746 . |patternMatch|) (|Float|) + (|PatternMatchResult| 223 6) (|Pattern| 223) + (|PatternMatchPolynomialCategory| 223 8 9 7 6) + (753 . |patternMatch|) (|PatternMatchResult| 223 $) + (760 . |patternMatch|) (767 . |convert|) (772 . |convert|) + (|Mapping| 218 9) (|Mapping| 218 7) + (|PolynomialCategoryLifting| 8 9 7 6 218) (777 . |map|) + (784 . |convert|) (789 . |convert|) (794 . |convert|) + (|Mapping| 225 9) (|Mapping| 225 7) + (|PolynomialCategoryLifting| 8 9 7 6 225) (799 . |map|) + (806 . |convert|) (|InputForm|) (811 . |convert|) + (816 . |convert|) (|Mapping| 244 9) (|Mapping| 244 7) + (|PolynomialCategoryLifting| 8 9 7 6 244) (821 . |map|) + (828 . |convert|) (|Matrix| 103) (|Vector| 103) + (|Record| (|:| |mat| 252) (|:| |vec| 253)) (|Union| 103 '"failed") (|Fraction| 103) - (|Union| 258 '"failed") (|Union| 7 '"failed")) - '#(|totalDegree| 841 |squareFreePart| 852 |squareFree| 857 - |solveLinearPolynomialEquation| 862 |retractIfCan| 868 - |retract| 873 |resultant| 878 |reducedSystem| 885 - |primitivePart| 896 |primitiveMonomials| 907 - |patternMatch| 912 |monomials| 926 |monomial| 931 - |monicDivide| 938 |isTimes| 945 |isPlus| 950 |isExpt| 955 - |gcdPolynomial| 960 |factorSquareFreePolynomial| 966 - |factorPolynomial| 971 |factor| 976 |eval| 981 - |discriminant| 987 |convert| 993 |content| 1008 - |conditionP| 1014 |coefficient| 1019 |charthRoot| 1033 - |before?| 1038) + (|Union| 256 '"failed") (|Union| 7 '"failed")) + '#(|totalDegree| 833 |squareFreePart| 844 |squareFree| 849 + |solveLinearPolynomialEquation| 854 |retractIfCan| 860 + |retract| 865 |resultant| 870 |reducedSystem| 877 + |primitivePart| 888 |primitiveMonomials| 899 + |patternMatch| 904 |monomials| 918 |monomial| 923 + |monicDivide| 930 |isTimes| 937 |isPlus| 942 |isExpt| 947 + |gcdPolynomial| 952 |factorSquareFreePolynomial| 958 + |factorPolynomial| 963 |factor| 968 |eval| 973 + |discriminant| 979 |convert| 985 |content| 1000 + |conditionP| 1006 |coefficient| 1011 |charthRoot| 1025 + |before?| 1030) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 253 + (|makeByteWordVec2| 251 '(1 12 10 0 13 1 11 6 0 14 1 6 15 0 16 1 6 9 0 17 1 11 6 0 18 3 6 0 0 19 20 21 0 25 0 26 0 6 0 27 0 7 0 28 2 6 10 @@ -1877,36 +1877,36 @@ 0 25 0 177 1 110 0 0 178 1 7 179 120 180 2 101 7 0 103 181 2 6 0 0 0 182 2 6 0 0 0 183 1 0 179 120 184 1 7 172 0 - 185 1 0 172 0 186 0 8 0 187 0 103 0 - 188 2 45 10 0 0 189 3 6 0 0 9 45 190 - 2 6 0 0 0 191 2 60 192 0 0 193 1 195 - 158 6 196 1 0 148 0 197 1 198 158 6 - 199 1 6 148 0 200 1 158 6 0 201 1 158 - 203 0 204 1 0 0 0 205 1 60 6 0 206 2 - 0 0 0 9 207 1 6 7 0 208 2 6 172 0 7 - 209 1 6 210 0 211 1 0 0 0 212 2 6 0 0 - 9 213 2 6 172 0 0 214 2 0 0 0 9 215 2 - 8 10 0 0 216 2 7 10 0 0 217 3 221 219 - 6 220 219 222 3 0 223 0 220 223 224 3 - 228 226 6 227 226 229 3 0 230 0 227 - 230 231 1 9 220 0 232 1 7 220 0 233 3 - 236 220 234 235 6 237 1 0 220 0 238 1 - 9 227 0 239 1 7 227 0 240 3 243 227 - 241 242 6 244 1 0 227 0 245 1 9 246 0 - 247 1 7 246 0 248 3 251 246 249 250 6 - 252 1 0 246 0 253 2 0 45 0 19 93 1 0 - 45 0 88 1 0 0 0 205 1 0 148 0 197 2 0 - 140 139 58 141 1 0 15 0 74 1 0 9 0 73 - 3 0 0 0 0 9 95 2 0 129 120 130 131 1 - 0 110 120 121 2 0 0 0 9 215 1 0 0 0 - 212 1 0 20 0 77 3 0 230 0 227 230 231 - 3 0 223 0 220 223 224 1 0 20 0 34 3 0 - 0 0 19 63 71 3 0 192 0 0 9 194 1 0 38 - 0 52 1 0 38 0 39 1 0 56 0 57 2 0 58 - 58 58 134 1 0 144 58 147 1 0 144 58 - 145 1 0 148 0 165 2 0 0 0 23 24 2 0 0 - 0 9 97 1 0 220 0 238 1 0 246 0 253 1 - 0 227 0 245 2 0 0 0 9 207 1 0 179 120 - 184 3 0 0 0 9 45 62 3 0 0 0 19 63 69 - 1 0 172 0 186 2 0 10 0 0 218))))) + 185 1 0 172 0 186 2 45 10 0 0 187 3 6 + 0 0 9 45 188 2 6 0 0 0 189 2 60 190 0 + 0 191 1 193 158 6 194 1 0 148 0 195 1 + 196 158 6 197 1 6 148 0 198 1 158 6 0 + 199 1 158 201 0 202 1 0 0 0 203 1 60 + 6 0 204 2 0 0 0 9 205 1 6 7 0 206 2 6 + 172 0 7 207 1 6 208 0 209 1 0 0 0 210 + 2 6 0 0 9 211 2 6 172 0 0 212 2 0 0 0 + 9 213 2 8 10 0 0 214 2 7 10 0 0 215 3 + 219 217 6 218 217 220 3 0 221 0 218 + 221 222 3 226 224 6 225 224 227 3 0 + 228 0 225 228 229 1 9 218 0 230 1 7 + 218 0 231 3 234 218 232 233 6 235 1 0 + 218 0 236 1 9 225 0 237 1 7 225 0 238 + 3 241 225 239 240 6 242 1 0 225 0 243 + 1 9 244 0 245 1 7 244 0 246 3 249 244 + 247 248 6 250 1 0 244 0 251 2 0 45 0 + 19 93 1 0 45 0 88 1 0 0 0 203 1 0 148 + 0 195 2 0 140 139 58 141 1 0 15 0 74 + 1 0 9 0 73 3 0 0 0 0 9 95 2 0 129 120 + 130 131 1 0 110 120 121 2 0 0 0 9 213 + 1 0 0 0 210 1 0 20 0 77 3 0 228 0 225 + 228 229 3 0 221 0 218 221 222 1 0 20 + 0 34 3 0 0 0 19 63 71 3 0 190 0 0 9 + 192 1 0 38 0 52 1 0 38 0 39 1 0 56 0 + 57 2 0 58 58 58 134 1 0 144 58 147 1 + 0 144 58 145 1 0 148 0 165 2 0 0 0 23 + 24 2 0 0 0 9 97 1 0 218 0 236 1 0 244 + 0 251 1 0 225 0 243 2 0 0 0 9 205 1 0 + 179 120 184 3 0 0 0 9 45 62 3 0 0 0 + 19 63 69 1 0 172 0 186 2 0 10 0 0 + 216))))) '|lookupComplete|)) diff --git a/src/algebra/strap/RNS-.lsp b/src/algebra/strap/RNS-.lsp index 04fe9f0d..0ffc053f 100644 --- a/src/algebra/strap/RNS-.lsp +++ b/src/algebra/strap/RNS-.lsp @@ -107,20 +107,19 @@ (EXIT (COND ((SPADCALL |x| |x1| (|getShellEntry| $ 38)) |x|) ((SPADCALL |x| (|spadConstant| $ 39) - (|getShellEntry| $ 41)) - |x1|) - ('T + (|getShellEntry| $ 44)) (SPADCALL |x1| (|spadConstant| $ 18) - (|getShellEntry| $ 24))))))))) + (|getShellEntry| $ 24))) + ('T |x1|))))))) (DEFUN |RNS-;patternMatch;SP2Pmr;10| (|x| |p| |l| $) (PROG (|r|) (RETURN (SEQ (COND - ((SPADCALL |p| (|getShellEntry| $ 45)) - (SPADCALL |p| |x| |l| (|getShellEntry| $ 47))) - ((SPADCALL |p| (|getShellEntry| $ 48)) - (SEQ (LETT |r| (SPADCALL |p| (|getShellEntry| $ 50)) + ((SPADCALL |p| (|getShellEntry| $ 46)) + (SPADCALL |p| |x| |l| (|getShellEntry| $ 48))) + ((SPADCALL |p| (|getShellEntry| $ 49)) + (SEQ (LETT |r| (SPADCALL |p| (|getShellEntry| $ 51)) |RNS-;patternMatch;SP2Pmr;10|) (EXIT (COND ((QEQCAR |r| 0) @@ -128,11 +127,11 @@ ((SPADCALL (SPADCALL |x| (|getShellEntry| $ 33)) - (QCDR |r|) (|getShellEntry| $ 51)) + (QCDR |r|) (|getShellEntry| $ 52)) |l|) - ('T (SPADCALL (|getShellEntry| $ 52))))) - ('T (SPADCALL (|getShellEntry| $ 52))))))) - ('T (SPADCALL (|getShellEntry| $ 52)))))))) + ('T (SPADCALL (|getShellEntry| $ 53))))) + ('T (SPADCALL (|getShellEntry| $ 53))))))) + ('T (SPADCALL (|getShellEntry| $ 53)))))))) (DEFUN |RealNumberSystem&| (|#1|) (PROG (|dv$1| |dv$| $ |pv$|) @@ -140,7 +139,7 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|RealNumberSystem&|)) (LETT |dv$| (LIST '|RealNumberSystem&| |dv$1|) . #0#) - (LETT $ (|newShell| 57) . #0#) + (LETT $ (|newShell| 58) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -161,31 +160,32 @@ (70 . |convert|) (|Pattern| 32) (75 . |coerce|) |RNS-;convert;SP;7| (80 . |wholePart|) (85 . =) (91 . |Zero|) (95 . |Zero|) (99 . <) (105 . |One|) - |RNS-;floor;2S;8| |RNS-;ceiling;2S;9| (109 . |generic?|) - (|PatternMatchResult| 32 6) (114 . |addMatch|) - (121 . |constant?|) (|Union| 32 '"failed") - (126 . |retractIfCan|) (131 . =) (137 . |failed|) - (|PatternMatchResult| 32 $) |RNS-;patternMatch;SP2Pmr;10| - (|DoubleFloat|) (|OutputForm|)) - '#(|truncate| 141 |round| 146 |patternMatch| 151 |norm| 158 - |fractionPart| 163 |floor| 168 |convert| 173 |coerce| 178 - |characteristic| 188 |ceiling| 192) + |RNS-;floor;2S;8| (109 . >=) |RNS-;ceiling;2S;9| + (115 . |generic?|) (|PatternMatchResult| 32 6) + (120 . |addMatch|) (127 . |constant?|) + (|Union| 32 '"failed") (132 . |retractIfCan|) (137 . =) + (143 . |failed|) (|PatternMatchResult| 32 $) + |RNS-;patternMatch;SP2Pmr;10| (|DoubleFloat|) + (|OutputForm|)) + '#(|truncate| 147 |round| 152 |patternMatch| 157 |norm| 164 + |fractionPart| 169 |floor| 174 |convert| 179 |coerce| 184 + |characteristic| 194 |ceiling| 198) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 54 + (|makeByteWordVec2| 55 '(0 7 0 8 1 6 0 0 10 2 6 0 0 0 11 1 6 13 0 14 1 6 0 0 15 1 6 0 0 16 0 6 0 18 1 6 0 19 20 2 6 0 0 0 21 0 22 0 23 2 6 0 0 0 24 1 6 0 0 26 1 28 19 0 29 1 28 19 0 30 1 6 32 0 33 1 34 0 32 35 1 6 19 0 37 2 6 13 0 0 38 0 6 0 39 0 - 19 0 40 2 6 13 0 0 41 0 19 0 42 1 34 - 13 0 45 3 46 0 34 6 0 47 1 34 13 0 48 - 1 34 49 0 50 2 32 13 0 0 51 0 46 0 52 - 1 0 0 0 17 1 0 0 0 25 3 0 53 0 34 53 - 54 1 0 0 0 27 1 0 0 0 12 1 0 0 0 43 1 - 0 34 0 36 1 0 0 28 31 1 0 0 28 31 0 0 - 7 9 1 0 0 0 44))))) + 19 0 40 2 6 13 0 0 41 0 19 0 42 2 6 + 13 0 0 44 1 34 13 0 46 3 47 0 34 6 0 + 48 1 34 13 0 49 1 34 50 0 51 2 32 13 + 0 0 52 0 47 0 53 1 0 0 0 17 1 0 0 0 + 25 3 0 54 0 34 54 55 1 0 0 0 27 1 0 0 + 0 12 1 0 0 0 43 1 0 34 0 36 1 0 0 28 + 31 1 0 0 28 31 0 0 7 9 1 0 0 0 45))))) '|lookupComplete|)) diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index 591a5604..a0fa2e8a 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -115,6 +115,8 @@ (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|) |SINT;>=;2$B;27|)) +(PUT '|SINT;>=;2$B;27| '|SPADreplace| '>=) + (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;inc;2$;28|)) @@ -375,7 +377,7 @@ (DEFUN |SINT;<=;2$B;26| (|x| |y| $) (NOT (> |x| |y|))) -(DEFUN |SINT;>=;2$B;27| (|x| |y| $) (NOT (< |x| |y|))) +(DEFUN |SINT;>=;2$B;27| (|x| |y| $) (DECLARE (IGNORE $)) (>= |x| |y|)) (DEFUN |SINT;inc;2$;28| (|x| $) (DECLARE (IGNORE $)) (QSADD1 |x|)) diff --git a/src/algebra/strap/STAGG-.lsp b/src/algebra/strap/STAGG-.lsp index d461af4c..5785250c 100644 --- a/src/algebra/strap/STAGG-.lsp +++ b/src/algebra/strap/STAGG-.lsp @@ -86,7 +86,7 @@ (LETT |x| (SPADCALL |x| (PROG1 |i| - (|check-subtype| (NOT (< |i| 0)) + (|check-subtype| (>= |i| 0) '(|NonNegativeInteger|) |i|)) (|getShellEntry| $ 28)) |STAGG-;elt;AIS;5|) @@ -107,7 +107,7 @@ (SPADCALL (SPADCALL |x| (PROG1 |l| - (|check-subtype| (NOT (< |l| 0)) + (|check-subtype| (>= |l| 0) '(|NonNegativeInteger|) |l|)) (|getShellEntry| $ 28)) (|getShellEntry| $ 33))) @@ -123,15 +123,13 @@ (SPADCALL (SPADCALL |x| (PROG1 |l| - (|check-subtype| - (NOT (< |l| 0)) + (|check-subtype| (>= |l| 0) '(|NonNegativeInteger|) |l|)) (|getShellEntry| $ 28)) (PROG1 (LETT #0# (+ (- |h| |l|) 1) |STAGG-;elt;AUsA;6|) - (|check-subtype| - (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 37))))))))))))) @@ -189,7 +187,7 @@ (LETT |x| (SPADCALL |x| (PROG1 |i| - (|check-subtype| (NOT (< |i| 0)) + (|check-subtype| (>= |i| 0) '(|NonNegativeInteger|) |i|)) (|getShellEntry| $ 28)) |STAGG-;setelt;AI2S;11|) @@ -223,8 +221,7 @@ (SEQ (LETT |y| (SPADCALL |x| (PROG1 |l| - (|check-subtype| - (NOT (< |l| 0)) + (|check-subtype| (>= |l| 0) '(|NonNegativeInteger|) |l|)) (|getShellEntry| $ 28)) @@ -234,8 +231,7 @@ (PROG1 (LETT #0# (+ (- |h| |l|) 1) |STAGG-;setelt;AUs2S;12|) - (|check-subtype| - (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 28)) diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp index 6ac82a00..3231df82 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -209,7 +209,7 @@ (SPADCALL |x| (|getShellEntry| $ 81))) (DEFUN |SYMBOL;syprefix| (|sc| $) - (PROG (|ns| #0=#:G1550 |n| #1=#:G1551) + (PROG (|ns| #0=#:G1549 |n| #1=#:G1550) (RETURN (SEQ (LETT |ns| (LIST (LENGTH (QVELT |sc| 3)) (LENGTH (QVELT |sc| 2)) @@ -218,8 +218,9 @@ (SEQ G190 (COND ((NULL (COND - ((< (LENGTH |ns|) 2) 'NIL) - ('T (ZEROP (|SPADfirst| |ns|))))) + ((>= (LENGTH |ns|) 2) + (ZEROP (|SPADfirst| |ns|))) + ('T 'NIL))) (GO G191))) (SEQ (EXIT (LETT |ns| (CDR |ns|) |SYMBOL;syprefix|))) NIL (GO G190) G191 (EXIT NIL)) @@ -318,11 +319,11 @@ (SEQ (LETT |s| (PNAME (|SYMBOL;name;2$;31| |e| $)) |SYMBOL;latex;$S;25|) (COND - ((< 1 (QCSIZE |s|)) + ((> (QCSIZE |s|) 1) (COND - ((SPADCALL (SPADCALL |s| 1 (|getShellEntry| $ 107)) + ((SPADCALL (SPADCALL |s| 1 (|getShellEntry| $ 108)) (SPADCALL "\\" (|getShellEntry| $ 43)) - (|getShellEntry| $ 108)) + (|getShellEntry| $ 109)) (LETT |s| (STRCONC "\\mbox{\\it " (STRCONC |s| "}")) |SYMBOL;latex;$S;25|))))) (COND ((NOT (|SYMBOL;scripted?;$B;30| |e| $)) (EXIT |s|))) @@ -337,7 +338,7 @@ (SEQ (LETT |sc| (STRCONC |sc| (SPADCALL (|SPADfirst| |lo|) - (|getShellEntry| $ 113))) + (|getShellEntry| $ 114))) |SYMBOL;latex;$S;25|) (LETT |lo| (CDR |lo|) |SYMBOL;latex;$S;25|) @@ -358,7 +359,7 @@ (SEQ (LETT |sc| (STRCONC |sc| (SPADCALL (|SPADfirst| |lo|) - (|getShellEntry| $ 113))) + (|getShellEntry| $ 114))) |SYMBOL;latex;$S;25|) (LETT |lo| (CDR |lo|) |SYMBOL;latex;$S;25|) @@ -379,7 +380,7 @@ (SEQ (LETT |sc| (STRCONC |sc| (SPADCALL (|SPADfirst| |lo|) - (|getShellEntry| $ 113))) + (|getShellEntry| $ 114))) |SYMBOL;latex;$S;25|) (LETT |lo| (CDR |lo|) |SYMBOL;latex;$S;25|) @@ -400,7 +401,7 @@ (SEQ (LETT |sc| (STRCONC |sc| (SPADCALL (|SPADfirst| |lo|) - (|getShellEntry| $ 113))) + (|getShellEntry| $ 114))) |SYMBOL;latex;$S;25|) (LETT |lo| (CDR |lo|) |SYMBOL;latex;$S;25|) @@ -421,7 +422,7 @@ (SEQ (LETT |sc| (STRCONC |sc| (SPADCALL (|SPADfirst| |lo|) - (|getShellEntry| $ 113))) + (|getShellEntry| $ 114))) |SYMBOL;latex;$S;25|) (LETT |lo| (CDR |lo|) |SYMBOL;latex;$S;25|) @@ -451,9 +452,9 @@ (SPADCALL |s| (+ (QCDR |qr|) (SPADCALL |s| - (|getShellEntry| $ 118))) - (|getShellEntry| $ 107)) - |ns| (|getShellEntry| $ 120)) + (|getShellEntry| $ 119))) + (|getShellEntry| $ 108)) + |ns| (|getShellEntry| $ 121)) |SYMBOL;anyRadix|) (EXIT (COND @@ -471,14 +472,14 @@ (SEQ (LETT |sym| (|SYMBOL;anyRadix| (SPADCALL (|getShellEntry| $ 10) - (|getShellEntry| $ 121)) + (|getShellEntry| $ 122)) (|getShellEntry| $ 20) $) |SYMBOL;new;$;27|) (SPADCALL (|getShellEntry| $ 10) (+ (SPADCALL (|getShellEntry| $ 10) - (|getShellEntry| $ 121)) + (|getShellEntry| $ 122)) 1) - (|getShellEntry| $ 122)) + (|getShellEntry| $ 123)) (EXIT (|SYMBOL;coerce;S$;8| (STRCONC "%" |sym|) $)))))) (DEFUN |SYMBOL;new;2$;28| (|x| $) @@ -487,14 +488,14 @@ (SEQ (LETT |n| (SEQ (LETT |u| (SPADCALL |x| (|getShellEntry| $ 13) - (|getShellEntry| $ 125)) + (|getShellEntry| $ 126)) |SYMBOL;new;2$;28|) (EXIT (COND ((QEQCAR |u| 1) 0) ('T (+ (QCDR |u|) 1))))) |SYMBOL;new;2$;28|) (SPADCALL (|getShellEntry| $ 13) |x| |n| - (|getShellEntry| $ 128)) + (|getShellEntry| $ 129)) (LETT |xx| (COND ((NOT (|SYMBOL;scripted?;$B;30| |x| $)) @@ -506,15 +507,14 @@ (LETT |xx| (STRCONC "%" |xx|) |SYMBOL;new;2$;28|) (LETT |xx| (COND - ((NOT (< (SPADCALL - (SPADCALL |xx| - (SPADCALL |xx| - (|getShellEntry| $ 129)) - (|getShellEntry| $ 107)) - (|getShellEntry| $ 19) - (|getShellEntry| $ 130)) - (SPADCALL (|getShellEntry| $ 19) - (|getShellEntry| $ 118)))) + ((>= (SPADCALL + (SPADCALL |xx| + (SPADCALL |xx| (|getShellEntry| $ 130)) + (|getShellEntry| $ 108)) + (|getShellEntry| $ 19) + (|getShellEntry| $ 131)) + (SPADCALL (|getShellEntry| $ 19) + (|getShellEntry| $ 119))) (STRCONC |xx| (|SYMBOL;anyRadix| |n| (|getShellEntry| $ 21) $))) @@ -530,13 +530,13 @@ (|SYMBOL;scripts;$R;32| |x| $) $)))))) (DEFUN |SYMBOL;resetNew;V;29| ($) - (PROG (|k| #0=#:G1552) + (PROG (|k| #0=#:G1551) (RETURN - (SEQ (SPADCALL (|getShellEntry| $ 10) 0 (|getShellEntry| $ 122)) + (SEQ (SPADCALL (|getShellEntry| $ 10) 0 (|getShellEntry| $ 123)) (SEQ (LETT |k| NIL |SYMBOL;resetNew;V;29|) (LETT #0# (SPADCALL (|getShellEntry| $ 13) - (|getShellEntry| $ 134)) + (|getShellEntry| $ 135)) |SYMBOL;resetNew;V;29|) G190 (COND @@ -546,15 +546,15 @@ NIL)) (GO G191))) (SEQ (EXIT (SPADCALL |k| (|getShellEntry| $ 13) - (|getShellEntry| $ 135)))) + (|getShellEntry| $ 136)))) (LETT #0# (CDR #0#) |SYMBOL;resetNew;V;29|) (GO G190) G191 (EXIT NIL)) - (EXIT (SPADCALL (|getShellEntry| $ 136))))))) + (EXIT (SPADCALL (|getShellEntry| $ 137))))))) (DEFUN |SYMBOL;scripted?;$B;30| (|sy| $) (NOT (ATOM |sy|))) (DEFUN |SYMBOL;name;2$;31| (|sy| $) - (PROG (|str| |i| #0=#:G1553 #1=#:G1533 #2=#:G1531) + (PROG (|str| |i| #0=#:G1552 #1=#:G1532 #2=#:G1530) (RETURN (SEQ (EXIT (COND ((NOT (|SYMBOL;scripted?;$B;30| |sy| $)) |sy|) @@ -563,7 +563,7 @@ (|SYMBOL;string;$S;24| (SPADCALL (|SYMBOL;list;$L;34| |sy| $) - (|getShellEntry| $ 139)) + (|getShellEntry| $ 140)) $) |SYMBOL;name;2$;31|) (SEQ (EXIT (SEQ @@ -580,8 +580,8 @@ ((NOT (SPADCALL (SPADCALL |str| |i| - (|getShellEntry| $ 107)) - (|getShellEntry| $ 143))) + (|getShellEntry| $ 108)) + (|getShellEntry| $ 144))) (PROGN (LETT #2# (PROGN @@ -591,9 +591,9 @@ (SPADCALL |i| (QCSIZE |str|) (|getShellEntry| $ - 145)) + 146)) (|getShellEntry| $ - 146)) + 147)) $) |SYMBOL;name;2$;31|) (GO #1#)) @@ -607,8 +607,8 @@ #1# (EXIT #1#))))) (DEFUN |SYMBOL;scripts;$R;32| (|sy| $) - (PROG (|lscripts| |str| |nstr| |j| #0=#:G1536 |nscripts| |m| |n| - #1=#:G1554 |i| #2=#:G1555 |a| #3=#:G1556 |allscripts|) + (PROG (|lscripts| |str| |nstr| |j| #0=#:G1535 |nscripts| |m| |n| + #1=#:G1553 |i| #2=#:G1554 |a| #3=#:G1555 |allscripts|) (RETURN (SEQ (COND ((NOT (|SYMBOL;scripted?;$B;30| |sy| $)) @@ -621,12 +621,12 @@ (LETT |str| (|SYMBOL;string;$S;24| (SPADCALL (|SYMBOL;list;$L;34| |sy| $) - (|getShellEntry| $ 139)) + (|getShellEntry| $ 140)) $) |SYMBOL;scripts;$R;32|) (LETT |nstr| (QCSIZE |str|) |SYMBOL;scripts;$R;32|) (LETT |m| - (SPADCALL |nscripts| (|getShellEntry| $ 148)) + (SPADCALL |nscripts| (|getShellEntry| $ 149)) |SYMBOL;scripts;$R;32|) (SEQ (LETT |j| (+ (|getShellEntry| $ 41) 1) |SYMBOL;scripts;$R;32|) @@ -635,8 +635,8 @@ ((OR (> |j| |nstr|) (NULL (SPADCALL (SPADCALL |str| |j| - (|getShellEntry| $ 107)) - (|getShellEntry| $ 143)))) + (|getShellEntry| $ 108)) + (|getShellEntry| $ 144)))) (GO G191))) (SEQ (EXIT (SPADCALL |nscripts| |i| (PROG1 @@ -644,13 +644,13 @@ (- (SPADCALL (SPADCALL |str| |j| - (|getShellEntry| $ 107)) + (|getShellEntry| $ 108)) (|getShellEntry| $ 44)) (|getShellEntry| $ 45)) |SYMBOL;scripts;$R;32|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) - (|getShellEntry| $ 150)))) + (|getShellEntry| $ 151)))) (LETT |i| (PROG1 (+ |i| 1) (LETT |j| (+ |j| 1) @@ -660,14 +660,14 @@ (LETT |nscripts| (SPADCALL (CDR |nscripts|) (|SPADfirst| |nscripts|) - (|getShellEntry| $ 153)) + (|getShellEntry| $ 154)) |SYMBOL;scripts;$R;32|) (LETT |allscripts| (SPADCALL (|SYMBOL;list;$L;34| |sy| $) - (|getShellEntry| $ 154)) + (|getShellEntry| $ 155)) |SYMBOL;scripts;$R;32|) (LETT |m| - (SPADCALL |lscripts| (|getShellEntry| $ 155)) + (SPADCALL |lscripts| (|getShellEntry| $ 156)) |SYMBOL;scripts;$R;32|) (SEQ (LETT |n| NIL |SYMBOL;scripts;$R;32|) (LETT #1# |nscripts| |SYMBOL;scripts;$R;32|) @@ -682,7 +682,7 @@ (SEQ (EXIT (COND ((< (SPADCALL |allscripts| - (|getShellEntry| $ 156)) + (|getShellEntry| $ 157)) |n|) (|error| "Improper script count in symbol")) @@ -697,7 +697,7 @@ |SYMBOL;scripts;$R;32|) (LETT #3# (SPADCALL |allscripts| |n| - (|getShellEntry| $ 157)) + (|getShellEntry| $ 159)) |SYMBOL;scripts;$R;32|) G190 (COND @@ -719,11 +719,11 @@ |SYMBOL;scripts;$R;32|) (GO G190) G191 (EXIT (NREVERSE0 #2#)))) - (|getShellEntry| $ 158)) + (|getShellEntry| $ 160)) (EXIT (LETT |allscripts| (SPADCALL |allscripts| |n| - (|getShellEntry| $ 159)) + (|getShellEntry| $ 161)) |SYMBOL;scripts;$R;32|))))))) (LETT |i| (PROG1 (+ |i| 1) @@ -732,19 +732,19 @@ |SYMBOL;scripts;$R;32|) (GO G190) G191 (EXIT NIL)) (EXIT (VECTOR (SPADCALL |lscripts| |m| - (|getShellEntry| $ 160)) + (|getShellEntry| $ 162)) (SPADCALL |lscripts| (+ |m| 1) - (|getShellEntry| $ 160)) + (|getShellEntry| $ 162)) (SPADCALL |lscripts| (+ |m| 2) - (|getShellEntry| $ 160)) + (|getShellEntry| $ 162)) (SPADCALL |lscripts| (+ |m| 3) - (|getShellEntry| $ 160)) + (|getShellEntry| $ 162)) (SPADCALL |lscripts| (+ |m| 4) - (|getShellEntry| $ 160))))))))))) + (|getShellEntry| $ 162))))))))))) (DEFUN |SYMBOL;istring| (|n| $) (COND - ((< 9 |n|) (|error| "Can have at most 9 scripts of each kind")) + ((> |n| 9) (|error| "Can have at most 9 scripts of each kind")) ('T (|getSimpleArrayEntry| (|getShellEntry| $ 18) (+ |n| 0))))) (DEFUN |SYMBOL;list;$L;34| (|sy| $) @@ -758,7 +758,7 @@ (DEFUN |Symbol| () (PROG () (RETURN - (PROG (#0=#:G1558) + (PROG (#0=#:G1557) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|Symbol|) |Symbol|) @@ -776,7 +776,7 @@ (RETURN (PROGN (LETT |dv$| '(|Symbol|) . #0=(|Symbol|)) - (LETT $ (|newShell| 164) . #0#) + (LETT $ (|newShell| 167) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -829,7 +829,7 @@ |SYMBOL;patternMatch;$P2Pmr;17| (100 . |coerce|) |SYMBOL;convert;$P;18| (105 . |coerce|) |SYMBOL;convert;$P;19| (110 . |#|) (|List| 6) (115 . |#|) - (120 . <) (126 . |false|) (130 . |first|) (135 . |zero?|) + (120 . >=) (126 . |first|) (131 . |zero?|) (136 . |false|) (140 . |rest|) (145 . |concat|) (151 . |reverse!|) (156 . |concat|) (|List| $) (162 . |concat|) (167 . |concat|) (173 . |null|) (178 . |first|) @@ -838,36 +838,36 @@ (|:| |presub| 57) (|:| |args| 57)) |SYMBOL;script;$R$;23| |SYMBOL;name;2$;31| |SYMBOL;string;$S;24| (188 . |concat|) (194 . |One|) - (198 . |One|) (202 . |elt|) (208 . ~=) - |SYMBOL;scripts;$R;32| (214 . |empty?|) (219 . |not|) - (224 . |first|) (229 . |latex|) (234 . |rest|) + (198 . >) (204 . |One|) (208 . |elt|) (214 . ~=) + |SYMBOL;scripts;$R;32| (220 . |empty?|) (225 . |not|) + (230 . |first|) (235 . |latex|) (240 . |rest|) |SYMBOL;latex;$S;25| (|Record| (|:| |quotient| $) (|:| |remainder| $)) - (239 . |divide|) (245 . |minIndex|) (250 . +) - (256 . |concat|) (262 . |elt|) (267 . |setelt|) - |SYMBOL;new;$;27| (|Union| 6 '"failed") (273 . |search|) - (279 . |Zero|) (283 . |inc|) (288 . |setelt|) - (295 . |maxIndex|) (300 . |position|) (306 . <) - |SYMBOL;new;2$;28| (|List| $$) (312 . |keys|) - (317 . |remove!|) (323 . |void|) |SYMBOL;resetNew;V;29| - |SYMBOL;list;$L;34| (327 . |first|) (|SingleInteger|) - (332 . |One|) (336 . +) (342 . |digit?|) - (|UniversalSegment| 6) (347 . SEGMENT) (353 . |elt|) - (|List| 39) (359 . |minIndex|) (364 . -) (370 . |setelt|) - (377 . |rest|) (382 . |first|) (387 . |concat|) - (393 . |rest|) (398 . |minIndex|) (403 . |#|) - (408 . |first|) (414 . |setelt|) (421 . |rest|) - (427 . |elt|) (433 . |minIndex|) (438 . |elt|) + (245 . |divide|) (251 . |minIndex|) (256 . +) + (262 . |concat|) (268 . |elt|) (273 . |setelt|) + |SYMBOL;new;$;27| (|Union| 6 '"failed") (279 . |search|) + (285 . |Zero|) (289 . |inc|) (294 . |setelt|) + (301 . |maxIndex|) (306 . |position|) (312 . >=) + |SYMBOL;new;2$;28| (|List| $$) (318 . |keys|) + (323 . |remove!|) (329 . |void|) |SYMBOL;resetNew;V;29| + |SYMBOL;list;$L;34| (333 . |first|) (|SingleInteger|) + (338 . |One|) (342 . +) (348 . |digit?|) + (|UniversalSegment| 6) (353 . SEGMENT) (359 . |elt|) + (|List| 39) (365 . |minIndex|) (370 . -) (376 . |setelt|) + (383 . |rest|) (388 . |first|) (393 . |concat|) + (399 . |rest|) (404 . |minIndex|) (409 . |#|) (414 . <) + (420 . |first|) (426 . |setelt|) (433 . |rest|) + (439 . |elt|) (445 . >) (451 . |minIndex|) (456 . |elt|) (CONS IDENTITY (FUNCALL (|dispatchFunction| |SYMBOL;sample;$;35|) $))) - '#(~= 444 |superscript| 450 |subscript| 456 |string| 462 - |scripts| 467 |scripted?| 472 |script| 477 |sample| 489 - |resetNew| 493 |patternMatch| 497 |new| 511 |name| 520 - |min| 525 |max| 531 |list| 537 |latex| 542 |hash| 547 - |elt| 552 |convert| 558 |coerce| 578 |before?| 588 - |argscript| 594 |OMwrite| 600 >= 624 > 630 = 636 <= 642 < - 648) + '#(~= 462 |superscript| 468 |subscript| 474 |string| 480 + |scripts| 485 |scripted?| 490 |script| 495 |sample| 507 + |resetNew| 511 |patternMatch| 515 |new| 529 |name| 538 + |min| 543 |max| 549 |list| 555 |latex| 560 |hash| 565 + |elt| 570 |convert| 576 |coerce| 596 |before?| 606 + |argscript| 612 |OMwrite| 618 >= 642 > 648 = 654 <= 660 < + 666) 'NIL (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0)) (CONS '#(|OrderedSet&| NIL NIL |SetCategory&| @@ -879,7 +879,7 @@ (|CoercibleFrom| 14) (|ConvertibleTo| 25) (|OpenMath|) (|ConvertibleTo| 46) (|CoercibleTo| 53)) - (|makeByteWordVec2| 163 + (|makeByteWordVec2| 166 '(0 6 0 7 1 8 0 6 9 0 11 0 12 1 16 0 15 17 2 26 24 0 25 27 0 28 0 29 2 26 0 14 28 30 1 26 24 0 31 1 26 24 0 32 1 @@ -888,43 +888,45 @@ 54 0 15 0 56 0 57 0 58 0 59 0 60 3 68 66 25 67 66 69 3 75 73 25 74 73 76 1 74 0 25 79 1 67 0 25 81 1 57 39 0 83 - 1 84 39 0 85 2 39 22 0 0 86 0 22 0 87 - 1 84 6 0 88 1 6 22 0 89 1 84 0 0 90 2 - 14 0 0 0 91 1 84 0 0 92 2 15 0 14 0 + 1 84 39 0 85 2 39 22 0 0 86 1 84 6 0 + 87 1 6 22 0 88 0 22 0 89 1 84 0 0 90 + 2 14 0 0 0 91 1 84 0 0 92 2 15 0 14 0 93 1 14 0 94 95 2 57 0 0 0 96 1 59 22 0 97 1 59 57 0 98 1 59 0 0 99 2 57 0 - 53 0 104 0 39 0 105 0 6 0 106 2 14 42 - 0 6 107 2 42 22 0 0 108 1 57 22 0 110 - 1 22 0 0 111 1 57 53 0 112 1 53 14 0 - 113 1 57 0 0 114 2 6 116 0 0 117 1 14 - 6 0 118 2 6 0 0 0 119 2 14 0 42 0 120 - 1 8 6 0 121 2 8 6 0 6 122 2 11 124 2 - 0 125 0 39 0 126 1 6 0 0 127 3 11 6 0 - 2 6 128 1 14 6 0 129 2 14 6 42 0 130 - 2 6 22 0 0 131 1 11 133 0 134 2 11 - 124 2 0 135 0 24 0 136 1 133 2 0 139 - 0 140 0 141 2 39 0 0 0 142 1 42 22 0 - 143 2 144 0 6 6 145 2 14 0 0 144 146 - 1 147 6 0 148 2 6 0 0 0 149 3 147 39 - 0 6 39 150 1 147 0 0 151 1 147 39 0 - 152 2 147 0 0 39 153 1 133 0 0 154 1 - 59 6 0 155 1 133 39 0 156 2 133 0 0 - 39 157 3 59 57 0 6 57 158 2 133 0 0 - 39 159 2 59 57 0 6 160 1 16 6 0 161 2 - 16 14 0 6 162 2 0 22 0 0 1 2 0 0 0 57 - 64 2 0 0 0 57 62 1 0 14 0 103 1 0 100 - 0 109 1 0 22 0 23 2 0 0 0 59 61 2 0 0 - 0 100 101 0 0 0 163 0 0 24 137 3 0 77 - 0 74 77 78 3 0 70 0 67 70 71 1 0 0 0 - 132 0 0 0 123 1 0 0 0 102 2 0 0 0 0 1 - 2 0 0 0 0 1 1 0 94 0 138 1 0 14 0 115 - 1 0 140 0 1 2 0 0 0 57 63 1 0 67 0 82 - 1 0 74 0 80 1 0 25 0 49 1 0 46 0 48 1 - 0 0 14 50 1 0 53 0 55 2 0 22 0 0 1 2 - 0 0 0 57 65 2 0 24 26 0 36 3 0 24 26 - 0 22 37 1 0 14 0 34 2 0 14 0 22 35 2 - 0 22 0 0 1 2 0 22 0 0 1 2 0 22 0 0 51 - 2 0 22 0 0 1 2 0 22 0 0 52))))) + 53 0 104 0 39 0 105 2 39 22 0 0 106 0 + 6 0 107 2 14 42 0 6 108 2 42 22 0 0 + 109 1 57 22 0 111 1 22 0 0 112 1 57 + 53 0 113 1 53 14 0 114 1 57 0 0 115 2 + 6 117 0 0 118 1 14 6 0 119 2 6 0 0 0 + 120 2 14 0 42 0 121 1 8 6 0 122 2 8 6 + 0 6 123 2 11 125 2 0 126 0 39 0 127 1 + 6 0 0 128 3 11 6 0 2 6 129 1 14 6 0 + 130 2 14 6 42 0 131 2 6 22 0 0 132 1 + 11 134 0 135 2 11 125 2 0 136 0 24 0 + 137 1 134 2 0 140 0 141 0 142 2 39 0 + 0 0 143 1 42 22 0 144 2 145 0 6 6 146 + 2 14 0 0 145 147 1 148 6 0 149 2 6 0 + 0 0 150 3 148 39 0 6 39 151 1 148 0 0 + 152 1 148 39 0 153 2 148 0 0 39 154 1 + 134 0 0 155 1 59 6 0 156 1 134 39 0 + 157 2 39 22 0 0 158 2 134 0 0 39 159 + 3 59 57 0 6 57 160 2 134 0 0 39 161 2 + 59 57 0 6 162 2 6 22 0 0 163 1 16 6 0 + 164 2 16 14 0 6 165 2 0 22 0 0 1 2 0 + 0 0 57 64 2 0 0 0 57 62 1 0 14 0 103 + 1 0 100 0 110 1 0 22 0 23 2 0 0 0 59 + 61 2 0 0 0 100 101 0 0 0 166 0 0 24 + 138 3 0 77 0 74 77 78 3 0 70 0 67 70 + 71 1 0 0 0 133 0 0 0 124 1 0 0 0 102 + 2 0 0 0 0 1 2 0 0 0 0 1 1 0 94 0 139 + 1 0 14 0 116 1 0 141 0 1 2 0 0 0 57 + 63 1 0 67 0 82 1 0 74 0 80 1 0 25 0 + 49 1 0 46 0 48 1 0 0 14 50 1 0 53 0 + 55 2 0 22 0 0 1 2 0 0 0 57 65 2 0 24 + 26 0 36 3 0 24 26 0 22 37 1 0 14 0 34 + 2 0 14 0 22 35 2 0 22 0 0 1 2 0 22 0 + 0 1 2 0 22 0 0 51 2 0 22 0 0 1 2 0 22 + 0 0 52))))) '|lookupComplete|)) (MAKEPROP '|Symbol| 'NILADIC T) diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp index 5d4e9577..c8424408 100644 --- a/src/algebra/strap/URAGG-.lsp +++ b/src/algebra/strap/URAGG-.lsp @@ -177,7 +177,7 @@ (SEQ G190 (COND ((NULL (COND - ((< 0 |i|) + ((> |i| 0) (NOT (SPADCALL |l| (|getShellEntry| $ 20)))) ('T 'NIL))) (GO G191))) @@ -185,7 +185,7 @@ |URAGG-;less?;ANniB;12|) (EXIT (LETT |i| (- |i| 1) |URAGG-;less?;ANniB;12|))) NIL (GO G190) G191 (EXIT NIL)) - (EXIT (< 0 |i|)))))) + (EXIT (> |i| 0)))))) (DEFUN |URAGG-;more?;ANniB;13| (|l| |n| $) (PROG (|i|) @@ -194,7 +194,7 @@ (SEQ G190 (COND ((NULL (COND - ((< 0 |i|) + ((> |i| 0) (NOT (SPADCALL |l| (|getShellEntry| $ 20)))) ('T 'NIL))) (GO G191))) @@ -215,7 +215,7 @@ (COND ((NULL (COND ((SPADCALL |l| (|getShellEntry| $ 20)) 'NIL) - ('T (< 0 |i|)))) + ('T (> |i| 0)))) (GO G191))) (SEQ (LETT |l| (SPADCALL |l| (|getShellEntry| $ 14)) |URAGG-;size?;ANniB;14|) @@ -446,13 +446,13 @@ (SEQ (LETT |m| (SPADCALL |x| (|getShellEntry| $ 60)) |URAGG-;last;ANniA;22|) (EXIT (COND - ((< |m| |n|) (|error| "index out of range")) + ((> |n| |m|) (|error| "index out of range")) ('T (SPADCALL (SPADCALL |x| (PROG1 (LETT #0# (- |m| |n|) |URAGG-;last;ANniA;22|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 62)) (|getShellEntry| $ 63))))))))) @@ -589,13 +589,13 @@ (SPADCALL |p| (PROG1 (LETT #0# (- |n| 1) |URAGG-;split!;AIA;32|) - (|check-subtype| (NOT (< #0# 0)) + (|check-subtype| (>= #0# 0) '(|NonNegativeInteger|) #0#)) (|getShellEntry| $ 62)) |URAGG-;split!;AIA;32|) (LETT |q| (SPADCALL |p| (|getShellEntry| $ 14)) |URAGG-;split!;AIA;32|) - (SPADCALL |p| (SPADCALL (|getShellEntry| $ 83)) + (SPADCALL |p| (SPADCALL (|getShellEntry| $ 84)) (|getShellEntry| $ 74)) (EXIT |q|)))))))) @@ -623,7 +623,7 @@ (|getShellEntry| $ 14)) |URAGG-;cycleSplit!;2A;33|))) NIL (GO G190) G191 (EXIT NIL)) - (SPADCALL |x| (SPADCALL (|getShellEntry| $ 83)) + (SPADCALL |x| (SPADCALL (|getShellEntry| $ 84)) (|getShellEntry| $ 74)) (EXIT |y|)))))))) @@ -636,7 +636,7 @@ (LETT |dv$2| (|devaluate| |#2|) . #0#) (LETT |dv$| (LIST '|UnaryRecursiveAggregate&| |dv$1| |dv$2|) . #0#) - (LETT $ (|newShell| 87) . #0#) + (LETT $ (|newShell| 88) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| @@ -679,9 +679,9 @@ (|setShellEntry| $ 82 (CONS (|dispatchFunction| |URAGG-;setvalue!;A2S;31|) $)) - (|setShellEntry| $ 84 - (CONS (|dispatchFunction| |URAGG-;split!;AIA;32|) $)) (|setShellEntry| $ 85 + (CONS (|dispatchFunction| |URAGG-;split!;AIA;32|) $)) + (|setShellEntry| $ 86 (CONS (|dispatchFunction| |URAGG-;cycleSplit!;2A;33|) $))))) $)))) @@ -698,7 +698,7 @@ |URAGG-;nodes;AL;8| |URAGG-;children;AL;9| |URAGG-;leaf?;AB;10| |URAGG-;value;AS;11| (|NonNegativeInteger|) (49 . |Zero|) (|Integer|) - (53 . |Zero|) (57 . <) (63 . |One|) (67 . |One|) (71 . -) + (53 . |Zero|) (57 . >) (63 . |One|) (67 . |One|) (71 . -) |URAGG-;less?;ANniB;12| (77 . |zero?|) |URAGG-;more?;ANniB;13| |URAGG-;size?;ANniB;14| (|SingleInteger|) (82 . |Zero|) (86 . =) (92 . |cyclic?|) @@ -706,27 +706,27 @@ (103 . |cycleEntry|) |URAGG-;cycleTail;2A;18| (108 . |One|) |URAGG-;cycleEntry;2A;19| |URAGG-;cycleLength;ANni;20| |URAGG-;rest;ANniA;21| - (112 . |#|) (117 . <) (123 . |rest|) (129 . |copy|) + (112 . |#|) (117 . >) (123 . |rest|) (129 . |copy|) (134 . |last|) (140 . |true|) (144 . ~=) (150 . =) (156 . =) (162 . |node?|) (168 . |setfirst!|) (174 . |setelt|) (181 . |setlast!|) (187 . |setelt|) (194 . |setrest!|) (200 . |setelt|) (207 . |concat!|) (213 . |concat|) (219 . |setlast!|) (225 . |#|) (230 . |first|) (235 . |setchildren!|) (241 . |setvalue!|) - (247 . |empty|) (251 . |split!|) (257 . |cycleSplit!|) - '"value") - '#(|value| 262 |third| 267 |tail| 272 |split!| 277 |size?| - 283 |setvalue!| 289 |setlast!| 295 |setelt| 301 - |setchildren!| 322 |second| 328 |rest| 333 |nodes| 339 - |node?| 344 |more?| 350 |less?| 356 |leaf?| 362 |last| 367 - |elt| 378 |cyclic?| 396 |cycleTail| 401 |cycleSplit!| 406 - |cycleLength| 411 |cycleEntry| 416 |concat| 421 |children| - 427 = 432 |#| 438) + (247 . <) (253 . |empty|) (257 . |split!|) + (263 . |cycleSplit!|) '"value") + '#(|value| 268 |third| 273 |tail| 278 |split!| 283 |size?| + 289 |setvalue!| 295 |setlast!| 301 |setelt| 307 + |setchildren!| 328 |second| 334 |rest| 339 |nodes| 345 + |node?| 350 |more?| 356 |less?| 362 |leaf?| 368 |last| 373 + |elt| 384 |cyclic?| 402 |cycleTail| 407 |cycleSplit!| 412 + |cycleLength| 417 |cycleEntry| 422 |concat| 427 |children| + 433 = 438 |#| 444) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 85 + (|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 @@ -742,17 +742,17 @@ 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 0 6 0 83 2 0 0 0 - 37 84 1 0 0 0 85 1 0 7 0 34 1 0 7 0 - 18 1 0 0 0 52 2 0 0 0 37 84 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 55 1 0 0 0 85 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 51))))) + 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 52 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 55 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 51))))) '|lookupComplete|)) -- cgit v1.2.3