aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/strap
diff options
context:
space:
mode:
Diffstat (limited to 'src/algebra/strap')
-rw-r--r--src/algebra/strap/LIST.lsp56
-rw-r--r--src/algebra/strap/VECTOR.lsp51
2 files changed, 52 insertions, 55 deletions
diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp
index 55078e68..d4c195af 100644
--- a/src/algebra/strap/LIST.lsp
+++ b/src/algebra/strap/LIST.lsp
@@ -158,9 +158,7 @@
(PROG (#0=#:G1444 |a| #1=#:G1445)
(RETURN
(SEQ (SPADCALL
- (CONS (SPADCALL
- (SPADCALL "construct" (|getShellEntry| $ 38))
- (|getShellEntry| $ 40))
+ (CONS (SPADCALL '|construct| (|getShellEntry| $ 39))
(PROGN
(LETT #0# NIL |LIST;convert;$If;13|)
(SEQ (LETT |a| NIL |LIST;convert;$If;13|)
@@ -175,12 +173,12 @@
(SEQ (EXIT (LETT #0#
(CONS
(SPADCALL |a|
- (|getShellEntry| $ 41))
+ (|getShellEntry| $ 40))
#0#)
|LIST;convert;$If;13|)))
(LETT #1# (CDR #1#) |LIST;convert;$If;13|)
(GO G190) G191 (EXIT (NREVERSE0 #0#)))))
- (|getShellEntry| $ 43))))))
+ (|getShellEntry| $ 42))))))
(DEFUN |List| (#0=#:G1446)
(PROG ()
@@ -205,7 +203,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|List|))
(LETT |dv$| (LIST '|List| |dv$1|) . #0#)
- (LETT $ (|newShell| 62) . #0#)
+ (LETT $ (|newShell| 61) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -270,7 +268,7 @@
$)))))
(COND
((|testBitVector| |pv$| 3)
- (|setShellEntry| $ 44
+ (|setShellEntry| $ 43
(CONS (|dispatchFunction| |LIST;convert;$If;13|) $))))
$))))
@@ -287,18 +285,18 @@
(73 . |concat|) (79 . |removeDuplicates|)
(84 . |setUnion|) (90 . |member?|)
(96 . |setIntersection|) (|Integer|) (102 . |elt|)
- (108 . |setDifference|) (|Symbol|) (114 . |coerce|)
- (|InputForm|) (119 . |convert|) (124 . |convert|)
- (|List| $) (129 . |convert|) (134 . |convert|)
- (|Mapping| 6 6 6) (|NonNegativeInteger|) (|List| 6)
- (|Equation| 6) (|List| 48) (|Mapping| 8 6)
- (|Mapping| 8 6 6) (|UniversalSegment| 34) '"last" '"rest"
- '"first" '"value" (|Mapping| 6 6) (|OutputForm|)
- (|SingleInteger|) (|List| 34) (|Union| 6 '"failed"))
- '#(|setUnion| 139 |setIntersection| 145 |setDifference| 151
- |removeDuplicates| 157 |null| 162 |nil| 167 |member?| 171
- |elt| 177 |convert| 183 |cons| 188 |concat| 194 |append|
- 200 |OMwrite| 206)
+ (108 . |setDifference|) (|Symbol|) (|InputForm|)
+ (114 . |convert|) (119 . |convert|) (|List| $)
+ (124 . |convert|) (129 . |convert|) (|Mapping| 6 6 6)
+ (|NonNegativeInteger|) (|List| 6) (|Equation| 6)
+ (|List| 47) (|Mapping| 8 6) (|Mapping| 8 6 6)
+ (|UniversalSegment| 34) '"last" '"rest" '"first" '"value"
+ (|Mapping| 6 6) (|OutputForm|) (|SingleInteger|)
+ (|List| 34) (|Union| 6 '"failed"))
+ '#(|setUnion| 134 |setIntersection| 140 |setDifference| 146
+ |removeDuplicates| 152 |null| 157 |nil| 162 |member?| 166
+ |elt| 172 |convert| 178 |cons| 183 |concat| 189 |append|
+ 195 |OMwrite| 201)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 6
'(0 0 0 0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4 6))
@@ -325,9 +323,9 @@
(|EltableAggregate| 34 6) (|Evalable| 6)
(|SetCategory|) (|Type|)
(|Eltable| 34 6) (|InnerEvalable| 6 6)
- (|CoercibleTo| 58) (|ConvertibleTo| 39)
+ (|CoercibleTo| 57) (|ConvertibleTo| 38)
(|BasicType|) (|OpenMath|))
- (|makeByteWordVec2| 44
+ (|makeByteWordVec2| 43
'(1 13 12 0 14 3 13 12 0 15 15 16 3 6
12 13 0 8 17 1 13 12 0 18 0 19 0 20 2
13 0 15 19 21 1 13 12 0 22 1 13 12 0
@@ -335,12 +333,12 @@
8 26 2 0 12 13 0 27 3 0 12 13 0 8 28
2 0 0 0 0 29 1 0 0 0 30 2 0 0 0 0 31
2 0 8 6 0 32 2 0 0 0 0 33 2 0 6 0 34
- 35 2 0 0 0 0 36 1 37 0 15 38 1 39 0
- 37 40 1 6 39 0 41 1 39 0 42 43 1 0 39
- 0 44 2 8 0 0 0 31 2 8 0 0 0 33 2 8 0
- 0 0 36 1 8 0 0 30 1 0 8 0 9 0 0 0 7 2
- 8 8 6 0 32 2 0 6 0 34 35 1 3 39 0 44
- 2 0 0 6 0 10 2 0 0 0 0 29 2 0 0 0 0
- 11 3 6 12 13 0 8 28 2 6 12 13 0 27 1
- 6 15 0 25 2 6 15 0 8 26)))))
+ 35 2 0 0 0 0 36 1 38 0 37 39 1 6 38 0
+ 40 1 38 0 41 42 1 0 38 0 43 2 8 0 0 0
+ 31 2 8 0 0 0 33 2 8 0 0 0 36 1 8 0 0
+ 30 1 0 8 0 9 0 0 0 7 2 8 8 6 0 32 2 0
+ 6 0 34 35 1 3 38 0 43 2 0 0 6 0 10 2
+ 0 0 0 0 29 2 0 0 0 0 11 3 6 12 13 0 8
+ 28 2 6 12 13 0 27 1 6 15 0 25 2 6 15
+ 0 8 26)))))
'|lookupIncomplete|))
diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp
index e7fae836..f7ad2d7f 100644
--- a/src/algebra/strap/VECTOR.lsp
+++ b/src/algebra/strap/VECTOR.lsp
@@ -12,11 +12,10 @@
(DEFUN |VECTOR;convert;$If;2| (|x| $)
(SPADCALL
- (LIST (SPADCALL (SPADCALL "vector" (|getShellEntry| $ 12))
- (|getShellEntry| $ 14))
- (SPADCALL (SPADCALL |x| (|getShellEntry| $ 15))
- (|getShellEntry| $ 16)))
- (|getShellEntry| $ 18)))
+ (LIST (SPADCALL '|vector| (|getShellEntry| $ 12))
+ (SPADCALL (SPADCALL |x| (|getShellEntry| $ 13))
+ (|getShellEntry| $ 14)))
+ (|getShellEntry| $ 16)))
(DEFUN |Vector| (#0=#:G1408)
(PROG ()
@@ -41,7 +40,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|Vector|))
(LETT |dv$| (LIST '|Vector| |dv$1|) . #0#)
- (LETT $ (|newShell| 36) . #0#)
+ (LETT $ (|newShell| 35) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -90,23 +89,23 @@
(|setShellEntry| $ 6 |#1|)
(COND
((|testBitVector| |pv$| 3)
- (|setShellEntry| $ 19
+ (|setShellEntry| $ 17
(CONS (|dispatchFunction| |VECTOR;convert;$If;2|) $))))
$))))
(MAKEPROP '|Vector| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL (|IndexedVector| 6 (NRTEVAL 1))
(|local| |#1|) (|List| 6) (0 . |construct|)
- |VECTOR;vector;L$;1| (|String|) (|Symbol|) (5 . |coerce|)
- (|InputForm|) (10 . |convert|) (15 . |parts|)
- (20 . |convert|) (|List| $) (25 . |convert|)
- (30 . |convert|) (|Mapping| 6 6 6) (|Boolean|)
- (|NonNegativeInteger|) (|Equation| 6) (|List| 23)
- (|Integer|) (|Mapping| 21 6) (|Mapping| 21 6 6)
- (|UniversalSegment| 25) (|Void|) (|Mapping| 6 6)
- (|OutputForm|) (|Matrix| 6) (|SingleInteger|)
- (|Union| 6 '"failed") (|List| 25))
- '#(|vector| 35 |parts| 40 |convert| 45 |construct| 50)
+ |VECTOR;vector;L$;1| (|Symbol|) (|InputForm|)
+ (5 . |convert|) (10 . |parts|) (15 . |convert|) (|List| $)
+ (20 . |convert|) (25 . |convert|) (|Mapping| 6 6 6)
+ (|Boolean|) (|NonNegativeInteger|) (|Equation| 6)
+ (|List| 21) (|Integer|) (|Mapping| 19 6)
+ (|Mapping| 19 6 6) (|UniversalSegment| 23) (|Void|)
+ (|Mapping| 6 6) (|OutputForm|) (|Matrix| 6)
+ (|SingleInteger|) (|String|) (|Union| 6 '"failed")
+ (|List| 23))
+ '#(|vector| 30 |parts| 35 |convert| 40 |construct| 45)
'((|shallowlyMutable| . 0) (|finiteAggregate| . 0))
(CONS (|makeByteWordVec2| 5
'(0 0 0 0 0 0 0 5 0 0 1 4 0 0 1 2 3 4))
@@ -122,18 +121,18 @@
(|OneDimensionalArrayAggregate| 6)
(|FiniteLinearAggregate| 6)
(|LinearAggregate| 6)
- (|IndexedAggregate| 25 6)
+ (|IndexedAggregate| 23 6)
(|Collection| 6)
(|HomogeneousAggregate| 6)
(|OrderedSet|) (|Aggregate|)
- (|EltableAggregate| 25 6) (|Evalable| 6)
+ (|EltableAggregate| 23 6) (|Evalable| 6)
(|SetCategory|) (|Type|)
- (|Eltable| 25 6) (|InnerEvalable| 6 6)
- (|CoercibleTo| 31) (|ConvertibleTo| 13)
+ (|Eltable| 23 6) (|InnerEvalable| 6 6)
+ (|CoercibleTo| 29) (|ConvertibleTo| 11)
(|BasicType|))
- (|makeByteWordVec2| 19
- '(1 0 0 7 8 1 11 0 10 12 1 13 0 11 14 1
- 0 7 0 15 1 7 13 0 16 1 13 0 17 18 1 0
- 13 0 19 1 0 0 7 9 1 0 7 0 15 1 3 13 0
- 19 1 0 0 7 8)))))
+ (|makeByteWordVec2| 17
+ '(1 0 0 7 8 1 11 0 10 12 1 0 7 0 13 1 7
+ 11 0 14 1 11 0 15 16 1 0 11 0 17 1 0
+ 0 7 9 1 0 7 0 13 1 3 11 0 17 1 0 0 7
+ 8)))))
'|lookupIncomplete|))
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-13 15:16:51 +0000