diff --git a/basis/cocoa/plists/plists.factor b/basis/cocoa/plists/plists.factor index 845061e610..31b59a6eac 100644 --- a/basis/cocoa/plists/plists.factor +++ b/basis/cocoa/plists/plists.factor @@ -32,7 +32,7 @@ DEFER: plist> [ plist> ] NSFastEnumeration-map ; : (plist-NSDictionary>) ( NSDictionary -- hashtable ) - dup [ tuck -> valueForKey: [ plist> ] bi@ 2array ] with + dup [ [ nip ] [ -> valueForKey: ] 2bi [ plist> ] bi@ 2array ] with NSFastEnumeration-map >hashtable ; : (read-plist) ( NSData -- id ) diff --git a/basis/io/launcher/unix/unix.factor b/basis/io/launcher/unix/unix.factor index ac25e4ec2f..5d7502f681 100644 --- a/basis/io/launcher/unix/unix.factor +++ b/basis/io/launcher/unix/unix.factor @@ -97,7 +97,7 @@ TUPLE: signal n ; dup WIFEXITED [ WEXITSTATUS ] [ WTERMSIG signal boa ] if ; M: unix wait-for-processes ( -- ? ) - -1 0 tuck WNOHANG waitpid + 0 -1 over WNOHANG waitpid dup 0 <= [ 2drop t ] [ diff --git a/basis/unicode/normalize/normalize.factor b/basis/unicode/normalize/normalize.factor index 892379dc89..602d9555ea 100644 --- a/basis/unicode/normalize/normalize.factor +++ b/basis/unicode/normalize/normalize.factor @@ -151,8 +151,8 @@ TUPLE: compose-state i str char after last-class ; DEFER: compose-iter -: try-noncombining ( char state -- state ) - tuck char>> swap combine-chars +: try-noncombining ( state char -- state ) + [ drop ] [ [ char>> ] dip combine-chars ] 2bi [ >>char to f >>last-class compose-iter ] when* ; inline : compose-iter ( state -- state ) @@ -161,7 +161,7 @@ DEFER: compose-iter { f [ drop ] } { 0 [ over last-class>> - [ drop ] [ swap try-noncombining ] if ] } + [ drop ] [ try-noncombining ] if ] } [ try-compose to compose-iter ] } case ] when* ; inline recursive