diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-05-29 04:10:14 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-05-29 04:10:14 +0000 |
| commit | bcf4deb1f4de85c07a6c91d2fb59a77545e317b0 (patch) | |
| tree | cd63415212f1f6ae8722f1f3a09845db408961d8 /src/algebra/strap/NNI.lsp | |
| parent | 9a866efde4ed887d024c01a49b3cdde777d8deb3 (diff) | |
| download | open-axiom-bcf4deb1f4de85c07a6c91d2fb59a77545e317b0.tar.gz | |
* interp/compiler.boot (getSuccessEnvironment): Tidy.
(getInverseEnvironment): Likewise.
(compLogicalNot): Don't normalize to if-statement.
Diffstat (limited to 'src/algebra/strap/NNI.lsp')
| -rw-r--r-- | src/algebra/strap/NNI.lsp | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index 1e1305b4..1c9a7a9c 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -2,7 +2,7 @@ (/VERSIONCHECK 2) (|noteSubDomainInfo| '|NonNegativeInteger| '(|Integer|) - '(COND ((< |#1| 0) 'NIL) ('T 'T))) + '(NOT (< |#1| 0))) (DECLAIM (FTYPE (FUNCTION ((|%IntegerSection| 0) (|%IntegerSection| 0) @@ -39,8 +39,7 @@ ('T (CONS 0 (PROG1 |c| - (|check-subtype| - (COND ((< |c| 0) 'NIL) ('T 'T)) + (|check-subtype| (NOT (< |c| 0)) '(|NonNegativeInteger|) |c|)))))))))) (DEFUN |NonNegativeInteger| () @@ -70,7 +69,7 @@ (PROGN (LETT |dv$| '(|NonNegativeInteger|) . #0=(|NonNegativeInteger|)) - (LETT $ (|newShell| 23) . #0#) + (LETT $ (|newShell| 21) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -81,18 +80,17 @@ (MAKEPROP '|NonNegativeInteger| '|infovec| (LIST '#(NIL NIL NIL NIL NIL (|Integer|) (0 . |Zero|) (4 . |Zero|) - (|Boolean|) (8 . <) (14 . |false|) (18 . |true|) - |NNI;sup;3$;1| |NNI;shift;$I$;2| (22 . -) - (|Union| $ '"failed") |NNI;subtractIfCan;2$U;3| + (|Boolean|) (8 . <) |NNI;sup;3$;1| |NNI;shift;$I$;2| + (14 . -) (|Union| $ '"failed") |NNI;subtractIfCan;2$U;3| (|Record| (|:| |quotient| $) (|:| |remainder| $)) (|PositiveInteger|) (|NonNegativeInteger|) (|SingleInteger|) (|String|) (|OutputForm|)) - '#(~= 28 |zero?| 34 |sup| 39 |subtractIfCan| 45 |shift| 51 - |sample| 57 |rem| 61 |recip| 67 |random| 72 |quo| 77 - |one?| 83 |min| 88 |max| 94 |latex| 100 |hash| 105 |gcd| - 110 |exquo| 116 |divide| 122 |coerce| 128 |before?| 133 - |Zero| 139 |One| 143 >= 147 > 153 = 159 <= 165 < 171 + 177 - ** 183 * 195) + '#(~= 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) '(((|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&| @@ -106,20 +104,20 @@ (|AbelianMonoid|) (|OrderedSet|) (|SemiGroup|) (|AbelianSemiGroup|) (|SetCategory|) (|BasicType|) - (|CoercibleTo| 22)) - (|makeByteWordVec2| 22 - '(0 0 0 6 0 5 0 7 2 5 8 0 0 9 0 8 0 10 - 0 8 0 11 2 5 0 0 0 14 2 0 8 0 0 1 1 0 - 8 0 1 2 0 0 0 0 12 2 0 15 0 0 16 2 0 - 0 0 5 13 0 0 0 1 2 0 0 0 0 1 1 0 15 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 21 0 1 1 0 20 - 0 1 2 0 0 0 0 1 2 0 15 0 0 1 2 0 17 0 - 0 1 1 0 22 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 8 0 0 1 2 0 0 0 0 - 1 2 0 0 0 18 1 2 0 0 0 19 1 2 0 0 0 0 - 1 2 0 0 19 0 1 2 0 0 18 0 1))))) + (|CoercibleTo| 20)) + (|makeByteWordVec2| 20 + '(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 + 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))))) '|lookupComplete|)) (MAKEPROP '|NonNegativeInteger| 'NILADIC T) |