a bit of cleanup

halgari · halgari · commit dc3f22a99612 · 2015-03-21T21:45:45.000-06:00
diff --git a/pixie/channels.pxi b/pixie/channels.pxi
@@ -177,7 +177,7 @@
            (-take! c (->AltHandler handler-atom f)))))
      nil
      ops)
-    (when (and (:default options)
+    (when (and (contains? options :default)
                (not @handler-atom))
       (reset! handler-atom true)
       (st/-run-later (partial k [:default (:default options)])))))
diff --git a/pixie/csp.pxi b/pixie/csp.pxi
@@ -56,7 +56,7 @@
 (defn alts!
   ([ops]
    (st/call-cc (fn [k]
-                 (chans/alts! ops (partial st/run-and-process k) {}))))
+                 (chans/alts! ops (partial st/run-and-process k) nil))))
   ([ops & opts]
    (st/call-cc (fn [k]
                  (chans/alts! ops (partial st/run-and-process k) (apply hashmap opts))))))
diff --git a/pixie/stdlib.pxi b/pixie/stdlib.pxi
@@ -292,6 +292,7 @@
 (extend -with-meta Nil (fn [self _] nil))
 (extend -at-end? Nil (fn [_] true))
 (extend -deref Nil (fn [_] nil))
+(extend -contains-key Nil (fn [_ _] false))
 
 (extend -hash Integer hash-int)
 
diff --git a/tests/pixie/tests/test-csp.pxi b/tests/pixie/tests/test-csp.pxi
@@ -23,7 +23,6 @@
                               (alts! [c1 c2])))]
     (>! c1 1)
     (>! c2 2)
-    (println (hash-set  [c1 1] [c2 2]))
     (assert (not (= c1 c2)))
     (assert= (<! results) #{[c1 1] [c2 2]})))
 
