Revert "CLJ-2890: WiP"

fogus · fogus · commit 58d0225dc33e · 2024-12-02T16:57:23.000-05:00
This reverts commit 2bb190f.
diff --git a/src/clj/clojure/genclass.clj b/src/clj/clojure/genclass.clj
@@ -101,27 +101,7 @@
       'char Character/TYPE
       'chars (Class/forName "[C")})
 
-(defn- maybe-array-descriptor [x]
-  (if-let  [dim (and (symbol? x)
-                     (namespace x)
-                     (clojure.lang.Util/isPosDigit (name x))
-                     (-> x name (.charAt 0) int (- (int \0))))]
-    (let [cn (namespace x)
-          classname (if (some #{\.} cn) cn (str "java.lang." cn))]
-      (str (String/join "" ^Iterable (repeat dim "[")) "L" classname ";"))
-    (str x)))
-
-(defn- ^Class the-class [x]
-  (cond
-   (class? x) x
-   (contains? prim->class x) (prim->class x)
-   :else (let [strx (maybe-array-descriptor x)]
-           (clojure.lang.RT/classForName
-            (if (some #{\. \[} strx)
-              strx
-              (str "java.lang." strx))))))
-
-#_(defn- ^Class the-class [x] 
+(defn- ^Class the-class [x] 
   (cond 
    (class? x) x
    (contains? prim->class x) (prim->class x)
diff --git a/src/jvm/clojure/lang/Util.java b/src/jvm/clojure/lang/Util.java
@@ -256,7 +256,7 @@ static public Object loadWithClass(String scriptbase, Class<?> loadFrom) throws
     }
 }
 
-public static boolean isPosDigit(String s) {
+static boolean isPosDigit(String s) {
 	if(s.length() != 1)
 		return false;
 	char ch = s.charAt(0);

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ static public Object loadWithClass(String scriptbase, Class<?> loadFrom) throws`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`
`259`		`-public static boolean isPosDigit(String s) {`
	`259`	`+static boolean isPosDigit(String s) {`
`260`	`260`	`if(s.length() != 1)`
`261`	`261`	`return false;`
`262`	`262`	`char ch = s.charAt(0);`