From 81cdc2df08ab710630136391e6bb461c33c553c3 Mon Sep 17 00:00:00 2001
From: Max Penet <m@qbits.cc>
Date: Fri, 30 Oct 2015 12:35:24 +0100
Subject: [PATCH] allows kw/map/set invocations with default value

---
 pixie/stdlib.pxi                            | 15 ++++++++++-----
 tests/pixie/tests/collections/test-maps.pxi |  5 +++--
 tests/pixie/tests/collections/test-sets.pxi |  4 +++-
 tests/pixie/tests/test-keywords.pxi         |  3 ++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pixie/stdlib.pxi b/pixie/stdlib.pxi
index ab0cdc3d..e47f7498 100644
--- a/pixie/stdlib.pxi
+++ b/pixie/stdlib.pxi
@@ -1061,17 +1061,22 @@ If further arguments are passed, invokes the method named by symbol, passing the
 
 (extend -repr Symbol -str)
 
-(extend -invoke Keyword (fn [k m] (-val-at m k nil)))
-(extend -invoke PersistentHashMap (fn [m k] (-val-at m k nil)))
-(extend -invoke PersistentHashSet (fn [m k] (-val-at m k nil)))
-
 (defn get
   {:doc "Get an element from a collection implementing ILookup, return nil or the default value if not found."
    :added "0.1"}
   ([mp k]
      (get mp k nil))
   ([mp k not-found]
-     (-val-at mp k not-found)))
+   (-val-at mp k not-found)))
+
+(extend -invoke Keyword (fn
+                          ([k m not-found]
+                           (-val-at m k not-found))
+                          ([k m]
+                           (-val-at m k nil))))
+(extend -invoke PersistentHashMap get)
+(extend -invoke PersistentHashSet get)
+
 
 (defn get-in
   {:doc "Get a value from a nested collection at the \"path\" given by the keys."
diff --git a/tests/pixie/tests/collections/test-maps.pxi b/tests/pixie/tests/collections/test-maps.pxi
index a4072fe1..246e4af5 100644
--- a/tests/pixie/tests/collections/test-maps.pxi
+++ b/tests/pixie/tests/collections/test-maps.pxi
@@ -25,14 +25,15 @@
     (t/assert= (-eq m {:a 1, :b 2, :c 4}) false)
     (t/assert= (-eq m {:a 3, :b 2, :c 1}) false)))
 
-
 (t/deftest map-val-at-and-invoke
   (let [m {:a 1, :b 2, :c 3}]
     (foreach [e m]
              (t/assert= (get m (key e)) (val e))
              (t/assert= (m (key e)) (val e)))
     (t/assert= (get m :d) nil)
-    (t/assert= (m :d) nil)))
+    (t/assert= (m :d) nil)
+    (t/assert= (m :d :foo) :foo)
+    (t/assert= (:d m :foo) :foo)))
 
 (t/deftest map-without
   (let [m {:a 1 :b 2}]
diff --git a/tests/pixie/tests/collections/test-sets.pxi b/tests/pixie/tests/collections/test-sets.pxi
index 376f95bf..7b91c342 100644
--- a/tests/pixie/tests/collections/test-sets.pxi
+++ b/tests/pixie/tests/collections/test-sets.pxi
@@ -58,7 +58,9 @@
     (t/assert= (s 3) 3)
 
     (t/assert= (s -1) nil)
-    (t/assert= (s 4) nil)))
+    (t/assert= (s 4) nil)
+    (t/assert= (s :d :foo) :foo)
+    (t/assert= (:d s :foo) :foo)))
 
 (t/deftest test-has-meta
   (let [m {:has-meta true}
diff --git a/tests/pixie/tests/test-keywords.pxi b/tests/pixie/tests/test-keywords.pxi
index 9b4357e7..06e2deb7 100644
--- a/tests/pixie/tests/test-keywords.pxi
+++ b/tests/pixie/tests/test-keywords.pxi
@@ -7,7 +7,8 @@
     (t/assert= (:b m) 2)
     (t/assert= (:c m) 3)
 
-    (t/assert= (:d m) nil)))
+    (t/assert= (:d m) nil)
+    (t/assert= (:d m :foo) :foo)))
 
 (t/deftest keyword-namespace
   (t/assert= (namespace :foo/bar) "foo")