diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot.clj | 6 | ||||
| -rw-r--r-- | src/jvm/clojure/lang/Compiler.java | 15 | ||||
| -rw-r--r-- | src/proxy.clj | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/boot.clj b/src/boot.clj index 63103355..f27b7c0d 100644 --- a/src/boot.clj +++ b/src/boot.clj @@ -1477,12 +1477,12 @@ not-every? (comp not every?)) (defn bigint "Coerce to BigInteger" {:tag BigInteger} - [x] (BigInteger.valueOf x)) + [x] (. BigInteger valueOf x)) (defn bigdec "Coerce to BigDecimal" {:tag BigDecimal} - [x] (BigDecimal.valueOf x)) + [x] (. BigDecimal valueOf x)) (import '(java.lang.reflect Array)) @@ -2390,7 +2390,7 @@ not-every? (comp not every?)) (defn add-classpath "Adds the url (String or URL object) to the classpath per URLClassLoader.addURL" - [url] (clojure.lang.RT.addURL url)) + [url] (. clojure.lang.RT addURL url)) (defn vec "Creates a new vector containing the contents of coll." diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java index 3233c151..bcc0ef76 100644 --- a/src/jvm/clojure/lang/Compiler.java +++ b/src/jvm/clojure/lang/Compiler.java @@ -3409,14 +3409,15 @@ public static Object macroexpand1(Object x) throws Exception{ //(s.substring 2 5) => (. s substring 2 5) //also (package.class.name ...) (. package.class name ...) int idx = sname.lastIndexOf('.'); - if(idx > 0 && idx < sname.length() - 1) - { - Symbol target = Symbol.intern(sname.substring(0, idx)); - Symbol meth = Symbol.intern(sname.substring(idx + 1)); - return RT.listStar(DOT, target, meth, form.rest()); - } +// if(idx > 0 && idx < sname.length() - 1) +// { +// Symbol target = Symbol.intern(sname.substring(0, idx)); +// Symbol meth = Symbol.intern(sname.substring(idx + 1)); +// return RT.listStar(DOT, target, meth, form.rest()); +// } //(StringBuilder. "foo") => (new StringBuilder "foo") - else if(idx == sname.length() - 1) + //else + if(idx == sname.length() - 1) return RT.listStar(NEW, Symbol.intern(sname.substring(0, idx)), form.rest()); } } diff --git a/src/proxy.clj b/src/proxy.clj index 53c7fe5f..bc85b530 100644 --- a/src/proxy.clj +++ b/src/proxy.clj @@ -187,7 +187,7 @@ ;finish class def (. cv (visitEnd)) ;generate, cache and return class object - (let [loader (RT.ROOT_CLASSLOADER) + (let [loader (. RT ROOT_CLASSLOADER) c (. loader (defineClass (. cname (replace "/" ".")) (. cv (toByteArray))))] (sync nil (commute *proxy-classes* assoc bases c)) |