1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
|
Index: pkg-clojure/build.xml
===================================================================
--- pkg-clojure.orig/build.xml 2014-06-14 11:46:43.985057347 +0900
+++ pkg-clojure/build.xml 2014-06-14 11:46:43.977058066 +0900
@@ -37,6 +37,7 @@
<target name="compile-java" depends="init"
description="Compile Java sources.">
<javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
+ classpath="/usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar"
includeAntRuntime="false"
debug="true" source="1.6" target="1.6"/>
</target>
@@ -44,7 +45,7 @@
<target name="compile-clojure"
description="Compile Clojure sources.">
<java classname="clojure.lang.Compile"
- classpath="${maven.compile.classpath}:${build}:${cljsrc}"
+ classpath="/usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar:${maven.compile.classpath}:${build}:${cljsrc}"
failonerror="true"
fork="true">
<sysproperty key="clojure.compile.path" value="${build}"/>
@@ -86,7 +87,7 @@
<javac srcdir="${jtestsrc}" destdir="${test-classes}" includeJavaRuntime="yes"
debug="true" source="1.6" target="1.6" includeantruntime="no"/>
<java classname="clojure.lang.Compile"
- classpath="${test-classes}:${test}:${build}:${cljsrc}"
+ classpath="/usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar:${test-classes}:${test}:${build}:${cljsrc}"
failonerror="true"
fork="true">
<sysproperty key="clojure.compile.path" value="${test-classes}"/>
@@ -105,6 +106,8 @@
<java classname="clojure.main" failonerror="true" fork="true">
<classpath>
<pathelement path="${maven.test.classpath}"/>
+ <path location="/usr/share/java/asm4.jar"/>
+ <path location="/usr/share/java/asm4-commons.jar"/>
<path location="${test-classes}"/>
<path location="${test}"/>
<path location="${build}"/>
@@ -126,7 +129,7 @@
</fileset>
<manifest>
<attribute name="Main-Class" value="clojure.main"/>
- <attribute name="Class-Path" value="."/>
+ <attribute name="Class-Path" value="asm4.jar asm4-commons.jar jsr166y.jar"/>
</manifest>
</jar>
<copy file="${clojure_jar}" tofile="${clojure_noversion_jar}"/>
Index: pkg-clojure/src/clj/clojure/core.clj
===================================================================
--- pkg-clojure.orig/src/clj/clojure/core.clj 2014-06-14 11:46:43.985057347 +0900
+++ pkg-clojure/src/clj/clojure/core.clj 2014-06-14 11:46:43.977058066 +0900
@@ -4999,10 +4999,10 @@
(.getAnnotation c java.lang.annotation.Retention)]
(= (.value r) java.lang.annotation.RetentionPolicy/RUNTIME)))))
-(defn- descriptor [^Class c] (clojure.asm.Type/getDescriptor c))
+(defn- descriptor [^Class c] (org.objectweb.asm.Type/getDescriptor c))
(declare process-annotation)
-(defn- add-annotation [^clojure.asm.AnnotationVisitor av name v]
+(defn- add-annotation [^org.objectweb.asm.AnnotationVisitor av name v]
(cond
(vector? v) (let [avec (.visitArray av name)]
(doseq [vval v]
@@ -5012,7 +5012,7 @@
(cond
(instance? java.lang.Enum ev)
(.visitEnum av name (descriptor (class ev)) (str ev))
- (class? ev) (.visit av name (clojure.asm.Type/getType ev))
+ (class? ev) (.visit av name (org.objectweb.asm.Type/getType ev))
:else (throw (IllegalArgumentException.
(str "Unsupported annotation value: " v " of class " (class ev))))))
(seq? v) (let [[nested nv] v
Index: pkg-clojure/src/clj/clojure/core_proxy.clj
===================================================================
--- pkg-clojure.orig/src/clj/clojure/core_proxy.clj 2014-06-14 11:46:43.985057347 +0900
+++ pkg-clojure/src/clj/clojure/core_proxy.clj 2014-06-14 11:46:43.977058066 +0900
@@ -11,9 +11,9 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(import
- '(clojure.asm ClassWriter ClassVisitor Opcodes Type)
+ '(org.objectweb.asm ClassWriter ClassVisitor Opcodes Type)
'(java.lang.reflect Modifier Constructor)
- '(clojure.asm.commons Method GeneratorAdapter)
+ '(org.objectweb.asm.commons Method GeneratorAdapter)
'(clojure.lang IProxy Reflector DynamicClassLoader IPersistentMap PersistentHashMap RT))
(defn method-sig [^java.lang.reflect.Method meth]
Index: pkg-clojure/src/clj/clojure/genclass.clj
===================================================================
--- pkg-clojure.orig/src/clj/clojure/genclass.clj 2014-06-14 11:46:43.985057347 +0900
+++ pkg-clojure/src/clj/clojure/genclass.clj 2014-06-14 11:46:43.977058066 +0900
@@ -9,8 +9,8 @@
(in-ns 'clojure.core)
(import '(java.lang.reflect Modifier Constructor)
- '(clojure.asm ClassWriter ClassVisitor Opcodes Type)
- '(clojure.asm.commons Method GeneratorAdapter)
+ '(org.objectweb.asm ClassWriter ClassVisitor Opcodes Type)
+ '(org.objectweb.asm.commons Method GeneratorAdapter)
'(clojure.lang IPersistentMap))
;(defn method-sig [^java.lang.reflect.Method meth]
Index: pkg-clojure/src/jvm/clojure/lang/Compiler.java
===================================================================
--- pkg-clojure.orig/src/jvm/clojure/lang/Compiler.java 2014-06-14 11:46:43.985057347 +0900
+++ pkg-clojure/src/jvm/clojure/lang/Compiler.java 2014-06-14 11:46:43.981057707 +0900
@@ -12,11 +12,13 @@
package clojure.lang;
-//*
+/*
+
+import org.objectweb.asm.*;
+import org.objectweb.asm.commons.GeneratorAdapter;
+import org.objectweb.asm.commons.Method;
-import clojure.asm.*;
-import clojure.asm.commons.GeneratorAdapter;
-import clojure.asm.commons.Method;
+*/
import java.io.*;
import java.lang.reflect.Constructor;
@@ -26,14 +28,15 @@
import java.util.regex.Matcher;
//*/
-/*
+///*
import org.objectweb.asm.*;
import org.objectweb.asm.commons.Method;
import org.objectweb.asm.commons.GeneratorAdapter;
+/*
import org.objectweb.asm.util.TraceClassVisitor;
import org.objectweb.asm.util.CheckClassAdapter;
-//*/
+*/
public class Compiler implements Opcodes{
Index: pkg-clojure/src/jvm/clojure/lang/Intrinsics.java
===================================================================
--- pkg-clojure.orig/src/jvm/clojure/lang/Intrinsics.java 2014-06-14 11:46:43.985057347 +0900
+++ pkg-clojure/src/jvm/clojure/lang/Intrinsics.java 2014-06-14 11:46:43.981057707 +0900
@@ -12,7 +12,7 @@
package clojure.lang;
-import clojure.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
public class Intrinsics implements Opcodes{
private static Object[] oa(Object... arr){
Index: pkg-clojure/src/clj/clojure/reflect/java.clj
===================================================================
--- pkg-clojure.orig/src/clj/clojure/reflect/java.clj 2014-06-14 11:46:43.985057347 +0900
+++ pkg-clojure/src/clj/clojure/reflect/java.clj 2014-06-14 11:46:43.981057707 +0900
@@ -11,7 +11,7 @@
(require '[clojure.set :as set]
'[clojure.string :as str])
-(import '[clojure.asm ClassReader ClassVisitor Type Opcodes]
+(import '[org.objectweb.asm ClassReader ClassVisitor Type Opcodes]
'[java.lang.reflect Modifier]
java.io.InputStream)
Index: pkg-clojure/test/clojure/test_clojure/reflect.clj
===================================================================
--- pkg-clojure.orig/test/clojure/test_clojure/reflect.clj 2014-06-14 11:46:43.985057347 +0900
+++ pkg-clojure/test/clojure/test_clojure/reflect.clj 2014-06-14 11:46:43.981057707 +0900
@@ -25,7 +25,7 @@
(deftest field-descriptor->class-symbol-test
(are [s d] (= s (@#'reflect/field-descriptor->class-symbol d))
- 'clojure.asm.Type<><> "[[Lclojure/asm/Type;"
+ 'org.objectweb.asm.Type<><> "[[Lorg.objectweb/asm/Type;"
'int "I"
'java.lang.Object "Ljava.lang.Object;"))
Index: pkg-clojure/pom.xml
===================================================================
--- pkg-clojure.orig/pom.xml 2014-06-14 11:46:43.985057347 +0900
+++ pkg-clojure/pom.xml 2014-06-14 11:58:10.342650895 +0900
@@ -57,6 +57,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>5.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>5.0.3</version>
+ </dependency>
</dependencies>
<build>
|
