combinators.extras: change sequence-case to not use a generic

diff --git a/extra/combinators/extras/extras.factor b/extra/combinators/extras/extras.factor
index 7205616b17daafbb5f9083c02b53fa3e29a57293..df95b546476a50a17eeb41404de572521763efc0 100644 (file)
--- a/extra/combinators/extras/extras.factor
+++ b/extra/combinators/extras/extras.factor
@@ -19,24 +19,22 @@ PRIVATE>
 
 MACRO: cond-case ( assoc -- quot )
     [
-        dup callable? not [
+        dup callable? [
             [ first '[ dup @ ] ]
             [ second '[ drop @ ] ] bi 2array
-        ] when
+        ] unless
     ] map '[ _ cond ] ;
 
-<PRIVATE
-GENERIC: sequence-case-contains? ( elt obj -- ? )
-M: object sequence-case-contains? = ;
-M: sequence sequence-case-contains? member? ;
-M: sets:set sequence-case-contains? in? ;
-PRIVATE>
-
 MACRO: sequence-case ( assoc -- quot )
     [
         dup callable? [
-            [ first '[ dup _ sequence-case-contains? ] ]
-            [ second '[ drop @ ] ] bi 2array
+            [
+                first {
+                    { [ dup set? ] [ [ in? ] ] }
+                    { [ dup sequence? ] [ [ member? ] ] }
+                    [ [ = ] ]
+                } cond '[ dup _ @ ]
+            ] [ second '[ drop @ ] ] bi 2array
         ] unless
     ] map [ cond ] curry ;