Merge branch 'master' of git://factorcode.org/git/factor

basis/tools/annotations/annotations.factor

@@ -3,7 +3,7 @@
 USING: accessors kernel words parser io summary quotations
 sequences prettyprint continuations effects definitions
 compiler.units namespaces assocs tools.walker generic
-inspector ;
+inspector fry ;
 IN: tools.annotations
 
 GENERIC: reset ( word -- )
@@ -49,10 +49,7 @@ M: word reset
         .s
     ] if* "\\--" print flush ;
 
-: (watch) ( word def -- def )
-    over [ entering ] curry
-    rot [ leaving ] curry
-    swapd 3append ;
+: (watch) ( word def -- def ) over '[ _ entering @ _ leaving ] ;
 
 : watch ( word -- )
     dup [ (watch) ] annotate ;