Fix M: location recording

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 2f38aa4a391b46f7d8ab08f2ea55635368d1b3f8..3e007834097fb7601cc89ab07bb6e5f5c817c817 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -21,10 +21,10 @@
 - faster apropos
 - infer which variables are read, written in a quotation
 - compiled call traces
-- if listener is busy open a new listener when doing listener operations
 
 + ui:
 
+- listener commands from a menu should not include 'hide-glass' etc
 - some way of intercepting all gestures
 - how do we refer to command shortcuts in the docs?
 - fix top level window positioning

diff --git a/library/bootstrap/image.factor b/library/bootstrap/image.factor
index 6ba53549d01b3395f679c51c39333b4f6fb76e6e..4d19bbcbb7f7e4d393941cb46e703174687ceae7 100644 (file)
--- a/library/bootstrap/image.factor
+++ b/library/bootstrap/image.factor
@@ -236,6 +236,14 @@ M: tuple '
     transfer-tuple
     objects get [ tuple>array tuple-type emit-array ] cache ;
 
+M: method '
+    [
+        \ method transfer-word ,
+        f ,
+        dup method-loc ,
+        method-def ,
+    ] { } make tuple-type emit-array ;
+
 M: array '
     array-type emit-array ;
 

diff --git a/library/generic/methods.factor b/library/generic/methods.factor
index 5a0f80f2e0fa74af6ef83b01dbca14078a929eb2..f521256e40aaa853872c6bbf90b6f31a9c120759 100644 (file)
--- a/library/generic/methods.factor
+++ b/library/generic/methods.factor
@@ -11,7 +11,7 @@ PREDICATE: array method-spec
         drop f
     ] if ;
 
-TUPLE: method def loc ;
+TUPLE: method loc def ;
 
 M: f method-def ;
 M: f method-loc ;

diff --git a/library/syntax/parse-syntax.factor b/library/syntax/parse-syntax.factor
index 3d83bd8c0b2e1fbfb91d3c059c7c753ae66f0142..38b5730133a6e96303442fc685db8a37176484ab 100644 (file)
--- a/library/syntax/parse-syntax.factor
+++ b/library/syntax/parse-syntax.factor
@@ -48,8 +48,8 @@ DEFER: !PRIMITIVE: parsing
 : !G: CREATE dup reset-word [ define-generic* ] f ; parsing
 : !M:
     f set-word
-    scan-word scan-word
-    [ location <method> -rot define-method ] f ; parsing
+    scan-word scan-word location
+    [ <method> -rot define-method ] f ; parsing
 
 : !UNION:
     CREATE dup intern-symbol dup predicate-word