diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor index 5795438570..7707c2a2c7 100644 --- a/basis/farkup/farkup.factor +++ b/basis/farkup/farkup.factor @@ -70,7 +70,7 @@ DEFER: (parse-paragraph) { CHAR: % inline-code } } at ; -: or-simple-title ( url title/f quot: ( title -- title' ) -- url title' ) +: or-simple-title ( ... url title/f quot: ( ... title -- ... title' ) -- ... url title' ) [ "" like dup simple-link-title ] if* ; inline : parse-link ( string -- paragraph-list ) diff --git a/basis/furnace/auth/auth.factor b/basis/furnace/auth/auth.factor index 831ec7f8fc..29ab04fe1b 100644 --- a/basis/furnace/auth/auth.factor +++ b/basis/furnace/auth/auth.factor @@ -14,6 +14,7 @@ furnace.redirection furnace.boilerplate furnace.auth.providers furnace.auth.providers.db ; +FROM: assocs => change-at ; IN: furnace.auth SYMBOL: logged-in-user diff --git a/basis/furnace/scopes/scopes.factor b/basis/furnace/scopes/scopes.factor index daad0dcf91..4d005e8adc 100644 --- a/basis/furnace/scopes/scopes.factor +++ b/basis/furnace/scopes/scopes.factor @@ -2,6 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel accessors assocs destructors db.tuples db.types furnace.cache ; +FROM: assocs => change-at ; IN: furnace.scopes TUPLE: scope < server-state namespace changed? ; diff --git a/basis/io/directories/search/search.factor b/basis/io/directories/search/search.factor index 28d7f63d87..0b69064311 100644 --- a/basis/io/directories/search/search.factor +++ b/basis/io/directories/search/search.factor @@ -41,7 +41,7 @@ TUPLE: directory-iterator path bfs queue ; [ nip ] if ] if ; -:: iterate-directory-entries ( iter quot: ( obj -- obj ) -- directory-entry/f ) +:: iterate-directory-entries ( ... iter quot: ( ... obj -- ... obj ) -- ... directory-entry/f ) iter next-directory-entry [ quot call [ iter quot iterate-directory-entries ] unless* diff --git a/basis/math/matrices/elimination/elimination.factor b/basis/math/matrices/elimination/elimination.factor index c8d5bb7338..6dfcf9f0ca 100644 --- a/basis/math/matrices/elimination/elimination.factor +++ b/basis/math/matrices/elimination/elimination.factor @@ -11,7 +11,7 @@ SYMBOL: matrix : nth-row ( row# -- seq ) matrix get nth ; -: change-row ( row# quot: ( seq -- seq ) -- ) +: change-row ( ..a row# quot: ( ..a seq -- ..b seq ) -- ..b ) matrix get swap change-nth ; inline : exchange-rows ( row# row# -- ) matrix get exchange ; diff --git a/basis/xml/syntax/syntax.factor b/basis/xml/syntax/syntax.factor index 4b9900d3b0..c56dd23db7 100644 --- a/basis/xml/syntax/syntax.factor +++ b/basis/xml/syntax/syntax.factor @@ -44,7 +44,7 @@ SYNTAX: XML-NS: : each-attrs ( attrs quot -- ) [ values [ interpolated? ] filter ] dip each ; inline -: (each-interpolated) ( item quot: ( interpolated -- ) -- ) +: (each-interpolated) ( ... item quot: ( ... interpolated -- ... ) -- ... ) { { [ over interpolated? ] [ call ] } { [ over tag? ] [ [ attrs>> ] dip each-attrs ] } diff --git a/basis/xml/tokenize/tokenize.factor b/basis/xml/tokenize/tokenize.factor index ef8420d66c..8978c660f4 100644 --- a/basis/xml/tokenize/tokenize.factor +++ b/basis/xml/tokenize/tokenize.factor @@ -59,14 +59,14 @@ HINTS: next* { spot } ; ! with-input-stream implicitly creates a new scope which we use swap [ init-parser call ] with-input-stream ; inline -:: (skip-until) ( quot: ( -- ? ) spot -- ) +:: (skip-until) ( ... quot: ( ... -- ... ? ) spot -- ... ) spot char>> [ quot call [ spot next* quot spot (skip-until) ] unless ] when ; inline recursive -: skip-until ( quot: ( -- ? ) -- ) +: skip-until ( ... quot: ( ... -- ... ? ) -- ... ) spot get (skip-until) ; inline : take-until ( quot -- string ) diff --git a/core/io/io.factor b/core/io/io.factor index 519d6535b9..e3c6a8f26c 100644 --- a/core/io/io.factor +++ b/core/io/io.factor @@ -87,7 +87,7 @@ SYMBOL: error-stream : bl ( -- ) " " write ; -: each-morsel ( handler: ( data -- ) reader: ( -- data ) -- ) +: each-morsel ( ..a handler: ( ..a data -- ..b ) reader: ( ..b -- ..a data ) -- ..a ) [ dup ] compose swap while drop ; inline transaction : process-day ( account date -- ) 2dup accumulate-interest ?pay-interest ; -: each-day ( quot: ( -- ) start end -- ) +: each-day ( ... quot: ( ... day -- ... ) start end -- ... ) 2dup before? [ [ dup [ over [ swap call ] dip ] dip 1 days time+ ] dip each-day ] [ diff --git a/extra/benchmark/nbody-simd/nbody-simd.factor b/extra/benchmark/nbody-simd/nbody-simd.factor index 37fb1d0ce3..39c2169596 100644 --- a/extra/benchmark/nbody-simd/nbody-simd.factor +++ b/extra/benchmark/nbody-simd/nbody-simd.factor @@ -58,7 +58,7 @@ SPECIALIZED-ARRAY: body body-array{ } output>sequence dup init-bodies ; inline -:: each-pair ( bodies pair-quot: ( other-body body -- ) each-quot: ( body -- ) -- ) +:: each-pair ( ... bodies pair-quot: ( ... other-body body -- ... ) each-quot: ( ... body -- ... ) -- ) bodies [| body i | body each-quot call bodies i 1 + tail-slice [ diff --git a/extra/benchmark/nbody/nbody.factor b/extra/benchmark/nbody/nbody.factor index 256fa9ec28..79a5a131f9 100644 --- a/extra/benchmark/nbody/nbody.factor +++ b/extra/benchmark/nbody/nbody.factor @@ -58,7 +58,7 @@ TUPLE: nbody-system { bodies array read-only } ; [ ] output>array nbody-system boa dup bodies>> init-bodies ; inline -:: each-pair ( bodies pair-quot: ( other-body body -- ) each-quot: ( body -- ) -- ) +:: each-pair ( ... bodies pair-quot: ( ... other-body body -- ... ) each-quot: ( ... body -- ... ) -- ... ) bodies [| body i | body each-quot call bodies i 1 + tail-slice [ diff --git a/extra/bson/writer/writer.factor b/extra/bson/writer/writer.factor index a070579943..2ae8737c70 100644 --- a/extra/bson/writer/writer.factor +++ b/extra/bson/writer/writer.factor @@ -32,22 +32,22 @@ PRIVATE> : ensure-buffer ( -- ) (buffer) drop ; inline -: with-buffer ( quot: ( -- ) -- byte-vector ) +: with-buffer ( ..a quot: ( ..a -- ..b ) -- ..b byte-vector ) [ (buffer) [ reset-buffer ] keep dup ] dip with-output-stream* ; inline -: with-length ( quot: ( -- ) -- bytes-written start-index ) +: with-length ( ..a quot: ( ..a -- ..b ) -- ..b bytes-written start-index ) [ (buffer) [ length ] keep ] dip call length swap [ - ] keep ; inline -: (with-length-prefix) ( quot: ( -- ) length-quot: ( bytes-written -- length ) -- ) +: (with-length-prefix) ( ..a quot: ( ..a -- ..b ) length-quot: ( bytes-written -- length ) -- ..b ) [ [ B{ 0 0 0 0 } write ] prepose with-length ] dip swap [ call ] dip (buffer) copy ; inline -: with-length-prefix ( quot: ( -- ) -- ) +: with-length-prefix ( ..a quot: ( ..a -- ..b ) -- ..b ) [ INT32-SIZE >le ] (with-length-prefix) ; inline -: with-length-prefix-excl ( quot: ( -- ) -- ) +: with-length-prefix-excl ( ..a quot: ( ..a -- ..b ) -- ..b ) [ INT32-SIZE [ - ] keep >le ] (with-length-prefix) ; inline : mdb-special-value? ( value -- ? ) { [ timestamp? ] [ quotation? ] [ mdbregexp? ] - [ oid? ] [ byte-array? ] } 1|| ; inline \ No newline at end of file + [ oid? ] [ byte-array? ] } 1|| ; inline diff --git a/extra/irc/client/base/base.factor b/extra/irc/client/base/base.factor index 318a1ab1e3..8cc083d9dd 100644 --- a/extra/irc/client/base/base.factor +++ b/extra/irc/client/base/base.factor @@ -14,7 +14,7 @@ SYMBOL: current-irc-client : chats> ( -- seq ) irc> chats>> values ; : me? ( string -- ? ) irc> nick>> = ; -: with-irc ( irc-client quot: ( -- ) -- ) +: with-irc ( ..a irc-client quot: ( ..a -- ..b ) -- ..b ) \ current-irc-client swap with-variable ; inline UNION: to-target privmsg notice ; diff --git a/extra/project-euler/085/085.factor b/extra/project-euler/085/085.factor index 9c12367cdf..bc94811a76 100644 --- a/extra/project-euler/085/085.factor +++ b/extra/project-euler/085/085.factor @@ -29,7 +29,7 @@ IN: project-euler.085 : rectangles-count ( a b -- n ) 2dup [ 1 + ] bi@ * * * 4 /i ; inline -:: each-unique-product ( a b quot: ( i j -- ) -- ) +:: each-unique-product ( ... a b quot: ( ... i j -- ... ) -- ... ) a b [a,b] [| i | i b [a,b] [| j | i j quot call