keywords can now be fully qualified as in clojure

thomasmulvaney · thomasmulvaney · commit 01c8776a2f9b · 2015-05-20T13:45:00.000+01:00
diff --git a/pixie/vm/code.py b/pixie/vm/code.py
@@ -544,6 +544,17 @@ def add_refer_symbol(self, sym, var):
     def include_stdlib(self):
         stdlib = _ns_registry.find_or_make(u"pixie.stdlib")
         self.add_refer(stdlib, refer_all=True)
+    
+    def resolve_ns(self, ns_alias):
+        refer = self._refers.get(ns_alias, None)
+        resolved_ns = None
+        if refer is not None:
+            resolved_ns = refer._namespace
+        if resolved_ns is None:
+            resolved_ns = _ns_registry.get(ns_alias, None)
+        if resolved_ns is None:
+            affirm(False, u"Unable to resolve namespace: " + ns_alias + u" inside namespace " + self._name)
+        return resolved_ns
 
     def resolve(self, s, use_refers=True):
         import pixie.vm.symbol as symbol
@@ -552,14 +563,7 @@ def resolve(self, s, use_refers=True):
         name = rt.name(s)
 
         if ns is not None:
-            refer = self._refers.get(ns, None)
-            resolved_ns = None
-            if refer is not None:
-                resolved_ns = refer._namespace
-            if resolved_ns is None:
-                resolved_ns = _ns_registry.get(ns, None)
-            if resolved_ns is None:
-                affirm(False, u"Unable to resolve namespace: " + ns + u" inside namespace " + self._name)
+            resolved_ns = self.resolve_ns(ns)
         else:
             resolved_ns = self
 
diff --git a/pixie/vm/reader.py b/pixie/vm/reader.py
@@ -333,21 +333,24 @@ def invoke(self, rdr, ch):
         return cons(symbol(u"quote"), cons(itm))
 
 class KeywordReader(ReaderHandler):
+    def fqd(self, itm):
+        ns_alias = rt.namespace(itm)
+        current_nms = rt.ns.deref()
+
+        if ns_alias is None:
+            return keyword(rt.name(itm), rt.name(current_nms))
+        else:
+            ns_fqd = current_nms.resolve_ns(ns_alias)
+            return keyword(rt.name(itm), rt.name(ns_fqd))
+
     def invoke(self, rdr, ch):
-        nms = u""
         ch = rdr.read()
         if ch == u":":
             itm = read_inner(rdr, True)
-            nms = rt.name(rt.ns.deref())
+            return self.fqd(itm)
         else:
             rdr.unread()
             itm = read_inner(rdr, True)
-
-        affirm(isinstance(itm, Symbol), u"Can't keyword quote a non-symbol")
-        if nms:
-            affirm(rt.namespace(itm) is None, u"Kewyword cannot have two namespaces")
-            return keyword(rt.name(itm), nms)
-        else:
             return keyword(rt.name(itm), rt.namespace(itm))
 
 class LiteralStringReader(ReaderHandler):
diff --git a/tests/pixie/tests/test-keywords.pxi b/tests/pixie/tests/test-keywords.pxi
@@ -14,6 +14,14 @@
   (t/assert= (namespace :cat/dog) "cat")
   (t/assert= (namespace ::foo) "pixie.tests.test-keywords"))
 
+(t/deftest fqd-keywords
+  (t/assert-throws? (read-string "::x/bar"))
+  (t/assert-throws? (read-string "::a.b/foo"))
+  (refer-ns 'my.other.ns 'my.fake.core 'fake)
+  (binding [*ns* (the-ns 'my.other.ns)]
+    (t/assert= :my.fake.core/foo (read-string "::fake/foo"))
+    (t/assert= :my.fake.core/foo (read-string "::my.fake.core/foo"))
+    (t/assert-throws? (read-string "::f/foo"))))
 
 (t/deftest keyword-equality
   (t/assert= :foo/bar :foo/bar)
