fixed keyword ctor, added tests, fix #154

Signed-off-by: Chouser <chouser@n01se.net>

2 files changed, 8 insertions, 4 deletions

diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj
index 7b4bb4f5..50e4d584 100644
--- a/src/clj/clojure/core.clj
+++ b/src/clj/clojure/core.clj
@@ -355,14 +355,14 @@
 
 (defn symbol
   "Returns a Symbol with the given namespace and name."
-  ([name] (if (symbol? name) name (. clojure.lang.Symbol (intern name))))
-  ([ns name] (. clojure.lang.Symbol (intern ns name))))
+  ([name] (if (symbol? name) name (clojure.lang.Symbol/intern name)))
+  ([ns name] (clojure.lang.Symbol/intern ns name)))
 
 (defn keyword
   "Returns a Keyword with the given namespace and name.  Do not use :
   in the keyword strings, it will be added automatically."
-  ([name] (if (keyword? name) name (. clojure.lang.Keyword (intern nil name))))
-  ([ns name] (. clojure.lang.Keyword (intern ns name))))
+  ([name] (if (keyword? name) name (clojure.lang.Keyword/intern name)))
+  ([ns name] (clojure.lang.Keyword/intern ns name)))
 
 (defn gensym
   "Returns a new symbol with a unique name. If a prefix string is
diff --git a/src/jvm/clojure/lang/Keyword.java b/src/jvm/clojure/lang/Keyword.java
index fcb814f6..9b5aea9a 100644
--- a/src/jvm/clojure/lang/Keyword.java
+++ b/src/jvm/clojure/lang/Keyword.java
@@ -30,6 +30,10 @@ public static Keyword intern(String ns, String name){
 	return intern(Symbol.intern(ns, name));
 }
 
+public static Keyword intern(String nsname){
+	return intern(Symbol.intern(nsname));
+}
+
 private Keyword(Symbol sym){
 	this.sym = sym;
 }