diff --git a/basis/cpu/x86/assembler/assembler.factor b/basis/cpu/x86/assembler/assembler.factor index 05fe3a8093..27c00cb3c0 100644 --- a/basis/cpu/x86/assembler/assembler.factor +++ b/basis/cpu/x86/assembler/assembler.factor @@ -130,7 +130,7 @@ M: register modifier drop BIN: 11 ; GENERIC# n, 1 ( value n -- ) M: integer n, >le % ; -M: byte n, >r value>> r> n, ; +M: byte n, [ value>> ] dip n, ; : 1, ( n -- ) 1 n, ; inline : 4, ( n -- ) 4 n, ; inline : 2, ( n -- ) 2 n, ; inline @@ -209,7 +209,7 @@ M: object operand-64? drop f ; : short-operand ( reg rex.w n -- ) #! Some instructions encode their single operand as part of #! the opcode. - >r dupd prefix-1 reg-code r> + , ; + [ dupd prefix-1 reg-code ] dip + , ; : opcode, ( opcode -- ) dup array? [ % ] [ , ] if ; @@ -224,7 +224,7 @@ M: object operand-64? drop f ; : 1-operand ( op reg,rex.w,opcode -- ) #! The 'reg' is not really a register, but a value for the #! 'reg' field of the mod-r/m byte. - first3 >r >r over r> prefix-1 r> opcode, swap addressing ; + first3 [ [ over ] dip prefix-1 ] dip opcode, swap addressing ; : immediate-operand-size-bit ( imm dst reg,rex.w,opcode -- imm dst reg,rex.w,opcode ) pick integer? [ first3 BIN: 1 opcode-or 3array ] when ; @@ -250,7 +250,7 @@ M: object operand-64? drop f ; ] if ; : (2-operand) ( dst src op -- ) - >r 2dup t rex-prefix r> opcode, + [ 2dup t rex-prefix ] dip opcode, reg-code swap addressing ; : direction-bit ( dst src op -- dst' src' op' ) @@ -271,11 +271,11 @@ M: object operand-64? drop f ; PRIVATE> : [] ( reg/displacement -- indirect ) - dup integer? [ >r f f f r> ] [ f f f ] if ; + dup integer? [ [ f f f ] dip ] [ f f f ] if ; : [+] ( reg displacement -- indirect ) dup integer? - [ dup zero? [ drop f ] when >r f f r> ] + [ dup zero? [ drop f ] when [ f f ] dip ] [ f f ] if ; diff --git a/basis/cpu/x86/assembler/syntax/syntax.factor b/basis/cpu/x86/assembler/syntax/syntax.factor index d267baaf4f..6ddec4af07 100644 --- a/basis/cpu/x86/assembler/syntax/syntax.factor +++ b/basis/cpu/x86/assembler/syntax/syntax.factor @@ -4,8 +4,8 @@ USING: kernel words sequences lexer parser fry ; IN: cpu.x86.assembler.syntax : define-register ( name num size -- ) - >r >r "cpu.x86.assembler" create dup define-symbol r> r> - >r dupd "register" set-word-prop r> + [ "cpu.x86.assembler" create dup define-symbol ] 2dip + [ dupd "register" set-word-prop ] dip "register-size" set-word-prop ; : define-registers ( names size -- ) diff --git a/basis/io/buffers/buffers-tests.factor b/basis/io/buffers/buffers-tests.factor index b3c5c4ee90..4425e08106 100644 --- a/basis/io/buffers/buffers-tests.factor +++ b/basis/io/buffers/buffers-tests.factor @@ -5,7 +5,7 @@ destructors ; : buffer-set ( string buffer -- ) over >byte-array over ptr>> byte-array>memory - >r length r> buffer-reset ; + [ length ] dip buffer-reset ; : string>buffer ( string -- buffer ) dup length tuck buffer-set ; diff --git a/basis/io/encodings/utf16/utf16.factor b/basis/io/encodings/utf16/utf16.factor index 037087e452..167d7534d1 100644 --- a/basis/io/encodings/utf16/utf16.factor +++ b/basis/io/encodings/utf16/utf16.factor @@ -25,7 +25,7 @@ ERROR: missing-bom ; : quad-be ( stream byte -- stream char ) double-be over stream-read1 [ dup -2 shift BIN: 110111 number= [ - >r 2 shift r> BIN: 11 bitand bitor + [ 2 shift ] dip BIN: 11 bitand bitor over stream-read1 swap append-nums HEX: 10000 + ] [ 2drop dup stream-read1 drop replacement-char ] if ] when* ; diff --git a/basis/io/monitors/monitors.factor b/basis/io/monitors/monitors.factor index 7f33f0caa6..72f2bc80c5 100644 --- a/basis/io/monitors/monitors.factor +++ b/basis/io/monitors/monitors.factor @@ -53,7 +53,7 @@ SYMBOL: +rename-file-new+ SYMBOL: +rename-file+ : with-monitor ( path recursive? quot -- ) - >r r> with-disposal ; inline + [ ] dip with-disposal ; inline { { [ os macosx? ] [ "io.unix.macosx.monitors" require ] } diff --git a/basis/io/monitors/recursive/recursive.factor b/basis/io/monitors/recursive/recursive.factor index 45979363c9..a96c6f04f1 100644 --- a/basis/io/monitors/recursive/recursive.factor +++ b/basis/io/monitors/recursive/recursive.factor @@ -3,7 +3,7 @@ USING: accessors sequences assocs arrays continuations destructors combinators kernel threads concurrency.messaging concurrency.mailboxes concurrency.promises io.files io.monitors -debugger ; +debugger fry ; IN: io.monitors.recursive ! Simulate recursive monitors on platforms that don't have them @@ -29,10 +29,10 @@ DEFER: add-child-monitor qualify-path dup link-info directory? [ [ add-child-monitors ] [ - [ - [ f my-mailbox (monitor) ] keep + '[ + _ [ f my-mailbox (monitor) ] keep monitor tget children>> set-at - ] curry ignore-errors + ] ignore-errors ] bi ] [ drop ] if ; @@ -48,7 +48,7 @@ M: recursive-monitor dispose* monitor tget children>> [ nip dispose ] assoc-each ; : pump-step ( msg -- ) - first3 path>> swap >r prepend-path r> monitor tget 3array + first3 path>> swap [ prepend-path ] dip monitor tget 3array monitor tget queue>> mailbox-put ; @@ -71,9 +71,9 @@ M: recursive-monitor dispose* : pump-loop ( -- ) receive dup synchronous? [ - >r stop-pump t r> reply-synchronous + [ stop-pump t ] dip reply-synchronous ] [ - [ [ update-hierarchy ] curry ignore-errors ] [ pump-step ] bi + [ '[ _ update-hierarchy ] ignore-errors ] [ pump-step ] bi pump-loop ] if ; @@ -88,7 +88,7 @@ M: recursive-monitor dispose* pump-loop ; : start-pump-thread ( monitor -- ) - dup [ pump-thread ] curry + dup '[ _ pump-thread ] "Recursive monitor pump" spawn >>thread drop ; @@ -96,7 +96,7 @@ M: recursive-monitor dispose* ready>> ?promise ?linked drop ; : ( path mailbox -- monitor ) - >r (normalize-path) r> + [ (normalize-path) ] dip recursive-monitor new-monitor H{ } clone >>children >>ready diff --git a/basis/io/pools/pools.factor b/basis/io/pools/pools.factor index aa734e6809..2c1f8ea3c3 100644 --- a/basis/io/pools/pools.factor +++ b/basis/io/pools/pools.factor @@ -42,7 +42,7 @@ GENERIC: make-connection ( pool -- conn ) [ nip call ] [ drop return-connection ] 3bi ; inline : with-pooled-connection ( pool quot -- ) - >r [ acquire-connection ] keep r> + [ [ acquire-connection ] keep ] dip [ (with-pooled-connection) ] [ ] [ 2drop dispose ] cleanup ; inline M: return-connection dispose diff --git a/basis/io/streams/duplex/duplex.factor b/basis/io/streams/duplex/duplex.factor index 2ba504c653..9bf637432f 100644 --- a/basis/io/streams/duplex/duplex.factor +++ b/basis/io/streams/duplex/duplex.factor @@ -27,7 +27,7 @@ M: duplex-stream dispose ] with-destructors ; : ( stream-in stream-out encoding -- duplex ) - tuck re-encode >r re-decode r> ; + tuck [ re-decode ] [ re-encode ] 2bi* ; : with-stream* ( stream quot -- ) [ [ in>> ] [ out>> ] bi ] dip with-streams* ; inline diff --git a/basis/io/timeouts/timeouts.factor b/basis/io/timeouts/timeouts.factor index 029cf6cac0..fd1b14de19 100644 --- a/basis/io/timeouts/timeouts.factor +++ b/basis/io/timeouts/timeouts.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Slava Pestov, Doug Coleman ! See http://factorcode.org/license.txt for BSD license. USING: kernel calendar alarms io io.encodings accessors -namespaces ; +namespaces fry ; IN: io.timeouts GENERIC: timeout ( obj -- dt/f ) @@ -14,14 +14,14 @@ M: encoder set-timeout stream>> set-timeout ; GENERIC: cancel-operation ( obj -- ) : queue-timeout ( obj timeout -- alarm ) - >r [ cancel-operation ] curry r> later ; + [ '[ _ cancel-operation ] ] dip later ; : with-timeout* ( obj timeout quot -- ) - 3dup drop queue-timeout >r nip call r> cancel-alarm ; + 3dup drop queue-timeout [ nip call ] dip cancel-alarm ; inline : with-timeout ( obj quot -- ) - over timeout [ >r dup timeout r> with-timeout* ] [ call ] if ; + over timeout [ [ dup timeout ] dip with-timeout* ] [ call ] if ; inline : timeouts ( dt -- ) diff --git a/basis/io/unix/backend/backend.factor b/basis/io/unix/backend/backend.factor index 5bb0b82555..85363c8404 100644 --- a/basis/io/unix/backend/backend.factor +++ b/basis/io/unix/backend/backend.factor @@ -5,7 +5,7 @@ math io.ports sequences strings sbufs threads unix vectors io.buffers io.backend io.encodings math.parser continuations system libc qualified namespaces make io.timeouts io.encodings.utf8 destructors accessors summary combinators -locals unix.time ; +locals unix.time fry ; QUALIFIED: io IN: io.unix.backend @@ -88,19 +88,16 @@ M: io-timeout summary drop "I/O operation timed out" ; : wait-for-fd ( handle event -- ) dup +retry+ eq? [ 2drop ] [ - [ - >r - swap handle-fd - mx get-global - r> { + '[ + swap handle-fd mx get-global _ { { +input+ [ add-input-callback ] } { +output+ [ add-output-callback ] } } case - ] curry "I/O" suspend nip [ io-timeout ] when + ] "I/O" suspend nip [ io-timeout ] when ] if ; : wait-for-port ( port event -- ) - [ >r handle>> r> wait-for-fd ] curry with-timeout ; + '[ handle>> _ wait-for-fd ] with-timeout ; ! Some general stuff : file-mode OCT: 0666 ; diff --git a/basis/io/unix/linux/monitors/monitors.factor b/basis/io/unix/linux/monitors/monitors.factor index 12b1cf779b..f27d48c6b0 100644 --- a/basis/io/unix/linux/monitors/monitors.factor +++ b/basis/io/unix/linux/monitors/monitors.factor @@ -36,9 +36,7 @@ TUPLE: linux-monitor < monitor wd inotify watches disposed ; inotify-fd -rot inotify_add_watch dup io-error dup check-existing ; : add-watch ( path mask mailbox -- monitor ) - >r - >r (normalize-path) r> - [ (add-watch) ] [ drop ] 2bi r> + [ [ (normalize-path) ] dip [ (add-watch) ] [ drop ] 2bi ] dip [ ] [ ] [ wd>> ] tri watches get set-at ; : check-inotify ( -- ) @@ -103,12 +101,12 @@ M: linux-monitor dispose* ( monitor -- ) : next-event ( i buffer -- i buffer ) 2dup inotify-event@ inotify-event-len "inotify-event" heap-size + - swap >r + r> ; + swap [ + ] dip ; : parse-file-notifications ( i buffer -- ) 2dup events-exhausted? [ 2drop ] [ 2dup inotify-event@ dup inotify-event-wd wd>monitor - >r parse-file-notify r> queue-change + [ parse-file-notify ] dip queue-change next-event parse-file-notifications ] if ; diff --git a/basis/io/unix/macosx/monitors/monitors.factor b/basis/io/unix/macosx/monitors/monitors.factor index a5f36aa93b..cde1d6339a 100644 --- a/basis/io/unix/macosx/monitors/monitors.factor +++ b/basis/io/unix/macosx/monitors/monitors.factor @@ -2,15 +2,13 @@ ! See http://factorcode.org/license.txt for BSD license. USING: io.backend io.monitors core-foundation.fsevents continuations kernel sequences -namespaces arrays system locals accessors destructors ; +namespaces arrays system locals accessors destructors fry ; IN: io.unix.macosx.monitors TUPLE: macosx-monitor < monitor handle ; : enqueue-notifications ( triples monitor -- ) - [ - >r first { +modify-file+ } r> queue-change - ] curry each ; + '[ first { +modify-file+ } _ queue-change ] each ; M:: macosx (monitor) ( path recursive? mailbox -- monitor ) [let | path [ path normalize-path ] | diff --git a/basis/io/unix/select/select.factor b/basis/io/unix/select/select.factor index 1dd1d51e87..27231aee5a 100644 --- a/basis/io/unix/select/select.factor +++ b/basis/io/unix/select/select.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: alien.c-types kernel io.ports io.unix.backend bit-arrays sequences assocs unix math namespaces -accessors math.order locals unix.time ; +accessors math.order locals unix.time fry ; IN: io.unix.select TUPLE: select-mx < mx read-fdset write-fdset ; @@ -28,7 +28,7 @@ TUPLE: select-mx < mx read-fdset write-fdset ; [ check-fd ] 3curry each ; inline : init-fdset ( fds fdset -- ) - [ >r t swap munge r> set-nth ] curry each ; + '[ t swap munge _ set-nth ] each ; : read-fdset/tasks ( mx -- seq fdset ) [ reads>> keys ] [ read-fdset>> ] bi ; diff --git a/basis/io/unix/sockets/sockets.factor b/basis/io/unix/sockets/sockets.factor index a98432b84d..5fba7badb0 100644 --- a/basis/io/unix/sockets/sockets.factor +++ b/basis/io/unix/sockets/sockets.factor @@ -16,18 +16,18 @@ IN: io.unix.sockets 0 socket dup io-error init-fd |dispose ; : set-socket-option ( fd level opt -- ) - >r >r handle-fd r> r> 1 "int" heap-size setsockopt io-error ; + [ handle-fd ] 2dip 1 "int" heap-size setsockopt io-error ; M: unix addrinfo-error ( n -- ) dup zero? [ drop ] [ gai_strerror throw ] if ; ! Client sockets - TCP and Unix domain M: object (get-local-address) ( handle remote -- sockaddr ) - >r handle-fd r> empty-sockaddr/size + [ handle-fd ] dip empty-sockaddr/size [ getsockname io-error ] 2keep drop ; M: object (get-remote-address) ( handle local -- sockaddr ) - >r handle-fd r> empty-sockaddr/size + [ handle-fd ] dip empty-sockaddr/size [ getpeername io-error ] 2keep drop ; : init-client-socket ( fd -- ) @@ -60,7 +60,7 @@ M: object ((client)) ( addrspec -- fd ) SOL_SOCKET SO_REUSEADDR set-socket-option ; : server-socket-fd ( addrspec type -- fd ) - >r dup protocol-family r> socket-fd + [ dup protocol-family ] dip socket-fd dup init-server-socket dup handle-fd rot make-sockaddr/size bind io-error ; @@ -77,7 +77,7 @@ M: object (server) ( addrspec -- handle ) M: object (accept) ( server addrspec -- fd sockaddr ) 2dup do-accept { - { [ over 0 >= ] [ >r 2nip init-fd r> ] } + { [ over 0 >= ] [ [ 2nip init-fd ] dip ] } { [ err_no EINTR = ] [ 2drop (accept) ] } { [ err_no EAGAIN = ] [ 2drop diff --git a/basis/io/unix/unix-tests.factor b/basis/io/unix/unix-tests.factor index 7e1dc48e5f..df61420c77 100644 --- a/basis/io/unix/unix-tests.factor +++ b/basis/io/unix/unix-tests.factor @@ -46,7 +46,7 @@ yield "Receive 1" print - "d" get receive >r reverse r> + "d" get receive [ reverse ] dip "Send 1" print dup . @@ -55,7 +55,7 @@ yield "Receive 2" print - "d" get receive >r " world" append r> + "d" get receive [ " world" append ] dip "Send 1" print dup . @@ -86,7 +86,7 @@ datagram-client [ "olleh" t ] [ "d" get receive datagram-server = - >r >string r> + [ >string ] dip ] unit-test [ ] [ @@ -98,7 +98,7 @@ datagram-client [ "hello world" t ] [ "d" get receive datagram-server = - >r >string r> + [ >string ] dip ] unit-test [ ] [ "d" get dispose ] unit-test diff --git a/basis/io/windows/files/files.factor b/basis/io/windows/files/files.factor index 4c38ee3b12..83954e045b 100755 --- a/basis/io/windows/files/files.factor +++ b/basis/io/windows/files/files.factor @@ -10,7 +10,7 @@ IN: io.windows.files : open-file ( path access-mode create-mode flags -- handle ) [ - >r >r share-mode default-security-attributes r> r> + [ share-mode default-security-attributes ] 2dip CreateFile-flags f CreateFile opened-file ] with-destructors ; @@ -46,7 +46,7 @@ IN: io.windows.files GetLastError ERROR_ALREADY_EXISTS = not ; : set-file-pointer ( handle length method -- ) - >r dupd d>w/w r> SetFilePointer + [ dupd d>w/w ] dip SetFilePointer INVALID_SET_FILE_POINTER = [ CloseHandle "SetFilePointer failed" throw ] when drop ; @@ -348,23 +348,23 @@ M: winnt file-systems ( -- array ) : set-file-times ( path timestamp/f timestamp/f timestamp/f -- ) #! timestamp order: creation access write [ - >r >r >r + [ normalize-path open-existing &dispose handle>> - r> r> r> (set-file-times) + ] 3dip (set-file-times) ] with-destructors ; : set-file-create-time ( path timestamp -- ) f f set-file-times ; : set-file-access-time ( path timestamp -- ) - >r f r> f set-file-times ; + [ f ] dip f set-file-times ; : set-file-write-time ( path timestamp -- ) - >r f f r> set-file-times ; + [ f f ] dip set-file-times ; M: winnt touch-file ( path -- ) [ normalize-path - maybe-create-file >r &dispose r> + maybe-create-file [ &dispose ] dip [ drop ] [ handle>> f now dup (set-file-times) ] if ] with-destructors ; diff --git a/basis/io/windows/nt/backend/backend.factor b/basis/io/windows/nt/backend/backend.factor index 4e335da749..8035bd66e9 100644 --- a/basis/io/windows/nt/backend/backend.factor +++ b/basis/io/windows/nt/backend/backend.factor @@ -18,8 +18,8 @@ C: io-callback "OVERLAPPED" malloc-object &free ; : make-overlapped ( port -- overlapped-ext ) - >r (make-overlapped) - r> handle>> ptr>> [ over set-OVERLAPPED-offset ] when* ; + [ (make-overlapped) ] dip + handle>> ptr>> [ over set-OVERLAPPED-offset ] when* ; : ( handle existing -- handle ) f 1 CreateIoCompletionPort dup win32-error=0/f ; @@ -64,13 +64,9 @@ M: winnt add-completion ( win32-handle -- ) : handle-overlapped ( us -- ? ) wait-for-overlapped [ dup [ - >r drop GetLastError 1array r> resume-callback t - ] [ - 2drop f - ] if - ] [ - resume-callback t - ] if ; + [ drop GetLastError 1array ] dip resume-callback t + ] [ 2drop f ] if + ] [ resume-callback t ] if ; M: win32-handle cancel-operation [ check-disposed ] [ handle>> CancelIo drop ] bi ; @@ -94,7 +90,7 @@ M: winnt init-io ( -- ) : wait-for-file ( FileArgs n port -- n ) swap file-error? - [ 2drop 0 ] [ >r lpOverlapped>> r> twiddle-thumbs ] if ; + [ 2drop 0 ] [ [ lpOverlapped>> ] dip twiddle-thumbs ] if ; : update-file-ptr ( n port -- ) handle>> dup ptr>> [ rot + >>ptr drop ] [ 2drop ] if* ; diff --git a/basis/io/windows/nt/files/files.factor b/basis/io/windows/nt/files/files.factor index 2fbc809263..9f25eb5eb1 100644 --- a/basis/io/windows/nt/files/files.factor +++ b/basis/io/windows/nt/files/files.factor @@ -59,6 +59,6 @@ M: winnt FileArgs-overlapped ( port -- overlapped ) M: winnt open-append [ dup file-info size>> ] [ drop 0 ] recover - >r (open-append) r> >>ptr ; + [ (open-append) ] dip >>ptr ; M: winnt home "USERPROFILE" os-env ; diff --git a/basis/io/windows/nt/launcher/launcher.factor b/basis/io/windows/nt/launcher/launcher.factor index 9d02fbe2fd..de4fb99c64 100644 --- a/basis/io/windows/nt/launcher/launcher.factor +++ b/basis/io/windows/nt/launcher/launcher.factor @@ -52,7 +52,7 @@ IN: io.windows.nt.launcher CreateFile dup invalid-handle? &dispose handle>> ; : redirect-append ( path access-mode create-mode -- handle ) - >r >r path>> r> r> + [ path>> ] 2dip drop OPEN_ALWAYS redirect-file dup 0 FILE_END set-file-pointer ; @@ -61,7 +61,7 @@ IN: io.windows.nt.launcher 2drop handle>> duplicate-handle ; : redirect-stream ( stream access-mode create-mode -- handle ) - >r >r underlying-handle handle>> r> r> redirect-handle ; + [ underlying-handle handle>> ] 2dip redirect-handle ; : redirect ( obj access-mode create-mode -- handle ) { diff --git a/basis/io/windows/nt/privileges/privileges.factor b/basis/io/windows/nt/privileges/privileges.factor index 8418d09a5e..106cf06b77 100644 --- a/basis/io/windows/nt/privileges/privileges.factor +++ b/basis/io/windows/nt/privileges/privileges.factor @@ -20,12 +20,12 @@ TYPEDEF: TOKEN_PRIVILEGES* PTOKEN_PRIVILEGES : with-process-token ( quot -- ) #! quot: ( token-handle -- token-handle ) - >r open-process-token r> + [ open-process-token ] dip [ keep ] curry [ CloseHandle drop ] [ ] cleanup ; inline : lookup-privilege ( string -- luid ) - >r f r> "LUID" + [ f ] dip "LUID" [ LookupPrivilegeValue win32-error=0/f ] keep ; : make-token-privileges ( name ? -- obj ) @@ -39,10 +39,10 @@ TYPEDEF: TOKEN_PRIVILEGES* PTOKEN_PRIVILEGES set-LUID_AND_ATTRIBUTES-Attributes ] when - >r lookup-privilege r> + [ lookup-privilege ] dip [ TOKEN_PRIVILEGES-Privileges - >r 0 r> LUID_AND_ATTRIBUTES-nth + [ 0 ] dip LUID_AND_ATTRIBUTES-nth set-LUID_AND_ATTRIBUTES-Luid ] keep ; diff --git a/basis/io/windows/nt/sockets/sockets.factor b/basis/io/windows/nt/sockets/sockets.factor index 5d94cf2d4a..ecd9ea9d9b 100644 --- a/basis/io/windows/nt/sockets/sockets.factor +++ b/basis/io/windows/nt/sockets/sockets.factor @@ -176,8 +176,8 @@ TUPLE: WSASendTo-args port : make-send-buffer ( packet -- WSABUF ) "WSABUF" malloc-object &free - [ >r malloc-byte-array &free r> set-WSABUF-buf ] - [ >r length r> set-WSABUF-len ] + [ [ malloc-byte-array &free ] dip set-WSABUF-buf ] + [ [ length ] dip set-WSABUF-len ] [ nip ] 2tri ; inline @@ -186,8 +186,8 @@ TUPLE: WSASendTo-args port swap >>port dup port>> handle>> handle>> >>s swap make-sockaddr/size - >r malloc-byte-array &free - r> [ >>lpTo ] [ >>iToLen ] bi* + [ malloc-byte-array &free ] dip + [ >>lpTo ] [ >>iToLen ] bi* swap make-send-buffer >>lpBuffers 1 >>dwBufferCount 0 >>dwFlags diff --git a/basis/io/windows/sockets/sockets.factor b/basis/io/windows/sockets/sockets.factor index d9ab10d5e3..809af605e0 100644 --- a/basis/io/windows/sockets/sockets.factor +++ b/basis/io/windows/sockets/sockets.factor @@ -20,21 +20,21 @@ M: win32-socket dispose ( stream -- ) |dispose dup add-completion ; : open-socket ( addrspec type -- win32-socket ) - >r protocol-family r> + [ protocol-family ] dip 0 f 0 WSASocket-flags WSASocket dup socket-error opened-socket ; M: object (get-local-address) ( socket addrspec -- sockaddr ) - >r handle>> r> empty-sockaddr/size + [ handle>> ] dip empty-sockaddr/size [ getsockname socket-error ] 2keep drop ; M: object (get-remote-address) ( socket addrspec -- sockaddr ) - >r handle>> r> empty-sockaddr/size + [ handle>> ] dip empty-sockaddr/size [ getpeername socket-error ] 2keep drop ; : bind-socket ( win32-socket sockaddr len -- ) - >r >r handle>> r> r> bind socket-error ; + [ handle>> ] 2dip bind socket-error ; M: object ((client)) ( addrspec -- handle ) [ SOCK_STREAM open-socket ] keep diff --git a/basis/io/windows/windows.factor b/basis/io/windows/windows.factor index ce75293b38..94304edc05 100755 --- a/basis/io/windows/windows.factor +++ b/basis/io/windows/windows.factor @@ -8,7 +8,8 @@ splitting continuations math.bitwise system accessors ; IN: io.windows : set-inherit ( handle ? -- ) - >r HANDLE_FLAG_INHERIT r> >BOOLEAN SetHandleInformation win32-error=0/f ; + [ HANDLE_FLAG_INHERIT ] dip + >BOOLEAN SetHandleInformation win32-error=0/f ; TUPLE: win32-handle handle disposed ; diff --git a/basis/models/range/range.factor b/basis/models/range/range.factor index 8e230a2d0c..53d99ab162 100644 --- a/basis/models/range/range.factor +++ b/basis/models/range/range.factor @@ -6,7 +6,7 @@ IN: models.range TUPLE: range < compose ; -: ( value min max page -- range ) +: ( value page min max -- range ) 4array [ ] map range new-compose ; : range-model ( range -- model ) dependencies>> first ; diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor index 2811801266..d8822f51dc 100644 --- a/basis/tools/scaffold/scaffold.factor +++ b/basis/tools/scaffold/scaffold.factor @@ -17,23 +17,17 @@ ERROR: no-vocab vocab ;