From 3c98385c11b566f9f7c20df6e1e227fd1ff30b6c Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@oberon.internal.stack-effects.com>
Date: Wed, 5 Mar 2008 16:00:34 -0600
Subject: [PATCH] Fixes for recent method tuple cleanup

---
 core/words/words.factor                      |   2 +-
 extra/db/sqlite/test.db                      | Bin 0 -> 2048 bytes
 extra/locals/locals.factor                   |   4 ++--
 extra/tools/deploy/shaker/strip-cocoa.factor |   3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 extra/db/sqlite/test.db

diff --git a/core/words/words.factor b/core/words/words.factor
index c9505d3d1d..ce69c1ff2e 100755
--- a/core/words/words.factor
+++ b/core/words/words.factor
@@ -68,7 +68,7 @@ SYMBOL: bootstrapping?
 : crossref? ( word -- ? )
     {
         { [ dup "forgotten" word-prop ] [ f ] }
-        { [ dup "method-definition" word-prop ] [ t ] }
+        { [ dup "method-def" word-prop ] [ t ] }
         { [ dup word-vocabulary ] [ t ] }
         { [ t ] [ f ] }
     } cond nip ;
diff --git a/extra/db/sqlite/test.db b/extra/db/sqlite/test.db
new file mode 100644
index 0000000000000000000000000000000000000000..e483c47cea528c95f10fcf66fcbb67ffa351ffd1
GIT binary patch
literal 2048
zcmWFz^vNtqRY=P(%1ta$FlJz3U}R))P*7lCU|<DeWWWgIfG`XovteRbX<ncxBl9W-
zAQ}auAut*OWQ9NoBfGeyBx56UNn%n?YC&pIaef|zWO5F2bqsM;2yt}saaDkbDQM&+
z=B6r?B^D)TBo=8H8))h%B<Gjrl@wJX3u=P$CM)wg2IddUcbLyG?*%eP!DtAKhQOc<
z0bW*SQAw}-;#A+%ip=DEUKSKCA2YMKq*rEcZl!Z#USdk35EHYgvR7hWs$XikLR4yE
YPGVjPA0xA<v{!yco?~umQD$-?0FFaGg8%>k

literal 0
HcmV?d00001

diff --git a/extra/locals/locals.factor b/extra/locals/locals.factor
index 79af9e63f8..5f58f1464a 100755
--- a/extra/locals/locals.factor
+++ b/extra/locals/locals.factor
@@ -367,14 +367,14 @@ M: lambda-method definer drop \ M:: \ ; ;
 M: lambda-method definition
     "lambda" word-prop lambda-body ;
 
-: method-stack-effect
+: method-stack-effect ( method -- effect )
     dup "lambda" word-prop lambda-vars
     swap "method-generic" word-prop stack-effect
     dup [ effect-out ] when
     <effect> ;
 
 M: lambda-method synopsis*
-    dup dup definer.
+    dup dup dup definer.
     "method-specializer" word-prop pprint*
     "method-generic" word-prop pprint*
     method-stack-effect effect>string comment. ;
diff --git a/extra/tools/deploy/shaker/strip-cocoa.factor b/extra/tools/deploy/shaker/strip-cocoa.factor
index 2eddce6475..b37e42f323 100755
--- a/extra/tools/deploy/shaker/strip-cocoa.factor
+++ b/extra/tools/deploy/shaker/strip-cocoa.factor
@@ -1,5 +1,6 @@
 USING: cocoa cocoa.messages cocoa.application cocoa.nibs
-assocs namespaces kernel words compiler sequences ui.cocoa ;
+assocs namespaces kernel words compiler.units sequences
+ui.cocoa ;
 
 "stop-after-last-window?" get
 global [