Skip to content

Commit 7806e33

Browse files
committed
direct linking wip, no knobs yet
1 parent f5927cb commit 7806e33

File tree

5 files changed

+185
-136
lines changed

5 files changed

+185
-136
lines changed

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<sysproperty key="clojure.compile.path" value="${build}"/>
5252
<!--<sysproperty key="clojure.compiler.elide-meta" value="[:doc :file :line :added]"/>-->
5353
<!--<sysproperty key="clojure.compiler.disable-locals-clearing" value="true"/>-->
54-
<!-- <sysproperty key="clojure.compile.warn-on-reflection" value="true"/> -->
54+
<sysproperty key="clojure.compile.warn-on-reflection" value="true"/>
5555
<sysproperty key="clojure.compiler.elide-meta" value="${compiler.elide-meta}"/>
5656
<sysproperty key="java.awt.headless" value="true"/>
5757
<arg value="clojure.core"/>

pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,8 @@
295295
<target>
296296
<property name="maven.compile.classpath"
297297
refid="maven.compile.classpath" />
298-
<property name="compiler.elide-meta"
299-
value="[:doc :file :line :added :column :ns :name :static :arglists]"/>
300-
<ant target="compile-clojure"/>
298+
<property name="compiler.elide-meta" value="[:doc :file :line :added :column :ns :name :static :arglists]"/>
299+
<ant target="compile-clojure"/>
301300
</target>
302301
</configuration>
303302
</execution>

src/clj/clojure/core.clj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@
8282
:added "1.0"
8383
:static true}
8484
conj (fn ^:static conj
85-
([coll x] (. clojure.lang.RT (conj coll x)))
85+
([coll x] (clojure.lang.RT/conj coll x))
8686
([coll x & xs]
8787
(if xs
88-
(recur (conj coll x) (first xs) (next xs))
89-
(conj coll x)))))
88+
(recur (clojure.lang.RT/conj coll x) (first xs) (next xs))
89+
(clojure.lang.RT/conj coll x)))))
9090

9191
(def
9292
^{:doc "Same as (first (next x))"
@@ -186,9 +186,9 @@
186186
:static true}
187187
assoc
188188
(fn ^:static assoc
189-
([map key val] (. clojure.lang.RT (assoc map key val)))
189+
([map key val] (clojure.lang.RT/assoc map key val))
190190
([map key val & kvs]
191-
(let [ret (assoc map key val)]
191+
(let [ret (clojure.lang.RT/assoc map key val)]
192192
(if kvs
193193
(if (next kvs)
194194
(recur ret (first kvs) (second kvs) (nnext kvs))
@@ -315,7 +315,7 @@
315315
(list 'def (with-meta name m)
316316
;;todo - restore propagation of fn name
317317
;;must figure out how to convey primitive hints to self calls first
318-
(cons `fn fdecl) ))))
318+
(with-meta (cons `fn fdecl) {:rettag (:tag m)}) ))))
319319

320320
(. (var defn) (setMacro))
321321

0 commit comments

Comments
 (0)