diff options
author | dos-reis <gdr@axiomatics.org> | 2010-05-30 20:06:08 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2010-05-30 20:06:08 +0000 |
commit | b34d97dda5ce8c88d31412d11b1ad67da058480e (patch) | |
tree | 55222ea664797f046a2e7a8f807d36fb59438419 /src/algebra/strap/SINT.lsp | |
parent | ded226fca8f3a75d33602a7fbbc941c55e985fdf (diff) | |
download | open-axiom-b34d97dda5ce8c88d31412d11b1ad67da058480e.tar.gz |
* interp/c-util.boot (middleEndExpand): Tidy.
* interp/g-util.boot (expandToVMForm): Likewise.
(expandStore): Refine store to pair components.
* algebra/any.spad.pamphlet (Scope): Use builtin operators.
(Environment): Likewise.
* algebra/domain.spad.pamphlet (FunctionDescriptor): Likewise.
(ConstructorCall): Likewise.
(FunctorData): Likewise.
(OperatorSignature): Likewise.
(Category): Likewise.
(Domain): Likewise.
* algebra/integer.spad.pamphlet (Integer): Likewise.
(NonNegativeInteger): Likewise.
* algebra/outform.spad.pamphlet: Likewise.
* algebra/si.spad.pamphlet (SingleInteger): Likewise.
* algebra/syntax.spad.pamphlet (Syntax): Likewise.
Diffstat (limited to 'src/algebra/strap/SINT.lsp')
-rw-r--r-- | src/algebra/strap/SINT.lsp | 179 |
1 files changed, 88 insertions, 91 deletions
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index ef4e34c4..bac231f6 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -58,7 +58,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|) |SINT;=;2$B;15|)) -(PUT '|SINT;=;2$B;15| '|SPADreplace| 'EQL) +(PUT '|SINT;=;2$B;15| '|SPADreplace| '|%ieq|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;~;2$;16|)) @@ -122,13 +122,12 @@ (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|) |SINT;<=;2$B;28|)) -(PUT '|SINT;<=;2$B;28| '|SPADreplace| - '(XLAM (|x| |y|) (|%not| (> |x| |y|)))) +(PUT '|SINT;<=;2$B;28| '|SPADreplace| '|%ile|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|) |SINT;>=;2$B;29|)) -(PUT '|SINT;>=;2$B;29| '|SPADreplace| '>=) +(PUT '|SINT;>=;2$B;29| '|SPADreplace| '|%ige|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;inc;2$;30|)) @@ -179,7 +178,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|) |SINT;gcd;3$;40|)) -(PUT '|SINT;gcd;3$;40| '|SPADreplace| 'GCD) +(PUT '|SINT;gcd;3$;40| '|SPADreplace| '|%igcd|) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;abs;2$;41|)) @@ -199,7 +198,7 @@ (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|) |SINT;one?;$B;44|)) -(PUT '|SINT;one?;$B;44| '|SPADreplace| '(XLAM (|x|) (EQL |x| 1))) +(PUT '|SINT;one?;$B;44| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 1))) (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|) |SINT;max;3$;45|)) @@ -402,9 +401,7 @@ (DECLARE (IGNORE $)) (QSGREATERP |x| |y|)) -(DEFUN |SINT;<=;2$B;28| (|x| |y| $) - (DECLARE (IGNORE $)) - (NOT (> |x| |y|))) +(DEFUN |SINT;<=;2$B;28| (|x| |y| $) (DECLARE (IGNORE $)) (<= |x| |y|)) (DEFUN |SINT;>=;2$B;29| (|x| |y| $) (DECLARE (IGNORE $)) (>= |x| |y|)) @@ -491,7 +488,7 @@ (+ (- |$ShortMaximum| |$ShortMinimum|) 1)) (DEFUN |SINT;index;Pi$;55| (|i| $) - (LET ((#0=#:G1460 (- (+ |i| |$ShortMinimum|) 1))) + (LET ((#0=#:G1461 (- (+ |i| |$ShortMinimum|) 1))) (|check-subtype| (SMINTP #0#) '(|SingleInteger|) #0#))) (DEFUN |SINT;lookup;$Pi;56| (|x| $) @@ -533,7 +530,7 @@ (DEFUN |SingleInteger| () (PROG () (RETURN - (PROG (#0=#:G1494) + (PROG (#0=#:G1495) (RETURN (COND ((LETT #0# (HGET |$ConstructorCache| '|SingleInteger|) @@ -551,7 +548,7 @@ (HREM |$ConstructorCache| '|SingleInteger|))))))))))) (DEFUN |SingleInteger;| () - (LET ((|dv$| (LIST '|SingleInteger|)) ($ (|newShell| 117)) + (LET ((|dv$| (LIST '|SingleInteger|)) ($ (|newShell| 116)) (|pv$| (|buildPredVector| 0 0 NIL))) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 |pv$|) @@ -587,58 +584,58 @@ |SINT;/\\;3$;18| |SINT;\\/;3$;19| |SINT;Not;2$;20| |SINT;And;3$;21| |SINT;and;3$;22| |SINT;Or;3$;23| |SINT;or;3$;24| |SINT;xor;3$;25| |SINT;>;2$B;27| - (62 . |not|) |SINT;<=;2$B;28| |SINT;>=;2$B;29| - |SINT;inc;2$;30| |SINT;dec;2$;31| |SINT;+;3$;33| - |SINT;-;3$;34| (|NonNegativeInteger|) |SINT;**;$Nni$;36| - |SINT;quo;3$;37| |SINT;rem;3$;38| + |SINT;<=;2$B;28| |SINT;>=;2$B;29| |SINT;inc;2$;30| + |SINT;dec;2$;31| |SINT;+;3$;33| |SINT;-;3$;34| + (|NonNegativeInteger|) |SINT;**;$Nni$;36| |SINT;quo;3$;37| + |SINT;rem;3$;38| (|Record| (|:| |quotient| $) (|:| |remainder| $)) |SINT;divide;2$R;39| |SINT;gcd;3$;40| |SINT;abs;2$;41| - |SINT;odd?;$B;42| |SINT;zero?;$B;43| (67 . |One|) + |SINT;odd?;$B;42| |SINT;zero?;$B;43| (62 . |One|) |SINT;one?;$B;44| |SINT;max;3$;45| |SINT;min;3$;46| (|SingleInteger|) |SINT;hash;2$;47| |SINT;length;2$;48| |SINT;shift;3$;49| |SINT;mulmod;4$;50| |SINT;addmod;4$;51| |SINT;submod;4$;52| |SINT;negative?;$B;53| - |SINT;size;Nni;54| (|PositiveInteger|) (71 . +) (77 . -) + |SINT;size;Nni;54| (|PositiveInteger|) (66 . +) (72 . -) |SINT;index;Pi$;55| |SINT;lookup;$Pi;56| (|Vector| 5) - (|Record| (|:| |mat| 30) (|:| |vec| 90)) (|Vector| $) + (|Record| (|:| |mat| 30) (|:| |vec| 89)) (|Vector| $) |SINT;reducedSystem;MVR;57| |SINT;positiveRemainder;3$;58| |SINT;coerce;I$;59| |SINT;random;$;60| |SINT;random;2$;61| (|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $)) |SINT;unitNormal;$R;62| (|Fraction| 5) - (|Union| 100 '"failed") (|Union| $ '"failed") (|Float|) + (|Union| 99 '"failed") (|Union| $ '"failed") (|Float|) (|DoubleFloat|) (|Pattern| 5) (|PatternMatchResult| 5 $) (|InputForm|) (|Union| 5 '"failed") (|List| $) - (|Union| 109 '"failed") - (|Record| (|:| |coef| 109) (|:| |generator| $)) + (|Union| 108 '"failed") + (|Record| (|:| |coef| 108) (|:| |generator| $)) (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 112 '"failed") + (|Union| 111 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) (|Factored| $) (|SparseUnivariatePolynomial| $)) - '#(~= 83 ~ 89 |zero?| 94 |xor| 99 |unitNormal| 105 - |unitCanonical| 110 |unit?| 115 |symmetricRemainder| 120 - |subtractIfCan| 126 |submod| 132 |squareFreePart| 139 - |squareFree| 144 |sizeLess?| 149 |size| 155 |sign| 159 - |shift| 164 |sample| 170 |retractIfCan| 174 |retract| 179 - |rem| 184 |reducedSystem| 190 |recip| 201 |rationalIfCan| - 206 |rational?| 211 |rational| 216 |random| 221 |quo| 230 - |principalIdeal| 236 |prime?| 241 |powmod| 246 - |positiveRemainder| 253 |positive?| 259 |permutation| 264 - |patternMatch| 270 |or| 277 |one?| 283 |odd?| 288 |not| - 293 |nextItem| 298 |negative?| 303 |multiEuclidean| 308 - |mulmod| 314 |min| 321 |max| 331 |mask| 341 |lookup| 346 - |length| 351 |lcm| 356 |latex| 367 |invmod| 372 |init| 378 - |index| 382 |inc| 387 |hash| 392 |gcdPolynomial| 397 |gcd| - 403 |factorial| 414 |factor| 419 |extendedEuclidean| 424 - |exquo| 437 |expressIdealMember| 443 |even?| 449 - |euclideanSize| 454 |divide| 459 |differentiate| 465 |dec| - 476 |copy| 481 |convert| 486 |coerce| 511 |characteristic| - 531 |bit?| 535 |binomial| 541 |before?| 547 |base| 553 - |associates?| 557 |and| 563 |addmod| 569 |abs| 576 |\\/| - 581 |Zero| 587 |Or| 591 |One| 597 |OMwrite| 601 |Not| 625 - D 630 |And| 641 >= 647 > 653 = 659 <= 665 < 671 |/\\| 677 - - 683 + 694 ** 700 * 712) + '#(~= 78 ~ 84 |zero?| 89 |xor| 94 |unitNormal| 100 + |unitCanonical| 105 |unit?| 110 |symmetricRemainder| 115 + |subtractIfCan| 121 |submod| 127 |squareFreePart| 134 + |squareFree| 139 |sizeLess?| 144 |size| 150 |sign| 154 + |shift| 159 |sample| 165 |retractIfCan| 169 |retract| 174 + |rem| 179 |reducedSystem| 185 |recip| 196 |rationalIfCan| + 201 |rational?| 206 |rational| 211 |random| 216 |quo| 225 + |principalIdeal| 231 |prime?| 236 |powmod| 241 + |positiveRemainder| 248 |positive?| 254 |permutation| 259 + |patternMatch| 265 |or| 272 |one?| 278 |odd?| 283 |not| + 288 |nextItem| 293 |negative?| 298 |multiEuclidean| 303 + |mulmod| 309 |min| 316 |max| 326 |mask| 336 |lookup| 341 + |length| 346 |lcm| 351 |latex| 362 |invmod| 367 |init| 373 + |index| 377 |inc| 382 |hash| 387 |gcdPolynomial| 392 |gcd| + 398 |factorial| 409 |factor| 414 |extendedEuclidean| 419 + |exquo| 432 |expressIdealMember| 438 |even?| 444 + |euclideanSize| 449 |divide| 454 |differentiate| 460 |dec| + 471 |copy| 476 |convert| 481 |coerce| 506 |characteristic| + 526 |bit?| 530 |binomial| 536 |before?| 542 |base| 548 + |associates?| 552 |and| 558 |addmod| 564 |abs| 571 |\\/| + 576 |Zero| 582 |Or| 586 |One| 592 |OMwrite| 596 |Not| 620 + D 625 |And| 636 >= 642 > 648 = 654 <= 660 < 666 |/\\| 672 + - 678 + 689 ** 695 * 707) '((|noetherian| . 0) (|canonicalsClosed| . 0) (|canonical| . 0) (|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0) (|noZeroDivisors| . 0) @@ -689,60 +686,60 @@ (|BooleanLogic|) (|RealConstant|) (|RetractableTo| 5) (|SetCategory|) (|OpenMath|) (|Type|) + (|ConvertibleTo| 102) (|ConvertibleTo| 103) - (|ConvertibleTo| 104) (|CombinatorialFunctionCategory|) - (|ConvertibleTo| 105) - (|ConvertibleTo| 107) + (|ConvertibleTo| 104) + (|ConvertibleTo| 106) (|ConvertibleTo| 5) (|CoercibleFrom| $$) (|CoercibleFrom| 5) (|BasicType|) (|CoercibleTo| 33)) - (|makeByteWordVec2| 116 + (|makeByteWordVec2| 115 '(0 5 0 8 1 12 11 0 13 3 12 11 0 14 14 15 2 12 11 0 5 18 1 12 11 0 19 0 20 0 21 2 12 0 14 20 22 1 12 11 0 23 1 12 11 0 24 1 12 11 0 25 1 5 33 0 34 1 0 - 0 5 36 1 9 0 0 55 0 5 0 72 2 85 0 0 0 - 86 2 5 0 0 0 87 2 0 9 0 0 1 1 0 0 0 - 44 1 0 9 0 71 2 0 0 0 0 53 1 0 98 0 - 99 1 0 0 0 1 1 0 9 0 1 2 0 0 0 0 1 2 - 0 102 0 0 1 3 0 0 0 0 0 82 1 0 0 0 1 - 1 0 115 0 1 2 0 9 0 0 1 0 0 62 84 1 0 - 5 0 1 2 0 0 0 0 79 0 0 0 1 1 0 108 0 - 1 1 0 5 0 1 2 0 0 0 0 65 1 0 30 31 32 - 2 0 91 31 92 93 1 0 102 0 1 1 0 101 0 - 1 1 0 9 0 1 1 0 100 0 1 0 0 0 96 1 0 - 0 0 97 2 0 0 0 0 64 1 0 111 109 1 1 0 - 9 0 1 3 0 0 0 0 0 1 2 0 0 0 0 94 1 0 - 9 0 1 2 0 0 0 0 1 3 0 106 0 105 106 1 - 2 0 0 0 0 52 1 0 9 0 73 1 0 9 0 70 1 - 0 0 0 45 1 0 102 0 1 1 0 9 0 83 2 0 - 110 109 0 1 3 0 0 0 0 0 80 0 0 0 42 2 - 0 0 0 0 75 0 0 0 41 2 0 0 0 0 74 1 0 - 0 0 1 1 0 85 0 89 1 0 0 0 78 2 0 0 0 - 0 1 1 0 0 109 1 1 0 14 0 1 2 0 0 0 0 - 1 0 0 0 1 1 0 0 85 88 1 0 0 0 58 1 0 - 76 0 77 2 0 116 116 116 1 2 0 0 0 0 - 68 1 0 0 109 1 1 0 0 0 1 1 0 115 0 1 - 3 0 113 0 0 0 1 2 0 114 0 0 1 2 0 102 - 0 0 1 2 0 110 109 0 1 1 0 9 0 1 1 0 - 62 0 1 2 0 66 0 0 67 1 0 0 0 1 2 0 0 - 0 62 1 1 0 0 0 59 1 0 0 0 1 1 0 103 0 - 1 1 0 104 0 1 1 0 105 0 1 1 0 107 0 1 - 1 0 5 0 17 1 0 0 5 95 1 0 0 0 1 1 0 0 - 5 95 1 0 33 0 35 0 0 62 1 2 0 9 0 0 1 - 2 0 0 0 0 1 2 0 9 0 0 1 0 0 0 40 2 0 - 9 0 0 1 2 0 0 0 0 50 3 0 0 0 0 0 81 1 - 0 0 0 69 2 0 0 0 0 47 0 0 0 7 2 0 0 0 - 0 51 0 0 0 39 3 0 11 12 0 9 29 2 0 14 - 0 9 27 2 0 11 12 0 28 1 0 14 0 26 1 0 - 0 0 48 1 0 0 0 1 2 0 0 0 62 1 2 0 0 0 - 0 49 2 0 9 0 0 57 2 0 9 0 0 54 2 0 9 - 0 0 43 2 0 9 0 0 56 2 0 9 0 0 10 2 0 - 0 0 0 46 2 0 0 0 0 61 1 0 0 0 16 2 0 - 0 0 0 60 2 0 0 0 62 63 2 0 0 0 85 1 2 - 0 0 0 0 37 2 0 0 5 0 38 2 0 0 62 0 1 - 2 0 0 85 0 1))))) + 0 5 36 0 5 0 71 2 84 0 0 0 85 2 5 0 0 + 0 86 2 0 9 0 0 1 1 0 0 0 44 1 0 9 0 + 70 2 0 0 0 0 53 1 0 97 0 98 1 0 0 0 1 + 1 0 9 0 1 2 0 0 0 0 1 2 0 101 0 0 1 3 + 0 0 0 0 0 81 1 0 0 0 1 1 0 114 0 1 2 + 0 9 0 0 1 0 0 61 83 1 0 5 0 1 2 0 0 0 + 0 78 0 0 0 1 1 0 107 0 1 1 0 5 0 1 2 + 0 0 0 0 64 1 0 30 31 32 2 0 90 31 91 + 92 1 0 101 0 1 1 0 100 0 1 1 0 9 0 1 + 1 0 99 0 1 0 0 0 95 1 0 0 0 96 2 0 0 + 0 0 63 1 0 110 108 1 1 0 9 0 1 3 0 0 + 0 0 0 1 2 0 0 0 0 93 1 0 9 0 1 2 0 0 + 0 0 1 3 0 105 0 104 105 1 2 0 0 0 0 + 52 1 0 9 0 72 1 0 9 0 69 1 0 0 0 45 1 + 0 101 0 1 1 0 9 0 82 2 0 109 108 0 1 + 3 0 0 0 0 0 79 0 0 0 42 2 0 0 0 0 74 + 0 0 0 41 2 0 0 0 0 73 1 0 0 0 1 1 0 + 84 0 88 1 0 0 0 77 2 0 0 0 0 1 1 0 0 + 108 1 1 0 14 0 1 2 0 0 0 0 1 0 0 0 1 + 1 0 0 84 87 1 0 0 0 57 1 0 75 0 76 2 + 0 115 115 115 1 2 0 0 0 0 67 1 0 0 + 108 1 1 0 0 0 1 1 0 114 0 1 3 0 112 0 + 0 0 1 2 0 113 0 0 1 2 0 101 0 0 1 2 0 + 109 108 0 1 1 0 9 0 1 1 0 61 0 1 2 0 + 65 0 0 66 1 0 0 0 1 2 0 0 0 61 1 1 0 + 0 0 58 1 0 0 0 1 1 0 102 0 1 1 0 103 + 0 1 1 0 104 0 1 1 0 106 0 1 1 0 5 0 + 17 1 0 0 5 94 1 0 0 0 1 1 0 0 5 94 1 + 0 33 0 35 0 0 61 1 2 0 9 0 0 1 2 0 0 + 0 0 1 2 0 9 0 0 1 0 0 0 40 2 0 9 0 0 + 1 2 0 0 0 0 50 3 0 0 0 0 0 80 1 0 0 0 + 68 2 0 0 0 0 47 0 0 0 7 2 0 0 0 0 51 + 0 0 0 39 3 0 11 12 0 9 29 2 0 14 0 9 + 27 2 0 11 12 0 28 1 0 14 0 26 1 0 0 0 + 48 1 0 0 0 1 2 0 0 0 61 1 2 0 0 0 0 + 49 2 0 9 0 0 56 2 0 9 0 0 54 2 0 9 0 + 0 43 2 0 9 0 0 55 2 0 9 0 0 10 2 0 0 + 0 0 46 2 0 0 0 0 60 1 0 0 0 16 2 0 0 + 0 0 59 2 0 0 0 61 62 2 0 0 0 84 1 2 0 + 0 0 0 37 2 0 0 5 0 38 2 0 0 61 0 1 2 + 0 0 84 0 1))))) '|lookupComplete|)) (MAKEPROP '|SingleInteger| 'NILADIC T) |