alien.arrays/classes.struct: ensure specialized array types for struct array slots...

diff --git a/basis/alien/arrays/arrays.factor b/basis/alien/arrays/arrays.factor
index 4fddba1de6ac068cdb0297e426e3d4de8867f8ee..f9a47f256c3f0d24fe0310bdfb27fdefca959f00 100644 (file)
--- a/basis/alien/arrays/arrays.factor
+++ b/basis/alien/arrays/arrays.factor
@@ -35,10 +35,7 @@ M: array box-return drop void* box-return ;
 M: array stack-size drop void* stack-size ;
 
 M: array c-type-boxer-quot
-    unclip
-    [ array-length ]
-    [ [ require-c-array ] keep ] bi*
-    [ <c-direct-array> ] 2curry ;
+    unclip [ array-length ] dip [ <c-direct-array> ] 2curry ;
 
 M: array c-type-unboxer-quot drop [ >c-ptr ] ;
 

diff --git a/basis/classes/struct/struct.factor b/basis/classes/struct/struct.factor
index af73be3aa4146269de3e6627c528499a06eec60c..3b2fc875c4321b45b9a76e34cc0fb8434cfdd9a1 100644 (file)
--- a/basis/classes/struct/struct.factor
+++ b/basis/classes/struct/struct.factor
@@ -147,6 +147,7 @@ M: struct-class initial-value* <struct> ; inline
 GENERIC: struct-slot-values ( struct -- sequence )
 
 M: struct-class reader-quot
+    dup array? [ dup first define-array-vocab drop ] when
     nip '[ _ read-struct-slot ] ;
 
 M: struct-class writer-quot