diff --git a/basis/alien/arrays/arrays.factor b/basis/alien/arrays/arrays.factor index e56f151383..98994c753e 100755 --- a/basis/alien/arrays/arrays.factor +++ b/basis/alien/arrays/arrays.factor @@ -35,8 +35,8 @@ M: array stack-size drop "void*" stack-size ; M: array c-type-boxer-quot unclip [ array-length ] - [ [ require-c-type-arrays ] keep ] bi* - [ ] 2curry ; + [ [ require-c-arrays ] keep ] bi* + [ ] 2curry ; M: array c-type-unboxer-quot drop [ >c-ptr ] ; diff --git a/basis/cocoa/enumeration/enumeration.factor b/basis/cocoa/enumeration/enumeration.factor index 9da68e368b..5f931340c5 100644 --- a/basis/cocoa/enumeration/enumeration.factor +++ b/basis/cocoa/enumeration/enumeration.factor @@ -4,7 +4,7 @@ USING: accessors kernel classes.struct cocoa cocoa.types alien.c-types locals math sequences vectors fry libc destructors ; IN: cocoa.enumeration -<< "id" require-c-type-arrays >> +<< "id" require-c-arrays >> CONSTANT: NS-EACH-BUFFER-SIZE 16 @@ -19,7 +19,7 @@ CONSTANT: NS-EACH-BUFFER-SIZE 16 :: (NSFastEnumeration-each) ( object quot: ( elt -- ) state stackbuf count -- ) object state stackbuf count -> countByEnumeratingWithState:objects:count: :> items-count items-count 0 = [ - state itemsPtr>> [ items-count "id" ] [ stackbuf ] if* :> items + state itemsPtr>> [ items-count "id" ] [ stackbuf ] if* :> items items-count iota [ items nth quot call ] each object quot state stackbuf count (NSFastEnumeration-each) ] unless ; inline recursive diff --git a/basis/struct-arrays/struct-arrays.factor b/basis/struct-arrays/struct-arrays.factor index a3dcd98f0e..2161041a3f 100755 --- a/basis/struct-arrays/struct-arrays.factor +++ b/basis/struct-arrays/struct-arrays.factor @@ -54,13 +54,13 @@ ERROR: bad-byte-array-length byte-array ; INSTANCE: struct-array sequence -M: struct-type ( len c-type -- array ) - dup c-type-array-constructor +M: struct-type ( len c-type -- array ) + dup c-array-constructor [ execute( len -- array ) ] [ ] ?if ; inline -M: struct-type ( alien len c-type -- array ) - dup c-type-direct-array-constructor +M: struct-type ( alien len c-type -- array ) + dup c-direct-array-constructor [ execute( alien len -- array ) ] [ ] ?if ; inline