Keywords used in function position should work properly now (#175)

Author: chrisrink10

basilisp/lang/keyword.py

@@ -2,6 +2,7 @@
 
 from pyrsistent import pmap, PMap
 
+import basilisp.lang.associative as lassoc
 import basilisp.lang.atom as atom
 
 __INTERN = atom.Atom(pmap())
@@ -36,8 +37,11 @@ def __eq__(self, other):
     def __hash__(self):
         return hash(str(self))
 
-    def __call__(self, m, default=None):
-        return m.get(self, default)
+    def __call__(self, m: lassoc.Associative, default=None):
+        try:
+            return m.entry(self, default)
+        except AttributeError:
+            return None
 
 
 def __get_or_create(kw_cache: PMap, h: int, name: str,

tests/keyword_test.py

@@ -1,3 +1,4 @@
+import basilisp.lang.map as lmap
 from basilisp.lang.keyword import keyword
 
 
@@ -31,3 +32,12 @@ def test_keyword_str_and_repr():
     kw = keyword("kw")
     assert str(kw) == "kw"
     assert repr(kw) == ":kw"
+
+
+def test_keyword_as_function():
+    kw = keyword("kw")
+    assert None is kw(None)
+
+    assert 1 == kw(lmap.map({kw: 1}))
+    assert "hi" == kw(lmap.map({kw: "hi"}))
+    assert None is kw(lmap.map({"hi": kw}))