From f0b6be21e20a76251afe2bc2ae92800fb267da0b Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Fri, 30 Apr 2010 14:53:30 +0000
Subject: 	* interp/macros.lisp (|check-subtype|): Return coerced value
 if can. 	(|check-union|): Likewise. 	* interp/compiler.boot
 (coerceSuperset): Tidy.  Generate %Retract 	instruction. 	*
 interp/g-opt.boot (optRetract): New.

---
 src/algebra/strap/VECTOR.lsp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/algebra/strap/VECTOR.lsp')

diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp
index 2bb16105..1e069c4c 100644
--- a/src/algebra/strap/VECTOR.lsp
+++ b/src/algebra/strap/VECTOR.lsp
@@ -118,15 +118,15 @@
              |construct| 54)
           '((|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))
+                    '(0 0 0 0 0 0 0 0 5 0 0 0 1 4 0 1 2 3 4))
                 (CONS '#(|VectorCategory&|
                          |OneDimensionalArrayAggregate&|
                          |FiniteLinearAggregate&| |LinearAggregate&|
                          |IndexedAggregate&| |Collection&|
-                         |HomogeneousAggregate&| |OrderedSet&|
-                         |Aggregate&| |EltableAggregate&| |Evalable&|
-                         |SetCategory&| NIL NIL |InnerEvalable&| NIL
-                         NIL |BasicType&|)
+                         |HomogeneousAggregate&| |EltableAggregate&|
+                         |OrderedSet&| NIL |Aggregate&| NIL |Evalable&|
+                         |SetCategory&| NIL |InnerEvalable&| NIL NIL
+                         |BasicType&|)
                       (CONS '#((|VectorCategory| 6)
                                (|OneDimensionalArrayAggregate| 6)
                                (|FiniteLinearAggregate| 6)
@@ -134,9 +134,10 @@
                                (|IndexedAggregate| 7 6)
                                (|Collection| 6)
                                (|HomogeneousAggregate| 6)
-                               (|OrderedSet|) (|Aggregate|)
-                               (|EltableAggregate| 7 6) (|Evalable| 6)
-                               (|SetCategory|) (|Eltable| 7 6) (|Type|)
+                               (|EltableAggregate| 7 6) (|OrderedSet|)
+                               (|Eltable| 28 $$) (|Aggregate|)
+                               (|Eltable| 7 6) (|Evalable| 6)
+                               (|SetCategory|) (|Type|)
                                (|InnerEvalable| 6 6) (|CoercibleTo| 13)
                                (|ConvertibleTo| 14) (|BasicType|))
                             (|makeByteWordVec2| 20
-- 
cgit v1.2.3