diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-06-01 08:01:00 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-06-01 08:01:00 +0000 |
| commit | 6fff2c66d36bf2f6cacf1d9086ba6c80eb5f7f64 (patch) | |
| tree | ecd96105b5ee50cf5e81dfe1eb506797730e2955 /src/algebra/strap/NNI.lsp | |
| parent | 78dd44d657fa65a8029d996aaf7ac05d2133f509 (diff) | |
| download | open-axiom-6fff2c66d36bf2f6cacf1d9086ba6c80eb5f7f64.tar.gz | |
* interp/compiler.boot (compGreaterThan): Remove.
* interp/parse.boot (parseGreaterEqual): Likewise.
Diffstat (limited to 'src/algebra/strap/NNI.lsp')
| -rw-r--r-- | src/algebra/strap/NNI.lsp | 48 |
1 files changed, 24 insertions, 24 deletions
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) |