aboutsummaryrefslogtreecommitdiff
path: root/src/algebra
diff options
context:
space:
mode:
Diffstat (limited to 'src/algebra')
-rw-r--r--src/algebra/aggcat.spad.pamphlet10
-rw-r--r--src/algebra/catdef.spad.pamphlet2
-rw-r--r--src/algebra/strap/BOOLEAN.lsp10
-rw-r--r--src/algebra/strap/CHAR.lsp6
-rw-r--r--src/algebra/strap/DFLOAT.lsp24
-rw-r--r--src/algebra/strap/HOAGG-.lsp95
-rw-r--r--src/algebra/strap/HOAGG.lsp2
-rw-r--r--src/algebra/strap/ILIST.lsp95
-rw-r--r--src/algebra/strap/INT.lsp27
-rw-r--r--src/algebra/strap/ISTRING.lsp78
-rw-r--r--src/algebra/strap/LIST.lsp40
-rw-r--r--src/algebra/strap/NNI.lsp6
-rw-r--r--src/algebra/strap/OUTFORM.lsp6
-rw-r--r--src/algebra/strap/PI.lsp7
-rw-r--r--src/algebra/strap/SINT.lsp25
-rw-r--r--src/algebra/strap/SYMBOL.lsp7
-rw-r--r--src/algebra/strap/VECTOR.lsp28
17 files changed, 250 insertions, 218 deletions
diff --git a/src/algebra/aggcat.spad.pamphlet b/src/algebra/aggcat.spad.pamphlet
index 67f5a488..1241838b 100644
--- a/src/algebra/aggcat.spad.pamphlet
+++ b/src/algebra/aggcat.spad.pamphlet
@@ -100,6 +100,7 @@ import Evalable
++ to be modified or updated without changing its overall value.
HomogeneousAggregate(S:Type): Category == Aggregate with
if S has CoercibleTo(OutputForm) then CoercibleTo(OutputForm)
+ if S has BasicType then BasicType
if S has SetCategory then SetCategory
if S has SetCategory then
if S has Evalable S then Evalable S
@@ -139,17 +140,22 @@ HomogeneousAggregate(S:Type): Category == Aggregate with
add
if S has Evalable S then
eval(u:%,l:List Equation S):% == map(eval(#1,l),u)
+
if % has finiteAggregate then
#c == # parts c
any?(f, c) == or/[f x for x in parts c]
every?(f, c) == and/[f x for x in parts c]
count(f:S -> Boolean, c:%) == +/[1 for x in parts c | f x]
members x == parts x
+
+ if S has BasicType then
+ x = y ==
+ size?(x, #y) and (and/[a = b for a in parts x for b in parts y])
+
if S has SetCategory then
count(s:S, x:%) == count(s = #1, x)
member?(e, c) == any?(e = #1,c)
- x = y ==
- size?(x, #y) and (and/[a = b for a in parts x for b in parts y])
+
if S has CoercibleTo(OutputForm) then
coerce(x:%):OutputForm ==
bracket
diff --git a/src/algebra/catdef.spad.pamphlet b/src/algebra/catdef.spad.pamphlet
index 3cf7aab9..aa972025 100644
--- a/src/algebra/catdef.spad.pamphlet
+++ b/src/algebra/catdef.spad.pamphlet
@@ -219,7 +219,7 @@ import Boolean
++ Description:
++ \spadtype{BasicType} is the basic category for describing a collection
++ of elements with \spadop{=} (equality).
-BasicType(): Category == with
+BasicType(): Category == Type with
=: (%,%) -> Boolean ++ x=y tests if x and y are equal.
~=: (%,%) -> Boolean ++ x~=y tests if x and y are not equal.
add
diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp
index e1866956..97df8f04 100644
--- a/src/algebra/strap/BOOLEAN.lsp
+++ b/src/algebra/strap/BOOLEAN.lsp
@@ -200,13 +200,13 @@
172 < 178 |/\\| 184)
'NIL
(CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0))
- (CONS '#(NIL |OrderedSet&| NIL NIL NIL |Logic&|
- |SetCategory&| NIL NIL |BasicType&| NIL)
+ (CONS '#(NIL |OrderedSet&| NIL NIL |Logic&|
+ |SetCategory&| NIL |BasicType&| NIL NIL NIL)
(CONS '#((|OrderedFinite|) (|OrderedSet|)
(|PropositionalLogic|) (|Finite|)
- (|BooleanLogic|) (|Logic|)
- (|SetCategory|) (|ConvertibleTo| 33)
- (|Type|) (|BasicType|)
+ (|Logic|) (|SetCategory|)
+ (|BooleanLogic|) (|BasicType|)
+ (|ConvertibleTo| 33) (|Type|)
(|CoercibleTo| 35))
(|makeByteWordVec2| 38
'(1 25 18 0 26 0 27 0 29 0 25 0 31 2 0
diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp
index f45315ba..9db524ee 100644
--- a/src/algebra/strap/CHAR.lsp
+++ b/src/algebra/strap/CHAR.lsp
@@ -243,12 +243,12 @@
|alphanumeric?| 210 |alphabetic?| 215 >= 220 > 226 = 232
<= 238 < 244)
'NIL
- (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0))
+ (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0))
(CONS '#(NIL |OrderedSet&| NIL |SetCategory&|
- |BasicType&| NIL)
+ |BasicType&| NIL NIL)
(CONS '#((|OrderedFinite|) (|OrderedSet|)
(|Finite|) (|SetCategory|) (|BasicType|)
- (|CoercibleTo| 29))
+ (|Type|) (|CoercibleTo| 29))
(|makeByteWordVec2| 57
'(0 14 0 15 0 12 0 16 2 17 0 0 0 18 2
12 0 0 0 22 1 12 0 0 24 0 31 0 32 2
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp
index 9828f0bc..f290b4f4 100644
--- a/src/algebra/strap/DFLOAT.lsp
+++ b/src/algebra/strap/DFLOAT.lsp
@@ -976,18 +976,19 @@
|Algebra&| NIL NIL |OrderedRing&| |Module&|
NIL NIL |Module&| NIL NIL |Ring&| NIL NIL NIL
NIL NIL NIL NIL |AbelianGroup&| NIL NIL NIL
- NIL NIL |AbelianMonoid&| |Monoid&|
- |DifferentialSpace&| NIL |OrderedSet&| NIL NIL
- NIL NIL |AbelianSemiGroup&| |SemiGroup&| NIL
+ NIL NIL |AbelianMonoid&| |Monoid&| NIL
+ |OrderedSet&| NIL NIL NIL NIL
+ |AbelianSemiGroup&| |SemiGroup&| NIL
+ |DifferentialSpace&| |SetCategory&|
|TranscendentalFunctionCategory&|
|DifferentialDomain&| |RetractableTo&|
- |RetractableTo&| NIL |SetCategory&| NIL
+ |RetractableTo&| NIL |BasicType&| NIL
|ElementaryFunctionCategory&| NIL
|HyperbolicFunctionCategory&|
|ArcTrigonometricFunctionCategory&|
- |TrigonometricFunctionCategory&| NIL NIL NIL
- |RadicalCategory&| NIL NIL NIL NIL NIL
- |BasicType&| NIL)
+ |TrigonometricFunctionCategory&| NIL NIL
+ |RadicalCategory&| NIL NIL NIL NIL NIL NIL
+ NIL)
(CONS '#((|FloatingPointSystem|)
(|RealNumberSystem|) (|Field|)
(|EuclideanDomain|)
@@ -1011,7 +1012,6 @@
(|OrderedAbelianSemiGroup|)
(|LinearSet| 114) (|LinearSet| $$)
(|AbelianMonoid|) (|Monoid|)
- (|DifferentialSpace|)
(|PatternMatchable| 111) (|OrderedSet|)
(|LeftLinearSet| 114)
(|RightLinearSet| 114)
@@ -1019,24 +1019,24 @@
(|RightLinearSet| $$)
(|AbelianSemiGroup|) (|SemiGroup|)
(|LeftLinearSet| 25)
+ (|DifferentialSpace|) (|SetCategory|)
(|TranscendentalFunctionCategory|)
(|DifferentialDomain| $$)
(|RetractableTo| 114)
(|RetractableTo| 25) (|RealConstant|)
- (|SetCategory|) (|ConvertibleTo| 50)
+ (|BasicType|) (|ConvertibleTo| 50)
(|ElementaryFunctionCategory|)
(|ArcHyperbolicFunctionCategory|)
(|HyperbolicFunctionCategory|)
(|ArcTrigonometricFunctionCategory|)
(|TrigonometricFunctionCategory|)
- (|OpenMath|) (|Type|)
- (|ConvertibleTo| 154)
+ (|OpenMath|) (|ConvertibleTo| 154)
(|RadicalCategory|)
(|ConvertibleTo| 111)
(|ConvertibleTo| 13)
(|CoercibleFrom| 114)
(|CoercibleFrom| $$)
- (|CoercibleFrom| 25) (|BasicType|)
+ (|CoercibleFrom| 25) (|Type|)
(|CoercibleTo| 47))
(|makeByteWordVec2| 163
'(0 6 0 7 2 9 0 8 6 10 1 9 11 0 12 2 9
diff --git a/src/algebra/strap/HOAGG-.lsp b/src/algebra/strap/HOAGG-.lsp
index 22fc5a79..c5d5b902 100644
--- a/src/algebra/strap/HOAGG-.lsp
+++ b/src/algebra/strap/HOAGG-.lsp
@@ -20,15 +20,15 @@
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%List|)
|HOAGG-;members;AL;6|))
+(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Boolean|)
+ |HOAGG-;=;2AB;7|))
+
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|)
(|%IntegerSection| 0))
- |HOAGG-;count;SANni;7|))
+ |HOAGG-;count;SANni;8|))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Boolean|)
- |HOAGG-;member?;SAB;8|))
-
-(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Boolean|)
- |HOAGG-;=;2AB;9|))
+ |HOAGG-;member?;SAB;9|))
(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Thing|)
|HOAGG-;coerce;AOf;10|))
@@ -88,35 +88,19 @@
(DEFUN |HOAGG-;members;AL;6| (|x| $)
(SPADCALL |x| (|getShellEntry| $ 15)))
-(DEFUN |HOAGG-;count;SANni;7| (|s| |x| $)
- (SPADCALL (CONS #'|HOAGG-;count;SANni;7!0| (VECTOR $ |s|)) |x|
- (|getShellEntry| $ 33)))
-
-(DEFUN |HOAGG-;count;SANni;7!0| (|#1| $$)
- (SPADCALL (|getShellEntry| $$ 1) |#1|
- (|getShellEntry| (|getShellEntry| $$ 0) 32)))
-
-(DEFUN |HOAGG-;member?;SAB;8| (|e| |c| $)
- (SPADCALL (CONS #'|HOAGG-;member?;SAB;8!0| (VECTOR $ |e|)) |c|
- (|getShellEntry| $ 35)))
-
-(DEFUN |HOAGG-;member?;SAB;8!0| (|#1| $$)
- (SPADCALL (|getShellEntry| $$ 1) |#1|
- (|getShellEntry| (|getShellEntry| $$ 0) 32)))
-
-(DEFUN |HOAGG-;=;2AB;9| (|x| |y| $)
+(DEFUN |HOAGG-;=;2AB;7| (|x| |y| $)
(COND
- ((SPADCALL |x| (SPADCALL |y| (|getShellEntry| $ 37))
- (|getShellEntry| $ 38))
- (LET ((#0=#:G1421 NIL) (#1=#:G1422 T)
+ ((SPADCALL |x| (SPADCALL |y| (|getShellEntry| $ 32))
+ (|getShellEntry| $ 33))
+ (LET ((#0=#:G1419 NIL) (#1=#:G1420 T)
(#2=#:G1431 (SPADCALL |x| (|getShellEntry| $ 15)))
(#3=#:G1432 (SPADCALL |y| (|getShellEntry| $ 15))))
(LOOP
(COND
((OR (ATOM #2#) (ATOM #3#)) (RETURN (COND (#1# T) (T #0#))))
(T (LET ((|a| (CAR #2#)) (|b| (CAR #3#)))
- (LET ((#4=#:G1420
- (SPADCALL |a| |b| (|getShellEntry| $ 32))))
+ (LET ((#4=#:G1418
+ (SPADCALL |a| |b| (|getShellEntry| $ 34))))
(COND
(#1# (SETQ #0# #4#))
(T (SETQ #0# (AND #0# #4#))))
@@ -125,6 +109,22 @@
(SETQ #3# (CDR #3#)))))
('T NIL)))
+(DEFUN |HOAGG-;count;SANni;8| (|s| |x| $)
+ (SPADCALL (CONS #'|HOAGG-;count;SANni;8!0| (VECTOR $ |s|)) |x|
+ (|getShellEntry| $ 36)))
+
+(DEFUN |HOAGG-;count;SANni;8!0| (|#1| $$)
+ (SPADCALL (|getShellEntry| $$ 1) |#1|
+ (|getShellEntry| (|getShellEntry| $$ 0) 34)))
+
+(DEFUN |HOAGG-;member?;SAB;9| (|e| |c| $)
+ (SPADCALL (CONS #'|HOAGG-;member?;SAB;9!0| (VECTOR $ |e|)) |c|
+ (|getShellEntry| $ 38)))
+
+(DEFUN |HOAGG-;member?;SAB;9!0| (|#1| $$)
+ (SPADCALL (|getShellEntry| $$ 1) |#1|
+ (|getShellEntry| (|getShellEntry| $$ 0) 34)))
+
(DEFUN |HOAGG-;coerce;AOf;10| (|x| $)
(SPADCALL
(SPADCALL
@@ -151,6 +151,7 @@
(|HasCategory| |#2|
(LIST '|Evalable| (|devaluate| |#2|)))
(|HasCategory| |#2| '(|SetCategory|))
+ (|HasCategory| |#2| '(|BasicType|))
(|HasCategory| |#2|
(LIST '|CoercibleTo| '(|OutputForm|)))))))
(|setShellEntry| $ 0 |dv$|)
@@ -176,16 +177,18 @@
(|setShellEntry| $ 31
(CONS (|dispatchFunction| |HOAGG-;members;AL;6|) $))
(COND
+ ((|testBitVector| |pv$| 5)
+ (|setShellEntry| $ 35
+ (CONS (|dispatchFunction| |HOAGG-;=;2AB;7|) $))))
+ (COND
((|testBitVector| |pv$| 4)
(PROGN
- (|setShellEntry| $ 34
- (CONS (|dispatchFunction| |HOAGG-;count;SANni;7|) $))
- (|setShellEntry| $ 36
- (CONS (|dispatchFunction| |HOAGG-;member?;SAB;8|) $))
+ (|setShellEntry| $ 37
+ (CONS (|dispatchFunction| |HOAGG-;count;SANni;8|) $))
(|setShellEntry| $ 39
- (CONS (|dispatchFunction| |HOAGG-;=;2AB;9|) $)))))
+ (CONS (|dispatchFunction| |HOAGG-;member?;SAB;9|) $)))))
(COND
- ((|testBitVector| |pv$| 5)
+ ((|testBitVector| |pv$| 6)
(|setShellEntry| $ 45
(CONS (|dispatchFunction| |HOAGG-;coerce;AOf;10|) $)))))))
$))
@@ -198,10 +201,10 @@
(33 . |or|) (39 . |false|) (|Mapping| 19 7) (43 . |any?|)
(49 . |and|) (55 . |true|) (59 . |every?|) (65 . |One|)
(69 . +) (75 . |Zero|) (79 . |count|) (85 . |members|)
- (90 . =) (96 . |count|) (102 . |count|) (108 . |any?|)
- (114 . |member?|) (120 . |#|) (125 . |size?|) (131 . =)
- (|OutputForm|) (137 . |coerce|) (|List| $)
- (142 . |commaSeparate|) (147 . |bracket|)
+ (90 . |#|) (95 . |size?|) (101 . =) (107 . =)
+ (113 . |count|) (119 . |count|) (125 . |any?|)
+ (131 . |member?|) (|OutputForm|) (137 . |coerce|)
+ (|List| $) (142 . |commaSeparate|) (147 . |bracket|)
(152 . |coerce|))
'#(|members| 157 |member?| 162 |every?| 168 |eval| 174
|count| 180 |coerce| 192 |any?| 197 = 203 |#| 209)
@@ -215,13 +218,13 @@
18 2 19 0 0 0 20 0 19 0 21 2 0 19 22
0 23 2 19 0 0 0 24 0 19 0 25 2 0 19
22 0 26 0 16 0 27 2 16 0 0 0 28 0 16
- 0 29 2 0 16 22 0 30 1 0 14 0 31 2 7
- 19 0 0 32 2 6 16 22 0 33 2 0 16 7 0
- 34 2 6 19 22 0 35 2 0 19 7 0 36 1 6
- 16 0 37 2 6 19 0 16 38 2 0 19 0 0 39
- 1 7 40 0 41 1 40 0 42 43 1 40 0 0 44
- 1 0 40 0 45 1 0 14 0 31 2 0 19 7 0 36
- 2 0 19 22 0 26 2 0 0 0 9 13 2 0 16 7
- 0 34 2 0 16 22 0 30 1 0 40 0 45 2 0
- 19 22 0 23 2 0 19 0 0 39 1 0 16 0 18)))))
+ 0 29 2 0 16 22 0 30 1 0 14 0 31 1 6
+ 16 0 32 2 6 19 0 16 33 2 7 19 0 0 34
+ 2 0 19 0 0 35 2 6 16 22 0 36 2 0 16 7
+ 0 37 2 6 19 22 0 38 2 0 19 7 0 39 1 7
+ 40 0 41 1 40 0 42 43 1 40 0 0 44 1 0
+ 40 0 45 1 0 14 0 31 2 0 19 7 0 39 2 0
+ 19 22 0 26 2 0 0 0 9 13 2 0 16 7 0 37
+ 2 0 16 22 0 30 1 0 40 0 45 2 0 19 22
+ 0 23 2 0 19 0 0 35 1 0 16 0 18)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/HOAGG.lsp b/src/algebra/strap/HOAGG.lsp
index 152bfcd1..d256f98a 100644
--- a/src/algebra/strap/HOAGG.lsp
+++ b/src/algebra/strap/HOAGG.lsp
@@ -61,6 +61,8 @@
'(((|CoercibleTo| (|OutputForm|))
(|has| |t#1|
(|CoercibleTo| (|OutputForm|))))
+ ((|BasicType|)
+ (|has| |t#1| (|BasicType|)))
((|SetCategory|)
(|has| |t#1| (|SetCategory|)))
((|Evalable| |t#1|)
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp
index 6852cb5f..caed8efd 100644
--- a/src/algebra/strap/ILIST.lsp
+++ b/src/algebra/strap/ILIST.lsp
@@ -459,6 +459,9 @@
(LIST '|CoercibleTo| '(|OutputForm|))))
(|HasCategory| |#1|
(LIST '|ConvertibleTo| '(|InputForm|)))
+ (OR (|HasCategory| |#1| '(|BasicType|))
+ (|HasCategory| |#1| '(|OrderedSet|))
+ (|HasCategory| |#1| '(|SetCategory|)))
(OR (|HasCategory| |#1| '(|OrderedSet|))
(|HasCategory| |#1| '(|SetCategory|)))
(|HasCategory| |#1| '(|OrderedSet|))
@@ -466,6 +469,7 @@
(|HasCategory| |#1| '(|SetCategory|))
(|HasCategory| |#1|
(LIST '|CoercibleTo| '(|OutputForm|)))
+ (|HasCategory| |#1| '(|BasicType|))
(AND (|HasCategory| |#1| '(|SetCategory|))
(|HasCategory| |#1|
(LIST '|Evalable|
@@ -479,11 +483,11 @@
(|setShellEntry| $ 6 |#1|)
(|setShellEntry| $ 7 |#2|)
(COND
- ((|testBitVector| |pv$| 8)
+ ((|testBitVector| |pv$| 9)
(|setShellEntry| $ 50
(CONS (|dispatchFunction| |ILIST;coerce;$Of;21|) $))))
(COND
- ((|testBitVector| |pv$| 7)
+ ((|testBitVector| |pv$| 8)
(PROGN
(|setShellEntry| $ 54
(CONS (|dispatchFunction| |ILIST;=;2$B;22|) $))
@@ -492,7 +496,7 @@
(|setShellEntry| $ 60
(CONS (|dispatchFunction| |ILIST;member?;S$B;24|) $)))))
(COND
- ((|testBitVector| |pv$| 7)
+ ((|testBitVector| |pv$| 8)
(|setShellEntry| $ 62
(CONS (|dispatchFunction| |ILIST;removeDuplicates!;2$;26|)
$))))
@@ -550,17 +554,18 @@
|children| 881 |child?| 886 |before?| 892 |any?| 898 >=
904 > 910 = 916 <= 922 < 928 |#| 934)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
- (CONS (|makeByteWordVec2| 5
- '(0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 1 4 0 1 2 3 4))
+ (CONS (|makeByteWordVec2| 6
+ '(0 0 0 0 0 0 0 0 0 0 6 0 5 0 0 0 1 4 0 1 2 3))
(CONS '#(|ListAggregate&| |StreamAggregate&|
|ExtensibleLinearAggregate&|
|FiniteLinearAggregate&|
|UnaryRecursiveAggregate&| |LinearAggregate&|
|RecursiveAggregate&| |IndexedAggregate&|
|Collection&| |HomogeneousAggregate&|
- |EltableAggregate&| |OrderedSet&| NIL
- |Aggregate&| NIL |Evalable&| |SetCategory&|
- NIL |InnerEvalable&| NIL NIL |BasicType&|)
+ |OrderedSet&| |EltableAggregate&|
+ |SetCategory&| NIL |Aggregate&| NIL
+ |Evalable&| |BasicType&| NIL |InnerEvalable&|
+ NIL NIL)
(CONS '#((|ListAggregate| 6)
(|StreamAggregate| 6)
(|ExtensibleLinearAggregate| 6)
@@ -571,12 +576,12 @@
(|IndexedAggregate| 30 6)
(|Collection| 6)
(|HomogeneousAggregate| 6)
- (|EltableAggregate| 30 6) (|OrderedSet|)
- (|Eltable| 78 $$) (|Aggregate|)
- (|Eltable| 30 6) (|Evalable| 6)
- (|SetCategory|) (|Type|)
+ (|OrderedSet|) (|EltableAggregate| 30 6)
+ (|SetCategory|) (|Eltable| 78 $$)
+ (|Aggregate|) (|Eltable| 30 6)
+ (|Evalable| 6) (|BasicType|) (|Type|)
(|InnerEvalable| 6 6) (|CoercibleTo| 37)
- (|ConvertibleTo| 82) (|BasicType|))
+ (|ConvertibleTo| 82))
(|makeByteWordVec2| 85
'(1 11 0 0 33 2 8 11 0 0 34 1 0 11 0 35
0 38 0 39 1 0 0 0 40 1 6 37 0 41 2 38
@@ -588,50 +593,50 @@
6 11 0 0 59 2 0 11 6 0 60 1 0 0 0 62
0 30 0 66 2 30 11 0 0 67 0 8 0 68 2
30 0 0 0 69 2 30 11 0 0 71 2 30 0 0 0
- 72 2 7 11 0 0 1 1 0 6 0 1 1 0 6 0 1 1
- 0 0 0 1 3 0 77 0 30 30 1 2 0 0 0 30
- 70 1 5 11 0 1 2 0 11 63 0 1 1 5 0 0 1
- 2 0 0 63 0 64 1 5 0 0 1 2 0 0 63 0 1
+ 72 2 10 11 0 0 1 1 0 6 0 1 1 0 6 0 1
+ 1 0 0 0 1 3 0 77 0 30 30 1 2 0 0 0 30
+ 70 1 6 11 0 1 2 0 11 63 0 1 1 6 0 0 1
+ 2 0 0 63 0 64 1 6 0 0 1 2 0 0 63 0 1
2 0 11 0 8 1 2 0 6 0 6 1 2 0 0 0 0 23
2 0 6 0 6 1 2 0 6 0 6 21 3 0 6 0 30 6
1 3 0 6 0 78 6 1 3 0 6 0 79 6 1 3 0 0
0 19 0 24 3 0 6 0 14 6 22 3 0 6 0 80
6 1 2 0 0 0 44 1 2 0 0 76 0 1 2 0 0
76 0 1 1 0 6 0 1 0 0 0 1 1 0 0 0 28 1
- 0 0 0 29 2 0 0 0 8 32 1 0 0 0 18 1 7
- 0 0 62 1 7 0 0 1 2 7 0 6 0 1 2 0 0 76
- 0 1 2 7 0 6 0 1 2 0 0 76 0 1 4 7 6 73
+ 0 0 0 29 2 0 0 0 8 32 1 0 0 0 18 1 8
+ 0 0 62 1 8 0 0 1 2 8 0 6 0 1 2 0 0 76
+ 0 1 2 8 0 6 0 1 2 0 0 76 0 1 4 8 6 73
0 6 6 1 2 0 6 73 0 1 3 0 6 73 0 6 1 3
0 6 0 30 6 1 2 0 6 0 30 1 1 0 11 0 1
- 3 7 30 6 0 30 1 2 7 30 6 0 1 2 0 30
- 76 0 1 1 0 25 0 27 1 0 44 0 1 2 7 11
- 0 0 1 2 0 0 8 6 1 2 0 11 0 8 1 1 6 30
- 0 31 2 5 0 0 0 1 2 5 0 0 0 1 3 0 0 63
- 0 0 65 2 5 0 0 0 1 3 0 0 63 0 0 1 1 0
- 25 0 1 2 7 11 6 0 60 1 6 30 0 1 2 5 0
+ 3 8 30 6 0 30 1 2 8 30 6 0 1 2 0 30
+ 76 0 1 1 0 25 0 27 1 0 44 0 1 2 8 11
+ 0 0 1 2 0 0 8 6 1 2 0 11 0 8 1 1 7 30
+ 0 31 2 6 0 0 0 1 2 6 0 0 0 1 3 0 0 63
+ 0 0 65 2 6 0 0 0 1 3 0 0 63 0 0 1 1 0
+ 25 0 1 2 8 11 6 0 60 1 7 30 0 1 2 6 0
0 0 1 2 0 0 81 0 1 3 0 0 73 0 0 1 2 0
0 81 0 1 1 0 0 6 1 2 0 11 0 8 1 1 0
- 25 0 1 1 0 11 0 1 1 7 55 0 58 2 0 0 0
+ 25 0 1 1 0 11 0 1 1 8 55 0 58 2 0 0 0
8 1 1 0 6 0 1 3 0 0 0 0 30 1 3 0 0 6
0 30 1 3 0 0 0 0 30 1 3 0 0 6 0 30 1
- 1 0 84 0 1 2 0 11 30 0 1 1 7 83 0 1 2
+ 1 0 84 0 1 2 0 11 30 0 1 1 8 83 0 1 2
0 0 0 8 1 1 0 6 0 13 2 0 85 76 0 1 2
0 0 0 6 1 1 0 11 0 1 2 0 11 76 0 1 3
- 9 0 0 6 6 1 3 9 0 0 25 25 1 2 9 0 0
- 74 1 2 9 0 0 75 1 2 0 11 0 0 12 2 7
- 11 6 0 1 1 0 25 0 1 1 0 11 0 17 0 0 0
- 16 3 0 6 0 30 6 1 2 0 6 0 30 1 2 0 0
- 0 78 1 2 0 6 0 79 1 2 0 0 0 19 20 2 0
- 6 0 14 15 2 0 6 0 80 1 2 0 30 0 0 1 2
- 0 0 0 30 1 2 0 0 0 78 1 2 0 0 0 78 1
- 2 0 0 0 30 1 1 0 11 0 35 1 0 0 0 1 1
- 0 0 0 1 1 0 8 0 1 1 0 0 0 40 2 7 8 6
- 0 1 2 0 8 76 0 1 3 0 0 0 0 30 1 1 0 0
- 0 36 1 3 82 0 1 1 0 0 25 26 2 0 0 0 6
- 1 2 0 0 0 0 61 2 0 0 0 6 1 1 0 0 44 1
- 2 0 0 6 0 10 2 0 0 0 0 1 1 8 37 0 50
- 1 0 44 0 1 2 7 11 0 0 1 2 7 11 0 0 1
- 2 0 11 76 0 1 2 5 11 0 0 1 2 5 11 0 0
- 1 2 7 11 0 0 54 2 5 11 0 0 1 2 5 11 0
- 0 1 1 0 8 0 9)))))
+ 11 0 0 6 6 1 3 11 0 0 25 25 1 2 11 0
+ 0 74 1 2 11 0 0 75 1 2 0 11 0 0 12 2
+ 8 11 6 0 1 1 0 25 0 1 1 0 11 0 17 0 0
+ 0 16 3 0 6 0 30 6 1 2 0 6 0 30 1 2 0
+ 0 0 78 1 2 0 6 0 79 1 2 0 0 0 19 20 2
+ 0 6 0 14 15 2 0 6 0 80 1 2 0 30 0 0 1
+ 2 0 0 0 30 1 2 0 0 0 78 1 2 0 0 0 78
+ 1 2 0 0 0 30 1 1 0 11 0 35 1 0 0 0 1
+ 1 0 0 0 1 1 0 8 0 1 1 0 0 0 40 2 8 8
+ 6 0 1 2 0 8 76 0 1 3 0 0 0 0 30 1 1 0
+ 0 0 36 1 3 82 0 1 1 0 0 25 26 2 0 0 0
+ 6 1 2 0 0 0 0 61 2 0 0 0 6 1 1 0 0 44
+ 1 2 0 0 6 0 10 2 0 0 0 0 1 1 9 37 0
+ 50 1 0 44 0 1 2 8 11 0 0 1 2 8 11 0 0
+ 1 2 0 11 76 0 1 2 6 11 0 0 1 2 6 11 0
+ 0 1 2 10 11 0 0 54 2 6 11 0 0 1 2 6
+ 11 0 0 1 1 0 8 0 9)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index 52c49a41..0c4f5705 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -620,11 +620,11 @@
|Ring&| NIL NIL NIL NIL NIL NIL
|AbelianGroup&| NIL NIL NIL NIL
|AbelianMonoid&| |Monoid&| NIL NIL
- |DifferentialSpace&| |OrderedSet&| NIL NIL
- |AbelianSemiGroup&| |SemiGroup&| NIL NIL
- |RetractableTo&| |DifferentialDomain&|
- |SetCategory&| NIL NIL NIL NIL NIL NIL NIL NIL
- NIL NIL NIL |BasicType&| NIL)
+ |OrderedSet&| NIL NIL |AbelianSemiGroup&|
+ |SemiGroup&| NIL |DifferentialSpace&|
+ |SetCategory&| NIL |RetractableTo&|
+ |DifferentialDomain&| |BasicType&| NIL NIL NIL
+ NIL NIL NIL NIL NIL NIL NIL NIL NIL)
(CONS '#((|IntegerNumberSystem|)
(|EuclideanDomain|)
(|UniqueFactorizationDomain|)
@@ -648,24 +648,23 @@
(|OrderedAbelianSemiGroup|)
(|LinearSet| $$) (|AbelianMonoid|)
(|Monoid|) (|StepThrough|)
- (|PatternMatchable| 17)
- (|DifferentialSpace|) (|OrderedSet|)
+ (|PatternMatchable| 17) (|OrderedSet|)
(|LeftLinearSet| $$)
(|RightLinearSet| $$)
(|AbelianSemiGroup|) (|SemiGroup|)
- (|LeftLinearSet| 17) (|RealConstant|)
- (|RetractableTo| 17)
- (|DifferentialDomain| $$)
- (|SetCategory|) (|OpenMath|)
- (|ConvertibleTo| 14)
+ (|LeftLinearSet| 17)
+ (|DifferentialSpace|) (|SetCategory|)
+ (|RealConstant|) (|RetractableTo| 17)
+ (|DifferentialDomain| $$) (|BasicType|)
+ (|OpenMath|) (|ConvertibleTo| 14)
(|ConvertibleTo| 55)
(|ConvertibleTo| 58)
(|CombinatorialFunctionCategory|)
(|ConvertibleTo| 131)
(|ConvertibleTo| 61)
- (|ConvertibleTo| 17) (|Type|)
+ (|ConvertibleTo| 17)
(|CoercibleFrom| $$)
- (|CoercibleFrom| 17) (|BasicType|)
+ (|CoercibleFrom| 17) (|Type|)
(|CoercibleTo| 44))
(|makeByteWordVec2| 140
'(0 7 0 8 1 12 11 0 13 3 12 11 0 14 14
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index b3224386..3e20cd5c 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -692,6 +692,12 @@
(|HasCategory| (|Character|)
(LIST '|ConvertibleTo| '(|InputForm|)))
(OR (|HasCategory| (|Character|)
+ '(|BasicType|))
+ (|HasCategory| (|Character|)
+ '(|OrderedSet|))
+ (|HasCategory| (|Character|)
+ '(|SetCategory|)))
+ (OR (|HasCategory| (|Character|)
'(|OrderedSet|))
(|HasCategory| (|Character|)
'(|SetCategory|)))
@@ -701,6 +707,7 @@
'(|SetCategory|))
(|HasCategory| (|Character|)
(LIST '|CoercibleTo| '(|OutputForm|)))
+ (|HasCategory| (|Character|) '(|BasicType|))
(AND (|HasCategory| (|Character|)
'(|SetCategory|))
(|HasCategory| (|Character|)
@@ -770,16 +777,16 @@
755 |before?| 765 |any?| 771 >= 777 > 783 = 789 <= 795 <
801 |#| 807)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
- (CONS (|makeByteWordVec2| 5
- '(0 0 0 0 0 0 0 0 5 0 0 0 1 4 0 1 2 3 4))
+ (CONS (|makeByteWordVec2| 6
+ '(0 0 0 0 0 0 0 6 0 5 0 0 0 1 4 0 1 2 3))
(CONS '#(|StringAggregate&|
|OneDimensionalArrayAggregate&|
|FiniteLinearAggregate&| |LinearAggregate&|
|IndexedAggregate&| |Collection&|
- |HomogeneousAggregate&| |EltableAggregate&|
- |OrderedSet&| NIL |Aggregate&| NIL |Evalable&|
- |SetCategory&| NIL |InnerEvalable&| NIL NIL
- |BasicType&|)
+ |HomogeneousAggregate&| |OrderedSet&|
+ |EltableAggregate&| |SetCategory&| NIL
+ |Aggregate&| NIL |Evalable&| |BasicType&| NIL
+ |InnerEvalable&| NIL NIL)
(CONS '#((|StringAggregate|)
(|OneDimensionalArrayAggregate| 8)
(|FiniteLinearAggregate| 8)
@@ -787,12 +794,12 @@
(|IndexedAggregate| 11 8)
(|Collection| 8)
(|HomogeneousAggregate| 8)
- (|EltableAggregate| 11 8) (|OrderedSet|)
- (|Eltable| 23 $$) (|Aggregate|)
- (|Eltable| 11 8) (|Evalable| 8)
- (|SetCategory|) (|Type|)
+ (|OrderedSet|) (|EltableAggregate| 11 8)
+ (|SetCategory|) (|Eltable| 23 $$)
+ (|Aggregate|) (|Eltable| 11 8)
+ (|Evalable| 8) (|BasicType|) (|Type|)
(|InnerEvalable| 8 8) (|CoercibleTo| 29)
- (|ConvertibleTo| 94) (|BasicType|))
+ (|ConvertibleTo| 94))
(|makeByteWordVec2| 99
'(0 11 0 12 2 11 13 0 0 14 0 11 0 21 2
11 0 0 0 22 2 23 0 11 11 24 1 23 0 11
@@ -806,41 +813,42 @@
13 0 61 2 33 13 8 0 65 2 8 13 0 0 69
0 70 0 71 2 70 0 2 0 72 1 70 0 0 73 2
11 0 0 0 83 2 11 13 0 0 87 2 0 13 0 0
- 88 2 7 13 0 0 1 1 0 0 0 38 1 0 0 0 1
+ 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 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 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 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
- 57 1 7 0 0 1 2 7 0 8 0 1 2 0 0 95 0 1
- 4 7 8 93 0 8 8 1 3 0 8 93 0 8 1 2 0 8
+ 57 1 8 0 0 1 2 8 0 8 0 1 2 0 0 95 0 1
+ 4 8 8 93 0 8 8 1 3 0 8 93 0 8 1 2 0 8
93 0 1 3 0 8 0 11 8 1 2 0 8 0 11 1 2
- 0 13 0 0 88 3 7 11 8 0 11 64 2 7 11 8
+ 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 6 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 7 13 8 0 1 1 6 11 0 47 2 5 0 0 0
+ 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
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
- 0 0 8 77 2 0 0 0 33 78 1 7 28 0 43 3
+ 0 0 8 77 2 0 0 0 33 78 1 8 28 0 43 3
0 0 8 0 11 1 3 0 0 0 0 11 27 1 0 99 0
- 1 2 0 13 11 0 1 1 7 84 0 85 1 6 8 0 1
+ 1 2 0 13 11 0 1 1 8 84 0 85 1 7 8 0 1
2 0 98 95 0 1 2 0 0 0 8 1 2 0 13 95 0
- 1 3 9 0 0 90 90 1 3 9 0 0 8 8 1 2 9 0
- 0 92 1 2 9 0 0 91 1 2 0 13 0 0 1 2 7
- 13 8 0 1 1 0 90 0 1 1 0 13 0 15 0 0 0
- 10 2 0 0 0 0 1 2 0 0 0 23 25 2 0 8 0
- 11 68 3 0 8 0 11 8 1 2 0 0 0 11 1 2 0
- 0 0 23 1 2 7 7 8 0 1 2 0 7 95 0 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 8 29 0 31 1 0 0 8
- 1 2 7 13 0 0 1 2 0 13 95 0 1 2 5 13 0
- 0 1 2 5 13 0 0 1 2 7 13 0 0 17 2 5 13
- 0 0 1 2 5 13 0 0 18 1 0 7 0 16)))))
+ 1 3 11 0 0 90 90 1 3 11 0 0 8 8 1 2
+ 11 0 0 92 1 2 11 0 0 91 1 2 0 13 0 0
+ 1 2 8 13 8 0 1 1 0 90 0 1 1 0 13 0 15
+ 0 0 0 10 2 0 0 0 0 1 2 0 0 0 23 25 2
+ 0 8 0 11 68 3 0 8 0 11 8 1 2 0 0 0 11
+ 1 2 0 0 0 23 1 2 8 7 8 0 1 2 0 7 95 0
+ 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
+ 16)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp
index 3f7d4cd1..f9271e8b 100644
--- a/src/algebra/strap/LIST.lsp
+++ b/src/algebra/strap/LIST.lsp
@@ -203,6 +203,9 @@
(LIST '|CoercibleTo| '(|OutputForm|))))
(|HasCategory| |#1|
(LIST '|ConvertibleTo| '(|InputForm|)))
+ (OR (|HasCategory| |#1| '(|BasicType|))
+ (|HasCategory| |#1| '(|OrderedSet|))
+ (|HasCategory| |#1| '(|SetCategory|)))
(OR (|HasCategory| |#1| '(|OrderedSet|))
(|HasCategory| |#1| '(|SetCategory|)))
(|HasCategory| |#1| '(|OrderedSet|))
@@ -211,6 +214,7 @@
(|HasCategory| |#1| '(|SetCategory|))
(|HasCategory| |#1|
(LIST '|CoercibleTo| '(|OutputForm|)))
+ (|HasCategory| |#1| '(|BasicType|))
(AND (|HasCategory| |#1| '(|SetCategory|))
(|HasCategory| |#1|
(LIST '|Evalable|
@@ -222,7 +226,7 @@
(|stuffDomainSlots| $)
(|setShellEntry| $ 6 |#1|)
(COND
- ((|testBitVector| |pv$| 6)
+ ((|testBitVector| |pv$| 7)
(PROGN
(|setShellEntry| $ 31
(CONS (|dispatchFunction| |LIST;OMwrite;$S;6|) $))
@@ -233,7 +237,7 @@
(|setShellEntry| $ 34
(CONS (|dispatchFunction| |LIST;OMwrite;Omd$BV;9|) $)))))
(COND
- ((|testBitVector| |pv$| 8)
+ ((|testBitVector| |pv$| 9)
(PROGN
(|setShellEntry| $ 37
(CONS (|dispatchFunction| |LIST;setUnion;3$;10|) $))
@@ -278,17 +282,18 @@
235 |convert| 241 |cons| 246 |concat| 252 |append| 264
|OMwrite| 270)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
- (CONS (|makeByteWordVec2| 6
- '(0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 1 4 0 1 2 3 4 6))
+ (CONS (|makeByteWordVec2| 7
+ '(0 0 0 0 0 0 0 0 0 0 6 0 5 0 0 0 1 4 0 1 2 3 7))
(CONS '#(|ListAggregate&| |StreamAggregate&|
|ExtensibleLinearAggregate&|
|FiniteLinearAggregate&|
|UnaryRecursiveAggregate&| |LinearAggregate&|
|RecursiveAggregate&| |IndexedAggregate&|
|Collection&| |HomogeneousAggregate&|
- |EltableAggregate&| |OrderedSet&| NIL
- |Aggregate&| NIL |Evalable&| |SetCategory&|
- NIL |InnerEvalable&| NIL NIL |BasicType&| NIL)
+ |OrderedSet&| |EltableAggregate&|
+ |SetCategory&| NIL |Aggregate&| NIL
+ |Evalable&| |BasicType&| NIL |InnerEvalable&|
+ NIL NIL NIL)
(CONS '#((|ListAggregate| 6)
(|StreamAggregate| 6)
(|ExtensibleLinearAggregate| 6)
@@ -299,13 +304,12 @@
(|IndexedAggregate| 7 6)
(|Collection| 6)
(|HomogeneousAggregate| 6)
- (|EltableAggregate| 7 6) (|OrderedSet|)
- (|Eltable| 61 $$) (|Aggregate|)
- (|Eltable| 7 6) (|Evalable| 6)
- (|SetCategory|) (|Type|)
+ (|OrderedSet|) (|EltableAggregate| 7 6)
+ (|SetCategory|) (|Eltable| 61 $$)
+ (|Aggregate|) (|Eltable| 7 6)
+ (|Evalable| 6) (|BasicType|) (|Type|)
(|InnerEvalable| 6 6) (|CoercibleTo| 45)
- (|ConvertibleTo| 46) (|BasicType|)
- (|OpenMath|))
+ (|ConvertibleTo| 46) (|OpenMath|))
(|makeByteWordVec2| 53
'(0 7 0 8 1 15 14 0 16 3 15 14 0 17 17
18 1 10 0 0 19 1 0 6 0 20 0 10 0 21 3
@@ -318,12 +322,12 @@
2 0 10 6 0 40 2 0 0 0 0 41 2 0 6 0 7
42 2 0 0 6 0 43 2 0 0 0 0 44 1 46 0
45 47 1 6 46 0 48 2 49 0 46 0 50 1 46
- 0 51 52 1 0 46 0 53 2 8 0 0 0 37 2 8
- 0 0 0 41 2 8 0 0 0 44 1 0 0 0 23 1 8
- 0 0 36 1 0 10 0 11 0 0 0 9 2 8 10 6 0
+ 0 51 52 1 0 46 0 53 2 9 0 0 0 37 2 9
+ 0 0 0 41 2 9 0 0 0 44 1 0 0 0 23 1 9
+ 0 0 36 1 0 10 0 11 0 0 0 9 2 9 10 6 0
40 1 0 6 0 20 1 0 10 0 39 0 0 0 38 2
0 6 0 7 42 1 3 46 0 53 2 0 0 6 0 12 2
0 0 0 0 35 2 0 0 6 0 43 2 0 0 0 0 13
- 3 6 14 15 0 10 34 2 6 17 0 10 32 2 6
- 14 15 0 33 1 6 17 0 31)))))
+ 3 7 14 15 0 10 34 2 7 17 0 10 32 2 7
+ 14 15 0 33 1 7 17 0 31)))))
'|lookupIncomplete|))
diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp
index eba910e6..6ba995a7 100644
--- a/src/algebra/strap/NNI.lsp
+++ b/src/algebra/strap/NNI.lsp
@@ -82,10 +82,10 @@
|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 (|makeByteWordVec2| 1 '(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)
+ |SetCategory&| |BasicType&| NIL NIL)
(CONS '#((|OrderedAbelianMonoidSup|)
(|OrderedCancellationAbelianMonoid|)
(|OrderedAbelianMonoid|)
@@ -93,7 +93,7 @@
(|OrderedAbelianSemiGroup|) (|Monoid|)
(|AbelianMonoid|) (|OrderedSet|)
(|SemiGroup|) (|AbelianSemiGroup|)
- (|SetCategory|) (|BasicType|)
+ (|SetCategory|) (|BasicType|) (|Type|)
(|CoercibleTo| 21))
(|makeByteWordVec2| 21
'(0 0 0 6 0 5 0 7 2 5 8 0 0 9 2 5 0 0 0
diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index dd5ede72..64660b88 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -1087,9 +1087,9 @@
624 |and| 630 SEGMENT 636 >= 647 > 653 = 659 <= 671 < 677
/ 683 - 689 + 700 ** 706 * 712)
'NIL
- (CONS (|makeByteWordVec2| 1 '(0 0 0))
- (CONS '#(|SetCategory&| |BasicType&| NIL)
- (CONS '#((|SetCategory|) (|BasicType|)
+ (CONS (|makeByteWordVec2| 1 '(0 0 0 0))
+ (CONS '#(|SetCategory&| |BasicType&| NIL NIL)
+ (CONS '#((|SetCategory|) (|BasicType|) (|Type|)
(|CoercibleTo| 18))
(|makeByteWordVec2| 149
'(1 7 11 0 12 0 26 0 27 2 7 0 0 26 28 2
diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp
index 000a27c9..de4ba8f3 100644
--- a/src/algebra/strap/PI.lsp
+++ b/src/algebra/strap/PI.lsp
@@ -39,14 +39,15 @@
|latex| 46 |hash| 51 |gcd| 56 |coerce| 62 |before?| 67
|One| 73 >= 77 > 83 = 89 <= 95 < 101 + 107 ** 113 * 125)
'(((|commutative| "*") . 0))
- (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0))
+ (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0))
(CONS '#(NIL |Monoid&| |OrderedSet&| |SemiGroup&|
|AbelianSemiGroup&| |SetCategory&|
- |BasicType&| NIL)
+ |BasicType&| NIL NIL)
(CONS '#((|OrderedAbelianSemiGroup|) (|Monoid|)
(|OrderedSet|) (|SemiGroup|)
(|AbelianSemiGroup|) (|SetCategory|)
- (|BasicType|) (|CoercibleTo| 15))
+ (|BasicType|) (|Type|)
+ (|CoercibleTo| 15))
(|makeByteWordVec2| 15
'(0 5 0 6 0 7 0 8 2 5 9 0 0 10 2 0 9 0
0 1 0 0 0 1 1 0 12 0 1 1 0 9 0 1 2 0
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp
index 4dcb6617..82ab1e35 100644
--- a/src/algebra/strap/SINT.lsp
+++ b/src/algebra/strap/SINT.lsp
@@ -634,11 +634,11 @@
|Ring&| NIL NIL NIL NIL NIL NIL
|AbelianGroup&| NIL NIL NIL NIL NIL
|AbelianMonoid&| |Monoid&| NIL NIL NIL
- |DifferentialSpace&| |OrderedSet&| NIL NIL
- |AbelianSemiGroup&| |SemiGroup&| NIL |Logic&|
- NIL NIL |RetractableTo&| |DifferentialDomain&|
- |SetCategory&| NIL NIL NIL NIL NIL NIL NIL NIL
- NIL NIL |BasicType&| NIL)
+ |OrderedSet&| NIL NIL |AbelianSemiGroup&|
+ |SemiGroup&| NIL |Logic&| |DifferentialSpace&|
+ |SetCategory&| NIL NIL |RetractableTo&|
+ |DifferentialDomain&| |BasicType&| NIL NIL NIL
+ NIL NIL NIL NIL NIL NIL NIL NIL)
(CONS '#((|IntegerNumberSystem|)
(|EuclideanDomain|)
(|UniqueFactorizationDomain|)
@@ -662,24 +662,23 @@
(|OrderedAbelianSemiGroup|)
(|LinearSet| $$) (|AbelianMonoid|)
(|Monoid|) (|Finite|) (|StepThrough|)
- (|PatternMatchable| 5)
- (|DifferentialSpace|) (|OrderedSet|)
+ (|PatternMatchable| 5) (|OrderedSet|)
(|LeftLinearSet| $$)
(|RightLinearSet| $$)
(|AbelianSemiGroup|) (|SemiGroup|)
(|LeftLinearSet| 5) (|Logic|)
+ (|DifferentialSpace|) (|SetCategory|)
(|BooleanLogic|) (|RealConstant|)
(|RetractableTo| 5)
- (|DifferentialDomain| $$)
- (|SetCategory|) (|OpenMath|)
- (|ConvertibleTo| 102)
+ (|DifferentialDomain| $$) (|BasicType|)
+ (|OpenMath|) (|ConvertibleTo| 102)
(|ConvertibleTo| 103)
(|CombinatorialFunctionCategory|)
(|ConvertibleTo| 105)
(|ConvertibleTo| 106)
- (|ConvertibleTo| 5) (|Type|)
- (|CoercibleFrom| $$) (|CoercibleFrom| 5)
- (|BasicType|) (|CoercibleTo| 33))
+ (|ConvertibleTo| 5) (|CoercibleFrom| $$)
+ (|CoercibleFrom| 5) (|Type|)
+ (|CoercibleTo| 33))
(|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
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index e5372535..9f36bb38 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -728,12 +728,13 @@
|argscript| 600 |OMwrite| 606 >= 630 > 636 = 642 <= 648 <
654)
'NIL
- (CONS (|makeByteWordVec2| 1 '(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))
(CONS '#(|OrderedSet&| NIL NIL |SetCategory&|
- |BasicType&| NIL NIL NIL NIL NIL NIL NIL)
+ |BasicType&| NIL NIL NIL NIL NIL NIL NIL NIL)
(CONS '#((|OrderedSet|) (|PatternMatchable| 70)
(|PatternMatchable| 6) (|SetCategory|)
- (|BasicType|) (|ConvertibleTo| 72)
+ (|BasicType|) (|Type|)
+ (|ConvertibleTo| 72)
(|ConvertibleTo| 65)
(|CoercibleFrom| 14)
(|ConvertibleTo| 25) (|OpenMath|)
diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp
index 98d29103..26f9b901 100644
--- a/src/algebra/strap/VECTOR.lsp
+++ b/src/algebra/strap/VECTOR.lsp
@@ -63,6 +63,9 @@
(LIST '|CoercibleTo| '(|OutputForm|))))
(|HasCategory| |#1|
(LIST '|ConvertibleTo| '(|InputForm|)))
+ (OR (|HasCategory| |#1| '(|BasicType|))
+ (|HasCategory| |#1| '(|OrderedSet|))
+ (|HasCategory| |#1| '(|SetCategory|)))
(OR (|HasCategory| |#1| '(|OrderedSet|))
(|HasCategory| |#1| '(|SetCategory|)))
(|HasCategory| |#1| '(|OrderedSet|))
@@ -78,6 +81,7 @@
(|HasCategory| |#1| '(|Ring|)))
(|HasCategory| |#1|
(LIST '|CoercibleTo| '(|OutputForm|)))
+ (|HasCategory| |#1| '(|BasicType|))
(AND (|HasCategory| |#1| '(|SetCategory|))
(|HasCategory| |#1|
(LIST '|Evalable|
@@ -109,16 +113,16 @@
'#(|vector| 34 |parts| 39 |maxIndex| 44 |convert| 49
|construct| 54)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
- (CONS (|makeByteWordVec2| 5
- '(0 0 0 0 0 0 0 0 5 0 0 0 1 4 0 1 2 3 4))
+ (CONS (|makeByteWordVec2| 6
+ '(0 0 0 0 0 0 0 6 0 5 0 0 0 1 4 0 1 2 3))
(CONS '#(|VectorCategory&|
|OneDimensionalArrayAggregate&|
|FiniteLinearAggregate&| |LinearAggregate&|
|IndexedAggregate&| |Collection&|
- |HomogeneousAggregate&| |EltableAggregate&|
- |OrderedSet&| NIL |Aggregate&| NIL |Evalable&|
- |SetCategory&| NIL |InnerEvalable&| NIL NIL
- |BasicType&|)
+ |HomogeneousAggregate&| |OrderedSet&|
+ |EltableAggregate&| |SetCategory&| NIL
+ |Aggregate&| NIL |Evalable&| |BasicType&| NIL
+ |InnerEvalable&| NIL NIL)
(CONS '#((|VectorCategory| 6)
(|OneDimensionalArrayAggregate| 6)
(|FiniteLinearAggregate| 6)
@@ -126,15 +130,15 @@
(|IndexedAggregate| 7 6)
(|Collection| 6)
(|HomogeneousAggregate| 6)
- (|EltableAggregate| 7 6) (|OrderedSet|)
- (|Eltable| 28 $$) (|Aggregate|)
- (|Eltable| 7 6) (|Evalable| 6)
- (|SetCategory|) (|Type|)
+ (|OrderedSet|) (|EltableAggregate| 7 6)
+ (|SetCategory|) (|Eltable| 28 $$)
+ (|Aggregate|) (|Eltable| 7 6)
+ (|Evalable| 6) (|BasicType|) (|Type|)
(|InnerEvalable| 6 6) (|CoercibleTo| 13)
- (|ConvertibleTo| 14) (|BasicType|))
+ (|ConvertibleTo| 14))
(|makeByteWordVec2| 20
'(0 7 0 8 1 0 0 9 10 1 14 0 13 15 1 0 9
0 16 1 9 14 0 17 1 14 0 18 19 1 0 14
- 0 20 1 0 0 9 11 1 0 9 0 16 1 6 7 0 12
+ 0 20 1 0 0 9 11 1 0 9 0 16 1 7 7 0 12
1 3 14 0 20 1 0 0 9 10)))))
'|lookupIncomplete|))
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-06 16:53:40 +0000