mop up compiler errors from macosx load-all

diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor
index 57954385706ed1a007bb0e0b1f8803eb6bab31c9..7707c2a2c74e6acd81b2dd6b25c60ad859af9941 100644 (file)
--- 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 831ec7f8fc036e4ca11f00d191639f2e312869bc..29ab04fe1bfe51f543058b7ad89d01d9cabc9ca8 100644 (file)
--- a/basis/furnace/auth/auth.factor
+++ b/basis/furnace/auth/auth.factor
@@ -14,6 +14,7 @@ furnace.redirection
 furnace.boilerplate\r
 furnace.auth.providers\r
 furnace.auth.providers.db ;\r
+FROM: assocs => change-at ;\r
 IN: furnace.auth\r
 \r
 SYMBOL: logged-in-user\r

diff --git a/basis/furnace/scopes/scopes.factor b/basis/furnace/scopes/scopes.factor
index daad0dcf915df55a1dcaec13afeb87f41a4810b1..4d005e8adc52be40d3be3c8240057fd75879ccbf 100644 (file)
--- 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 28d7f63d87c4c4158e642b46eccf7cc7e7cb86d9..0b690643111a6c878ed896829a6fda284b53526a 100644 (file)
--- 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 c8d5bb7338ea377811611437316fabe780872b1b..6dfcf9f0ca453e312625eac37c355beb4afc8480 100644 (file)
--- 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 4b9900d3b0c4acc18750b4ed22748be505c3ab38..c56dd23db75b1eb26864dafeec1a777f6efb6cc9 100644 (file)
--- 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 ef8420d66c8012199bf001a55c9069ad63749e87..8978c660f40c97d334fda41148f68beccce314b7 100644 (file)
--- 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 519d6535b9765aa47873b88f672a1218a4612cd9..e3c6a8f26ccf404f510bc55b53d10d31a139dc72 100644 (file)
--- 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
 
 <PRIVATE

diff --git a/extra/bank/bank.factor b/extra/bank/bank.factor
index a379a03828a227d7269b5befdda8e5ce050e4b22..ec39554504432162562a46b51a0a54d55d46d868 100644 (file)
--- a/extra/bank/bank.factor
+++ b/extra/bank/bank.factor
@@ -54,7 +54,7 @@ C: <transaction> 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 37fb1d0ce3a5b2fefb9c75d020d17b6f117dd916..39c216959601bdd67574779ab7d980e26d4fd0d3 100644 (file)
--- 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 256fa9ec28a35930a86d1bb92ac8c4133e89330d..79a5a131f9b12ef3ac1f6ba593319652a2e47185 100644 (file)
--- a/extra/benchmark/nbody/nbody.factor
+++ b/extra/benchmark/nbody/nbody.factor
@@ -58,7 +58,7 @@ TUPLE: nbody-system { bodies array read-only } ;
     [ <sun> <jupiter> <saturn> <uranus> <neptune> ] 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 a07057994331203de6b0101b8f44cdc3539e0a10..2ae8737c70bd03d249a71bb93ddf748c01d8effd 100644 (file)
--- 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
     
 <PRIVATE
@@ -152,4 +152,4 @@ PRIVATE>
 
 : 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 318a1ab1e3225f96a3e475296217b3908417f858..8cc083d9dd2a007756acbc50a363732a735c3791 100644 (file)
--- 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 9c12367cdfd727b1f24fc8edea5a060d11e3182c..bc94811a7662b503231f2e94f35321f9a493e57d 100644 (file)
--- 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