diff --git a/basis/cocoa/plists/plists.factor b/basis/cocoa/plists/plists.factor index e8d28b0004..020b744b69 100644 --- a/basis/cocoa/plists/plists.factor +++ b/basis/cocoa/plists/plists.factor @@ -4,8 +4,9 @@ USING: strings arrays hashtables assocs sequences fry macros cocoa.messages cocoa.classes cocoa.application cocoa kernel namespaces io.backend math cocoa.enumeration byte-arrays -combinators alien.c-types alien.data words core-foundation -quotations core-foundation.data core-foundation.utilities ; +combinators alien.c-types alien.data words quotations +core-foundation core-foundation.data core-foundation.strings +core-foundation.utilities ; IN: cocoa.plists : >plist ( value -- plist ) >cf -> autorelease ; @@ -18,9 +19,6 @@ DEFER: plist> ) ( NSString -- string ) - -> UTF8String ; - : (plist-NSNumber>) ( NSNumber -- number ) dup -> doubleValue dup >integer = [ -> longLongValue ] [ -> doubleValue ] if ; @@ -55,7 +53,7 @@ ERROR: invalid-plist-object object ; : plist> ( plist -- value ) { - { NSString [ (plist-NSString>) ] } + { NSString [ CF>string ] } { NSNumber [ (plist-NSNumber>) ] } { NSData [ (plist-NSData>) ] } { NSArray [ (plist-NSArray>) ] }