Fix M: stack effects.

diff --git a/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor b/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
index 37707e294e5e303524fb988d9e8cf8330f6d608d..a514a6738e76d807c3ef04de605c6184382ad3e6 100644 (file)
--- a/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
+++ b/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
@@ -138,7 +138,7 @@ M: vreg-insn compute-live-intervals* ( insn -- )
 
 GENERIC: uses-vregs* ( insn -- seq )
 
-M: gc-map-insn uses-vregs* ( insn -- )
+M: gc-map-insn uses-vregs*
     [ uses-vregs ] [ gc-map>> derived-roots>> values ] bi append ;
 
 M: vreg-insn uses-vregs* uses-vregs ;

diff --git a/basis/compiler/cfg/stacks/uninitialized/uninitialized.factor b/basis/compiler/cfg/stacks/uninitialized/uninitialized.factor
index 7498cddf109e7e1a4b74214192c520566525b7d8..7ceb867dbc556ef3b91a14ec2d3cb7a4ac2369bd 100644 (file)
--- a/basis/compiler/cfg/stacks/uninitialized/uninitialized.factor
+++ b/basis/compiler/cfg/stacks/uninitialized/uninitialized.factor
@@ -77,5 +77,5 @@ FORWARD-ANALYSIS: uninitialized
 M: uninitialized-analysis transfer-set ( pair bb analysis -- pair' )
     drop [ prepare ] dip visit-block finish ;
 
-M: uninitialized-analysis join-sets ( sets analysis -- pair )
+M: uninitialized-analysis join-sets ( sets bb dfa -- set )
     2drop sift [ f ] [ [ ] [ [ (join-sets) ] 2map ] map-reduce ] if-empty ;

diff --git a/basis/db/pools/pools.factor b/basis/db/pools/pools.factor
index 55ff3a383b58a22c1007cb375706126524b6d975..b0d9d699130758768bc466be699d3690fe083a1b 100644 (file)
--- a/basis/db/pools/pools.factor
+++ b/basis/db/pools/pools.factor
@@ -13,7 +13,7 @@ TUPLE: db-pool < pool db ;
 : with-db-pool ( db quot -- )
     [ <db-pool> ] dip with-pool ; inline
 
-M: db-pool make-connection ( pool -- )
+M: db-pool make-connection ( pool -- conn )
     db>> db-open ;
 
 : with-pooled-db ( pool quot -- )

diff --git a/basis/dlists/dlists.factor b/basis/dlists/dlists.factor
index c4b191360bbc50930e1831b80d70e14c5467ef64..27c3025dc707d98c3d5b945793739881e5b0ef9d 100644 (file)
--- a/basis/dlists/dlists.factor
+++ b/basis/dlists/dlists.factor
@@ -85,7 +85,7 @@ M: dlist push-back* ( obj dlist -- dlist-node )
 
 ERROR: empty-dlist ;
 
-M: empty-dlist summary ( dlist -- )
+M: empty-dlist summary ( dlist -- string )
     drop "Empty dlist" ;
 
 M: dlist peek-front ( dlist -- obj )

diff --git a/basis/furnace/asides/asides.factor b/basis/furnace/asides/asides.factor
index 8700946bb5f8ff9266ae5fd465a1e49095ff1821..254cb04fed839b4c482fd9a1bf9f982206ccc216 100644 (file)
--- a/basis/furnace/asides/asides.factor
+++ b/basis/furnace/asides/asides.factor
@@ -88,7 +88,7 @@ ERROR: end-aside-in-get-error ;
 : end-aside ( default -- response )
     aside-id get aside-id off get-aside [ move-on ] [ <redirect> ] ?if ;
 
-M: asides link-attr ( tag -- )
+M: asides link-attr ( tag responder -- )
     drop
     "aside" optional-attr {
         { "none" [ aside-id off ] }
@@ -103,7 +103,7 @@ M: asides modify-query ( query asides -- query' )
         aside-id-key associate assoc-union
     ] when* ;
 
-M: asides modify-form ( asides -- )
+M: asides modify-form ( asides -- xml/f )
     drop
     aside-id get
     aside-id-key

diff --git a/basis/furnace/auth/login/login.factor b/basis/furnace/auth/login/login.factor
index 9c3d316d039f3d06173a61b8979658b22de125d6..74ff38141c7ac495b908580ba34353b68cc3b829 100644 (file)
--- a/basis/furnace/auth/login/login.factor
+++ b/basis/furnace/auth/login/login.factor
@@ -30,7 +30,7 @@ M: login-realm init-realm
 M: login-realm logged-in-username\r
     drop permit-id get dup [ get-permit-uid ] when ;\r
 \r
-M: login-realm modify-form ( responder -- )\r
+M: login-realm modify-form ( responder -- xml/f )\r
     drop permit-id get realm get name>> permit-id-key hidden-form-field ;\r
 \r
 : <permit-cookie> ( -- cookie )\r
@@ -107,7 +107,7 @@ M: login-realm login-required* ( description capabilities login -- response )
         URL" $realm/login" <continue-conversation>\r
     ] if ;\r
 \r
-M: login-realm user-registered ( user realm -- )\r
+M: login-realm user-registered ( user realm -- response )\r
     drop successful-login ;\r
 \r
 : <login-realm> ( responder name -- realm )\r

diff --git a/basis/furnace/conversations/conversations.factor b/basis/furnace/conversations/conversations.factor
index bbb84e2f0558f3cd6b40b25dfca2531c0d524474..82a4de242989c10e24fad868055fc753ace7f155 100644 (file)
--- a/basis/furnace/conversations/conversations.factor
+++ b/basis/furnace/conversations/conversations.factor
@@ -107,7 +107,7 @@ M: conversations call-responder*
         bi
     ] [ 2drop ] if ;
 
-M: conversations modify-form ( conversations -- )
+M: conversations modify-form ( conversations -- xml/f )
     drop
     conversation-id get
     conversation-id-key

diff --git a/basis/furnace/sessions/sessions.factor b/basis/furnace/sessions/sessions.factor
index 33de393d900d9dc7ed2703cf793060b7d437e002..13deeff9a01c5f0d40054ec2790c80f470c6a595 100644 (file)
--- a/basis/furnace/sessions/sessions.factor
+++ b/basis/furnace/sessions/sessions.factor
@@ -98,7 +98,7 @@ CONSTANT: session-id-key "__s"
 : put-session-cookie ( response -- response' )
     <session-cookie> put-cookie ;
 
-M: sessions modify-form ( responder -- )
+M: sessions modify-form ( responder -- xml/f )
     drop session get id>> session-id-key hidden-form-field ;
 
 M: sessions call-responder* ( path responder -- response )

diff --git a/basis/html/streams/streams.factor b/basis/html/streams/streams.factor
index fbce1e81d725578af6b6dd7fb4520d46f60656a4..b865206219fcbca4b148d61db3e1e3625d473bb4 100644 (file)
--- a/basis/html/streams/streams.factor
+++ b/basis/html/streams/streams.factor
@@ -124,7 +124,7 @@ CONSTANT: pre-css "white-space: pre; font-family: monospace;"
 
 TUPLE: html-block-stream < html-sub-stream ;
 
-M: html-block-stream dispose ( quot style stream -- )
+M: html-block-stream dispose
     end-sub-stream format-html-div ;
 
 : border-spacing-css, ( pair -- )

diff --git a/basis/io/files/info/unix/unix.factor b/basis/io/files/info/unix/unix.factor
index 6df4f407399ca526015836d41a841f49762c2540..554c6f006b07a1f24faf5f798212125e52fdf491 100644 (file)
--- a/basis/io/files/info/unix/unix.factor
+++ b/basis/io/files/info/unix/unix.factor
@@ -17,7 +17,7 @@ name-max flags id ;
 
 HOOK: new-file-system-info os ( --  file-system-info )
 
-M: unix new-file-system-info ( -- ) unix-file-system-info new ;
+M: unix new-file-system-info unix-file-system-info new ;
 
 HOOK: file-system-statfs os ( path -- statfs )
 

diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor
index d808b9aaa0fd376782cd546f3674d9dac4c2de2a..7f4f52e2e4e28d8a2148f8a580c66e219ae5e7e4 100644 (file)
--- a/basis/peg/ebnf/ebnf.factor
+++ b/basis/peg/ebnf/ebnf.factor
@@ -476,7 +476,7 @@ M: ebnf-sequence build-locals ( code ast -- code )
     ] if\r
   ] if ;\r
 \r
-M: ebnf-var build-locals ( code ast -- )\r
+M: ebnf-var build-locals ( code ast -- code )\r
   [\r
     "FROM: locals => [let :> ; FROM: kernel => dup nip ; [let " %\r
     " dup :> " % name>> %\r
@@ -485,9 +485,9 @@ M: ebnf-var build-locals ( code ast -- )
     " nip ]" %     \r
   ] "" make ;\r
 \r
-M: object build-locals ( code ast -- )\r
+M: object build-locals ( code ast -- code )\r
   drop ;\r
-   \r
+\r
 ERROR: bad-effect quot effect ;\r
 \r
 : check-action-effect ( quot -- quot )\r

diff --git a/core/continuations/continuations.factor b/core/continuations/continuations.factor
index ec8be7efa42be0e2d203cfc9c659240736751d1d..bfcca41587bb33f249cd85faecd130b4028901e3 100644 (file)
--- a/core/continuations/continuations.factor
+++ b/core/continuations/continuations.factor
@@ -110,7 +110,7 @@ SYMBOL: thread-error-hook ! ( error thread -- )
 
 thread-error-hook [ [ die ] ] initialize
 
-M: object error-in-thread ( error thread -- )
+M: object error-in-thread ( error thread -- * )
     thread-error-hook get-global call( error thread -- * ) ;
 
 : in-callback? ( -- ? ) 3 context-object ;

diff --git a/extra/assoc-heaps/assoc-heaps.factor b/extra/assoc-heaps/assoc-heaps.factor
index a495aed62634319a9f43f871f4d7961c47737920..160c3d311180f76ab796a98a201af23e77b9a922 100644 (file)
--- a/extra/assoc-heaps/assoc-heaps.factor
+++ b/extra/assoc-heaps/assoc-heaps.factor
@@ -26,5 +26,5 @@ M: assoc-heap heap-pop ( assoc-heap -- value key )
 M: assoc-heap heap-peek ( assoc-heap -- value key )
     heap>> heap-peek ;
 
-M: assoc-heap heap-empty? ( assoc-heap -- value key )
+M: assoc-heap heap-empty? ( assoc-heap -- ? )
     heap>> heap-empty? ;

diff --git a/extra/classes/tuple/change-tracking/change-tracking.factor b/extra/classes/tuple/change-tracking/change-tracking.factor
index 3e210922b5e4d5b2106d75d53bc9c404f00160d6..0d5e41076d9b58377bef0b2d79493d9b23c1dbb6 100644 (file)
--- a/extra/classes/tuple/change-tracking/change-tracking.factor
+++ b/extra/classes/tuple/change-tracking/change-tracking.factor
@@ -15,7 +15,7 @@ PREDICATE: change-tracking-tuple-class < tuple-class
 
 <PRIVATE
 
-M: change-tracking-tuple-class writer-quot ( class slot-spec -- )
+M: change-tracking-tuple-class writer-quot ( class slot-spec -- quot )
     [ call-next-method ]
     [ name>> "changed?" = [ '[ _ [ t >>changed? drop ] bi ] ] unless ] bi ;
 

diff --git a/extra/sequences/modified/modified.factor b/extra/sequences/modified/modified.factor
index 944242bac807405ee9516cd328a9333323d20129..9205b91c4aef84340eeeb3c1805911664fa2d665 100644 (file)
--- a/extra/sequences/modified/modified.factor
+++ b/extra/sequences/modified/modified.factor
@@ -32,7 +32,7 @@ C: <scaled> scaled
 M: scaled modified-nth ( n seq -- elt )
     [ seq>> nth ] [ c>> * ] bi ;
 
-M:: scaled modified-set-nth ( elt n seq -- elt )
+M:: scaled modified-set-nth ( elt n seq -- )
     ! don't set c to 0!
     elt seq c>> / n seq seq>> set-nth ;
 
@@ -63,7 +63,7 @@ M: summed length seqs>> [ length ] [ max ] map-reduce ;
     ] if* ;
 PRIVATE>
 
-M: summed modified-nth ( n seq -- )
+M: summed modified-nth ( n seq -- elt )
     seqs>> [ ?nth ?+ ] with 0 swap reduce ;
 
 M: summed modified-set-nth ( elt n seq -- ) immutable ;

diff --git a/extra/trees/avl/avl.factor b/extra/trees/avl/avl.factor
index 69252bf762b7d09dbb1e351b4975667274a44749..c53d75de4cb741032eda14b526ad76145f4d03ea 100644 (file)
--- a/extra/trees/avl/avl.factor
+++ b/extra/trees/avl/avl.factor
@@ -80,7 +80,7 @@ DEFER: avl-set
 : avl-set ( value key node -- node taller? )
     [ (avl-set) ] [ swap <avl-node> t ] if* ;
 
-M: avl set-at ( value key node -- node )
+M: avl set-at ( value key node -- )
     [ avl-set drop ] change-root drop ;
 
 : delete-select-rotate ( node -- node shorter? )