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/ISTRING.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/ISTRING.lsp')
| -rw-r--r-- | src/algebra/strap/ISTRING.lsp | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp index 3e20cd5c..55b813f7 100644 --- a/src/algebra/strap/ISTRING.lsp +++ b/src/algebra/strap/ISTRING.lsp @@ -692,16 +692,16 @@ (|HasCategory| (|Character|) (LIST '|ConvertibleTo| '(|InputForm|))) (OR (|HasCategory| (|Character|) - '(|BasicType|)) - (|HasCategory| (|Character|) '(|OrderedSet|)) (|HasCategory| (|Character|) '(|SetCategory|))) + (|HasCategory| (|Character|) '(|OrderedSet|)) (OR (|HasCategory| (|Character|) + '(|BasicType|)) + (|HasCategory| (|Character|) '(|OrderedSet|)) (|HasCategory| (|Character|) '(|SetCategory|))) - (|HasCategory| (|Character|) '(|OrderedSet|)) (|HasCategory| (|Integer|) '(|OrderedSet|)) (|HasCategory| (|Character|) '(|SetCategory|)) @@ -778,15 +778,16 @@ 801 |#| 807) '((|shallowlyMutable| . 0) (|finiteAggregate| . 0)) (CONS (|makeByteWordVec2| 6 - '(0 0 0 0 0 0 0 6 0 5 0 0 0 1 4 0 1 2 3)) + '(0 0 0 0 0 0 0 5 0 4 5 0 0 0 1 6 0 1 2 3)) (CONS '#(|StringAggregate&| |OneDimensionalArrayAggregate&| |FiniteLinearAggregate&| |LinearAggregate&| |IndexedAggregate&| |Collection&| - |HomogeneousAggregate&| |OrderedSet&| - |EltableAggregate&| |SetCategory&| NIL - |Aggregate&| NIL |Evalable&| |BasicType&| NIL - |InnerEvalable&| NIL NIL) + |HomogeneousAggregate&| NIL + |EltableAggregate&| |SetCategory&| + |OrderedType&| NIL |Aggregate&| NIL + |Evalable&| |BasicType&| NIL |InnerEvalable&| + NIL NIL) (CONS '#((|StringAggregate|) (|OneDimensionalArrayAggregate| 8) (|FiniteLinearAggregate| 8) @@ -795,9 +796,10 @@ (|Collection| 8) (|HomogeneousAggregate| 8) (|OrderedSet|) (|EltableAggregate| 11 8) - (|SetCategory|) (|Eltable| 23 $$) - (|Aggregate|) (|Eltable| 11 8) - (|Evalable| 8) (|BasicType|) (|Type|) + (|SetCategory|) (|OrderedType|) + (|Eltable| 23 $$) (|Aggregate|) + (|Eltable| 11 8) (|Evalable| 8) + (|BasicType|) (|Type|) (|InnerEvalable| 8 8) (|CoercibleTo| 29) (|ConvertibleTo| 94)) (|makeByteWordVec2| 99 @@ -816,9 +818,9 @@ 88 2 10 13 0 0 1 1 0 0 0 38 1 0 0 0 1 2 0 0 0 8 1 2 0 0 0 33 1 3 0 97 0 11 11 1 2 0 13 0 0 67 3 0 13 0 0 11 62 2 - 0 74 0 33 76 2 0 74 0 8 75 1 6 13 0 1 - 2 0 13 96 0 1 1 6 0 0 1 2 0 0 96 0 1 - 1 6 0 0 1 2 0 0 96 0 1 2 0 13 0 7 1 3 + 0 74 0 33 76 2 0 74 0 8 75 1 5 13 0 1 + 2 0 13 96 0 1 1 5 0 0 1 2 0 0 96 0 1 + 1 5 0 0 1 2 0 0 96 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 95 0 1 0 0 0 1 2 0 0 0 8 79 2 0 0 0 33 80 1 0 0 0 1 1 0 0 0 1 3 0 0 0 23 0 @@ -828,9 +830,9 @@ 0 13 0 0 88 3 8 11 8 0 11 64 2 8 11 8 0 1 3 0 11 33 0 11 66 3 0 11 0 0 11 63 2 0 11 95 0 1 1 0 90 0 1 2 0 0 7 8 - 9 2 0 13 0 7 1 1 7 11 0 32 2 6 0 0 0 - 1 2 6 0 0 0 1 3 0 0 96 0 0 1 1 0 90 0 - 1 2 8 13 8 0 1 1 7 11 0 47 2 6 0 0 0 + 9 2 0 13 0 7 1 1 7 11 0 32 2 5 0 0 0 + 1 2 5 0 0 0 1 3 0 0 96 0 0 1 1 0 90 0 + 1 2 8 13 8 0 1 1 7 11 0 47 2 5 0 0 0 1 3 0 13 0 0 8 89 3 0 7 0 0 8 86 2 0 0 36 0 37 3 0 0 93 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 @@ -847,8 +849,8 @@ 1 3 0 0 0 0 11 81 1 0 0 0 20 1 3 94 0 1 1 0 0 90 1 2 0 0 0 0 19 1 0 0 74 82 2 0 0 8 0 1 2 0 0 0 8 1 1 9 29 0 31 1 - 0 0 8 1 2 8 13 0 0 1 2 0 13 95 0 1 2 - 6 13 0 0 1 2 6 13 0 0 1 2 10 13 0 0 - 17 2 6 13 0 0 1 2 6 13 0 0 18 1 0 7 0 + 0 0 8 1 2 10 13 0 0 1 2 0 13 95 0 1 2 + 5 13 0 0 1 2 5 13 0 0 1 2 10 13 0 0 + 17 2 5 13 0 0 1 2 5 13 0 0 18 1 0 7 0 16))))) '|lookupComplete|)) |