diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/algebra/strap/DFLOAT.lsp | 12 | ||||
-rw-r--r-- | src/algebra/strap/INT.lsp | 7 | ||||
-rw-r--r-- | src/algebra/strap/RING.lsp | 20 | ||||
-rw-r--r-- | src/algebra/strap/SINT.lsp | 11 | ||||
-rw-r--r-- | src/algebra/strap/SYMBOL.lsp | 13 |
5 files changed, 33 insertions, 30 deletions
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index 06bc62b3..c696356e 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -1020,7 +1020,7 @@ (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0)) + 0 0 0 0 0 0 0 0 0)) (CONS '#(|FloatingPointSystem&| |RealNumberSystem&| |Field&| |EuclideanDomain&| NIL |UniqueFactorizationDomain&| |GcdDomain&| @@ -1038,7 +1038,7 @@ |HyperbolicFunctionCategory&| |ArcTrigonometricFunctionCategory&| |TrigonometricFunctionCategory&| NIL NIL - |RadicalCategory&| NIL NIL NIL NIL + |RadicalCategory&| NIL NIL NIL NIL NIL |BasicType&| NIL) (CONS '#((|FloatingPointSystem|) (|RealNumberSystem|) (|Field|) @@ -1074,11 +1074,11 @@ (|ArcTrigonometricFunctionCategory|) (|TrigonometricFunctionCategory|) (|OpenMath|) (|ConvertibleTo| 129) - (|RadicalCategory|) - (|CoercibleFrom| 104) - (|CoercibleFrom| 24) + (|RadicalCategory|) (|CoercibleFrom| 24) (|ConvertibleTo| 101) - (|ConvertibleTo| 13) (|BasicType|) + (|ConvertibleTo| 13) + (|CoercibleFrom| 104) + (|CoercibleFrom| $$) (|BasicType|) (|CoercibleTo| 38)) (|makeByteWordVec2| 139 '(0 6 0 7 2 9 0 8 6 10 1 9 11 0 12 2 9 diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index 72601092..ee770745 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -628,7 +628,7 @@ (|unitsKnown| . 0)) (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)) + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)) (CONS '#(|IntegerNumberSystem&| |EuclideanDomain&| |UniqueFactorizationDomain&| NIL NIL |GcdDomain&| |IntegralDomain&| |Algebra&| NIL @@ -638,7 +638,7 @@ |Monoid&| NIL NIL |OrderedSet&| |AbelianSemiGroup&| |SemiGroup&| NIL |RetractableTo&| |SetCategory&| NIL NIL NIL - NIL NIL NIL NIL NIL NIL |BasicType&| NIL) + NIL NIL NIL NIL NIL NIL NIL |BasicType&| NIL) (CONS '#((|IntegerNumberSystem|) (|EuclideanDomain|) (|UniqueFactorizationDomain|) @@ -670,7 +670,8 @@ (|ConvertibleTo| 123) (|ConvertibleTo| 50) (|CoercibleFrom| 11) - (|ConvertibleTo| 11) (|BasicType|) + (|ConvertibleTo| 11) + (|CoercibleFrom| $$) (|BasicType|) (|CoercibleTo| 36)) (|makeByteWordVec2| 131 '(1 7 6 0 8 3 7 6 0 9 9 10 2 7 6 0 11 diff --git a/src/algebra/strap/RING.lsp b/src/algebra/strap/RING.lsp index 7b61ea0f..cf341577 100644 --- a/src/algebra/strap/RING.lsp +++ b/src/algebra/strap/RING.lsp @@ -4,18 +4,18 @@ (DEFPARAMETER |Ring;AL| 'NIL) (DEFUN |Ring;| () - (PROG (#0=#:G1397) + (PROG (#0=#:G1398) (RETURN (PROG1 (LETT #0# - (|Join| (|Rng|) (|Monoid|) (|LeftModule| '$) - (|mkCategory| '|domain| - '(((|characteristic| - ((|NonNegativeInteger|))) - T) - ((|coerce| ($ (|Integer|))) T)) - '((|unitsKnown| T)) - '((|Integer|) (|NonNegativeInteger|)) - NIL)) + (|sublisV| (PAIR '(#1=#:G1397) (LIST '(|Integer|))) + (|Join| (|Rng|) (|Monoid|) (|LeftModule| '$) + (|CoercibleFrom| '#1#) + (|mkCategory| '|package| + '(((|characteristic| + ((|NonNegativeInteger|))) + T)) + '((|unitsKnown| T)) + '((|NonNegativeInteger|)) NIL))) |Ring|) (|setShellEntry| #0# 0 '(|Ring|)))))) diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index d98748ea..cce89b66 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -572,7 +572,7 @@ (|leftUnitary| . 0) (|unitsKnown| . 0)) (CONS (|makeByteWordVec2| 1 '(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)) + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)) (CONS '#(|IntegerNumberSystem&| |EuclideanDomain&| |UniqueFactorizationDomain&| NIL NIL |GcdDomain&| |IntegralDomain&| |Algebra&| NIL @@ -582,7 +582,7 @@ |Monoid&| NIL NIL |OrderedSet&| |AbelianSemiGroup&| |SemiGroup&| |Logic&| NIL |RetractableTo&| |SetCategory&| NIL NIL NIL - NIL NIL NIL NIL NIL |BasicType&| NIL) + NIL NIL NIL NIL NIL NIL |BasicType&| NIL) (CONS '#((|IntegerNumberSystem|) (|EuclideanDomain|) (|UniqueFactorizationDomain|) @@ -612,8 +612,9 @@ (|CombinatorialFunctionCategory|) (|ConvertibleTo| 92) (|ConvertibleTo| 94) - (|CoercibleFrom| 12) - (|ConvertibleTo| 12) (|BasicType|) + (|ConvertibleTo| 12) + (|CoercibleFrom| $$) + (|CoercibleFrom| 12) (|BasicType|) (|CoercibleTo| 29)) (|makeByteWordVec2| 104 '(1 8 7 0 9 3 8 7 0 10 10 11 2 8 7 0 12 @@ -644,7 +645,7 @@ 61 1 0 0 0 1 2 0 0 0 56 1 1 0 0 0 51 1 0 0 0 1 1 0 90 0 1 1 0 91 0 1 1 0 92 0 1 1 0 94 0 1 1 0 12 0 32 1 0 0 - 12 82 1 0 0 12 82 1 0 0 0 1 1 0 29 0 + 12 82 1 0 0 0 1 1 0 0 12 82 1 0 29 0 31 0 0 56 1 2 0 22 0 0 1 2 0 0 0 0 1 0 0 0 37 2 0 22 0 0 1 3 0 0 0 0 0 74 1 0 0 0 63 2 0 0 0 0 44 0 0 0 35 2 0 diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp index f19cf4da..cbbd5a3b 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -871,13 +871,14 @@ |elt| 371 |convert| 377 |coerce| 397 |argscript| 407 |OMwrite| 413 >= 437 > 443 = 449 <= 455 < 461) 'NIL - (CONS (|makeByteWordVec2| 1 '(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)) (CONS '#(|OrderedSet&| NIL NIL |SetCategory&| - |BasicType&| NIL NIL NIL NIL NIL NIL) + |BasicType&| NIL NIL NIL NIL NIL NIL NIL) (CONS '#((|OrderedSet|) (|PatternMatchable| 67) (|PatternMatchable| 6) (|SetCategory|) (|BasicType|) (|ConvertibleTo| 69) (|ConvertibleTo| 62) + (|CoercibleFrom| 13) (|ConvertibleTo| 24) (|OpenMath|) (|ConvertibleTo| 44) (|CoercibleTo| 51)) (|makeByteWordVec2| 125 @@ -903,11 +904,11 @@ 0 0 0 54 59 2 0 0 0 54 57 1 0 13 0 84 1 0 81 0 87 1 0 21 0 22 2 0 0 0 55 56 2 0 0 0 81 82 0 0 0 124 0 0 23 106 3 - 0 65 0 62 65 66 3 0 72 0 69 72 73 1 0 - 0 0 101 0 0 0 95 1 0 0 0 83 2 0 0 0 0 + 0 72 0 69 72 73 3 0 65 0 62 65 66 0 0 + 0 95 1 0 0 0 101 1 0 0 0 83 2 0 0 0 0 1 2 0 0 0 0 1 1 0 78 0 107 1 0 13 0 - 90 1 0 125 0 1 2 0 0 0 54 58 1 0 62 0 - 77 1 0 69 0 75 1 0 24 0 47 1 0 44 0 + 90 1 0 125 0 1 2 0 0 0 54 58 1 0 69 0 + 75 1 0 62 0 77 1 0 24 0 47 1 0 44 0 46 1 0 0 13 48 1 0 51 0 53 2 0 0 0 54 60 3 0 23 25 0 21 36 2 0 13 0 21 34 2 0 23 25 0 35 1 0 13 0 33 2 0 21 0 0 1 |