diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-06-29 16:22:49 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-06-29 16:22:49 +0000 |
| commit | 77d293322d11ad09575a85f421796da7db471797 (patch) | |
| tree | 1a8fc1949f2f9f1b443f3719efabf81147647eb9 /src/algebra/strap/NNI.lsp | |
| parent | ab71577ecf6a2523916d2e7fa1510d3153f758d6 (diff) | |
| download | open-axiom-77d293322d11ad09575a85f421796da7db471797.tar.gz | |
* algebra/catdef.spad.pamphlet (BasicType) [before?]: Declare here.
(OrderedType) [max,min]: Export and provide defaults.
(OrderedSet): Simplify.
(SetCategory) [before?]: Move to BasicType.
Diffstat (limited to 'src/algebra/strap/NNI.lsp')
| -rw-r--r-- | src/algebra/strap/NNI.lsp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index 6ba995a7..4347bb34 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -73,8 +73,8 @@ (14 . -) (20 . <) (|Union| $ '"failed") |NNI;subtractIfCan;2$U;3| (|Record| (|:| |quotient| $) (|:| |remainder| $)) - (|PositiveInteger|) (|NonNegativeInteger|) - (|SingleInteger|) (|String|) (|OutputForm|)) + (|PositiveInteger|) (|NonNegativeInteger|) (|String|) + (|OutputForm|) (|SingleInteger|)) '#(~= 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| @@ -82,10 +82,11 @@ |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 0)) + (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)) (CONS '#(NIL NIL NIL NIL NIL |Monoid&| |AbelianMonoid&| - |OrderedSet&| |SemiGroup&| |AbelianSemiGroup&| - |SetCategory&| |BasicType&| NIL NIL) + NIL |SemiGroup&| |AbelianSemiGroup&| + |SetCategory&| |OrderedType&| |BasicType&| NIL + NIL) (CONS '#((|OrderedAbelianMonoidSup|) (|OrderedCancellationAbelianMonoid|) (|OrderedAbelianMonoid|) @@ -93,17 +94,18 @@ (|OrderedAbelianSemiGroup|) (|Monoid|) (|AbelianMonoid|) (|OrderedSet|) (|SemiGroup|) (|AbelianSemiGroup|) - (|SetCategory|) (|BasicType|) (|Type|) - (|CoercibleTo| 21)) + (|SetCategory|) (|OrderedType|) + (|BasicType|) (|Type|) + (|CoercibleTo| 20)) (|makeByteWordVec2| 21 '(0 0 0 6 0 5 0 7 2 5 8 0 0 9 2 5 0 0 0 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 + 1 2 0 0 0 0 1 1 0 19 0 1 1 0 21 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 + 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 17 1 2 0 0 0 18 1 2 0 0 0 0 1 2 0 |