diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor index 80571d20b1..3816b930e0 100644 --- a/basis/bootstrap/image/image.factor +++ b/basis/bootstrap/image/image.factor @@ -374,10 +374,12 @@ M: tombstone ' [ emit-tuple ] cache-object ; ! Arrays -M: array ' +: emit-array ( array -- offset ) [ ' ] map array type-number object tag-number [ [ length emit-fixnum ] [ emit-seq ] bi ] emit-object ; +M: array ' emit-array ; + ! This is a hack. We need to detect arrays which are tuple ! layout arrays so that they can be internalized, but making ! them a built-in type is not worth it. @@ -389,7 +391,11 @@ PREDICATE: tuple-layout-array < array tri and and ] [ drop f ] if ; -M: tuple-layout-array ' [ call-next-method ] cache-object ; +M: tuple-layout-array ' + [ + [ dup integer? [ ] when ] map + emit-array + ] cache-object ; ! Quotations