Tightening code

Author: fogus

src/clj/clojure/genclass.clj

@@ -107,14 +107,12 @@
                      (clojure.lang.Util/isPosDigit (name x))
                      (-> x name (.charAt 0) int (- (int \0))))]
     (let [cn (namespace x)
-          ^Class pc (prim->class (symbol cn))
-          classname (cond (some #{\.} cn) cn
-                          pc (-> pc Type/getType Type/.getDescriptor)
-                          :default (str "java.lang." cn))
           ^Iterable dim-descr (repeat dim "[")]
-      (if pc
-        (str (String/join "" dim-descr) classname)
-        (str (String/join "" dim-descr) "L" classname ";")))
+      (if-let [^Class pc (clojure.lang.Compiler/primClass (symbol cn))]
+        (str (String/join "" dim-descr) (-> pc Type/getType Type/.getDescriptor))
+        (str (String/join "" dim-descr) "L"
+             (if (some #{\.} cn) cn (str "java.lang." cn))
+             ";")))
     (str x)))
 
 (defn- ^Class the-class [x]

src/jvm/clojure/lang/Compiler.java

@@ -9184,7 +9184,7 @@ static Class retType(Class tc, Class ret){
         return tc;
     }
 
-	static Class primClass(Symbol sym){
+	public static Class primClass(Symbol sym){
 		if(sym == null)
 			return null;
 		Class c = null;

test/clojure/test_clojure/genclass.clj

@@ -149,3 +149,13 @@
                         (visitSource [source debug] (.append sourceFile source)))]
     (.accept classReader sourceVisitor 0)
     (is (= "examples.clj" (str sourceFile)))))
+
+(deftest array-descriptors->class
+  (are [descr c] (= (#'clojure.core/the-class descr) c)
+    "[Ljava.util.UUID;" java.util.UUID/1
+    'String java.lang.String
+    'String/1 java.lang.String/1
+    'java.util.UUID java.util.UUID
+    'java.util.UUID/2 java.util.UUID/2
+    'int/1 int/1
+    'boolean/9 boolean/9))