Merge pull request #505 from thomasmulvaney/keyword-improve

keywords can start with numbers or true, false, nil

Author: thomasmulvaney

pixie/vm/reader.py

@@ -10,7 +10,6 @@
 from pixie.vm.keyword import keyword, Keyword
 import pixie.vm.rt as rt
 from pixie.vm.persistent_vector import EMPTY as EMPTY_VECTOR
-from pixie.vm.libs.libedit import _readline
 from pixie.vm.string import Character
 from pixie.vm.code import wrap_fn
 from pixie.vm.persistent_hash_map import EMPTY as EMPTY_MAP
@@ -319,11 +318,12 @@ def fqd(self, itm):
     def invoke(self, rdr, ch):
         ch = rdr.read()
         if ch == u":":
-            itm = read_inner(rdr, True)
+            ch = rdr.read()
+            itm = read_symbol(rdr, ch, False)
             return self.fqd(itm)
         else:
-            rdr.unread()
-            itm = read_inner(rdr, True)
+            itm = read_symbol(rdr, ch, False)
+
             return keyword(rt.name(itm), rt.namespace(itm))
 
 class LiteralStringReader(ReaderHandler):
@@ -739,7 +739,7 @@ def read_number(rdr, ch):
         return parsed
     return Symbol(joined)
 
-def read_symbol(rdr, ch):
+def read_symbol(rdr, ch, convert_primitives=True):
     acc = [ch]
     try:
         while True:
@@ -752,12 +752,14 @@ def read_symbol(rdr, ch):
         pass
 
     sym_str = u"".join(acc)
-    if sym_str == u"true":
-        return true
-    if sym_str == u"false":
-        return false
-    if sym_str == u"nil":
-        return nil
+
+    if convert_primitives:
+        if sym_str == u"true":
+            return true
+        if sym_str == u"false":
+            return false
+        if sym_str == u"nil":
+            return nil
     return symbol(sym_str)
 
 class EOF(object.Object):

tests/pixie/tests/test-keywords.pxi

@@ -6,7 +6,6 @@
     (t/assert= (:a m) 1)
     (t/assert= (:b m) 2)
     (t/assert= (:c m) 3)
-
     (t/assert= (:d m) nil)
     (t/assert= (:d m :foo) :foo)))
 
@@ -29,9 +28,40 @@
   (t/assert= (not= :foo/bar :cat/bar) true)
   (t/assert= (not= :foo/cat :foo/dog) true))
 
+(t/deftest keyword-reader
+  (t/assert= (read-string ":1") :1)
+  (t/assert= (read-string ":1") :1)
+  (t/assert= (read-string ":1.0") :1.0)
+  (t/assert= (read-string ":foo") :foo)
+  (t/assert= (read-string ":1foo") :1foo)
+  (t/assert= (read-string ":foo/bar") :foo/bar)
+  (t/assert= (read-string ":1foo/1bar") :1foo/1bar)
+  (t/assert= (read-string ":nil") :nil)
+  (t/assert= (read-string ":true") :true)
+  (t/assert= (read-string ":false") :false)
+
+  ;; We are reading at runtime so the namespace isn't
+  ;; going to be pixie.test.test-keywords. Its probably
+  ;; 'user but lets explicitly set it.
+  ;; The refer-ns is to initialize a new space
+  (refer-ns 'my.other.ns 'my.fake.core 'fake)
+  (binding [*ns* (the-ns 'my.other.ns)]
+    (t/assert= (read-string "::1")    :my.other.ns/1)
+    (t/assert= (read-string "::1.0")  :my.other.ns/1.0)
+    (t/assert= (read-string "::foo")  :my.other.ns/foo)
+    (t/assert= (read-string "::true") :my.other.ns/true)))
+
 (t/deftest string-to-keyword
+  (t/assert= (keyword "1") :1)
+  (t/assert= (keyword "1") :1)
+  (t/assert= (keyword "1.0") :1.0)
   (t/assert= (keyword "foo") :foo)
+  (t/assert= (keyword "1foo") :1foo)
   (t/assert= (keyword "foo/bar") :foo/bar)
+  (t/assert= (keyword "1foo/1bar") :1foo/1bar)
+  (t/assert= (keyword "nil") :nil)
+  (t/assert= (keyword "true") :true)
+  (t/assert= (keyword "false") :false)
   (t/assert-throws? (keyword 1))
   (t/assert-throws? (keyword :a))
   (t/assert-throws? (keyword 'a))