classes.predicate: faster predicate-def for anonymous-predicate

diff --git a/core/classes/predicate/predicate.factor b/core/classes/predicate/predicate.factor
index 356a97c10cd43e848547b3a4cd721abfe898855a..31639c4f0cc712c82c89ac19995fe0b3a4bc1d2d 100644 (file)
--- a/core/classes/predicate/predicate.factor
+++ b/core/classes/predicate/predicate.factor
@@ -44,13 +44,13 @@ M: predicate-class (flatten-class)
 M: predicate-class (classes-intersect?)
     superclass-of classes-intersect? ;
 
-M: anonymous-predicate predicate-def 
-    '[ _ 2dup instance? 
-        [ predicate>> call( obj -- ? ) ] [ 2drop f ] if ] ;
+M: anonymous-predicate predicate-def
+    [ class>> ] [ predicate>> ] bi
+    '[ dup _ instance? _ [ drop f ] if ] ;
 
 M: anonymous-predicate instance?
-    2dup class>> instance? 
-        [ predicate>> call( object -- ? ) ] [ 2drop f ] if ;
+    2dup class>> instance?
+    [ predicate>> call( object -- ? ) ] [ 2drop f ] if ;
 
 M: anonymous-predicate class-name
     class>> class-name ;