forked from hiredman/clojure-build
-
Notifications
You must be signed in to change notification settings - Fork 0
/
clj-700-patch2-updated.txt
268 lines (252 loc) · 9.48 KB
/
clj-700-patch2-updated.txt
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
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
From cc1acd4196b27dbde457baa2513823445d786b7c Mon Sep 17 00:00:00 2001
From: Alex Redington <alex.redington@thinkrelevance.com>
Date: Fri, 17 Feb 2012 15:48:50 -0800
Subject: [PATCH] Refactor of some of the clojure .java code to fix CLJ-700.
---
src/jvm/clojure/lang/Associative.java | 5 +----
src/jvm/clojure/lang/IAssociative.java | 21 +++++++++++++++++++++
src/jvm/clojure/lang/IPersistentSet.java | 6 ++----
src/jvm/clojure/lang/ISet.java | 17 +++++++++++++++++
src/jvm/clojure/lang/ITransientAssociative.java | 3 ++-
src/jvm/clojure/lang/ITransientSet.java | 4 +---
src/jvm/clojure/lang/PersistentArrayMap.java | 11 +++++++++++
src/jvm/clojure/lang/PersistentHashMap.java | 12 ++++++++++++
src/jvm/clojure/lang/PersistentVector.java | 17 +++++++++++++++++
src/jvm/clojure/lang/RT.java | 16 ++++++++--------
test/clojure/test_clojure/transients.clj | 13 +++++++++++++
11 files changed, 105 insertions(+), 20 deletions(-)
create mode 100644 src/jvm/clojure/lang/IAssociative.java
create mode 100644 src/jvm/clojure/lang/ISet.java
diff --git a/src/jvm/clojure/lang/Associative.java b/src/jvm/clojure/lang/Associative.java
index a239994..35474f5 100644
--- a/src/jvm/clojure/lang/Associative.java
+++ b/src/jvm/clojure/lang/Associative.java
@@ -9,10 +9,7 @@ package clojure.lang;
* the terms of this license.
* You must not remove this notice, or any other, from this software.
*/
-public interface Associative extends IPersistentCollection, ILookup{
-boolean containsKey(Object key);
-
-IMapEntry entryAt(Object key);
+public interface Associative extends IPersistentCollection, IAssociative{
Associative assoc(Object key, Object val);
diff --git a/src/jvm/clojure/lang/IAssociative.java b/src/jvm/clojure/lang/IAssociative.java
new file mode 100644
index 0000000..b65c278
--- /dev/null
+++ b/src/jvm/clojure/lang/IAssociative.java
@@ -0,0 +1,21 @@
+package clojure.lang;
+
+/**
+ * Copyright (c) Rich Hickey. All rights reserved.
+ * The use and distribution terms for this software are covered by the
+ * Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+ * which can be found in the file epl-v10.html at the root of this distribution.
+ * By using this software in any fashion, you are agreeing to be bound by
+ * the terms of this license.
+ * You must not remove this notice, or any other, from this software.
+ */
+
+public interface IAssociative extends ILookup {
+
+ boolean containsKey(Object key);
+
+ IMapEntry entryAt(Object key);
+
+ IAssociative assoc(Object key, Object val);
+
+}
diff --git a/src/jvm/clojure/lang/IPersistentSet.java b/src/jvm/clojure/lang/IPersistentSet.java
index 144d15a..3fce1ae 100644
--- a/src/jvm/clojure/lang/IPersistentSet.java
+++ b/src/jvm/clojure/lang/IPersistentSet.java
@@ -12,8 +12,6 @@
package clojure.lang;
-public interface IPersistentSet extends IPersistentCollection, Counted{
- public IPersistentSet disjoin(Object key) ;
- public boolean contains(Object key);
- public Object get(Object key);
+public interface IPersistentSet extends IPersistentCollection, ISet, Counted{
+ public IPersistentSet disjoin(Object key) ;
}
diff --git a/src/jvm/clojure/lang/ISet.java b/src/jvm/clojure/lang/ISet.java
new file mode 100644
index 0000000..9a8a8ce
--- /dev/null
+++ b/src/jvm/clojure/lang/ISet.java
@@ -0,0 +1,17 @@
+package clojure.lang;
+
+/**
+ * Copyright (c) Rich Hickey. All rights reserved.
+ * The use and distribution terms for this software are covered by the
+ * Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+ * which can be found in the file epl-v10.html at the root of this distribution.
+ * By using this software in any fashion, you are agreeing to be bound by
+ * the terms of this license.
+ * You must not remove this notice, or any other, from this software.
+ */
+
+public interface ISet extends Counted {
+ public boolean contains(Object key);
+ public Object get(Object key);
+ public ISet disjoin(Object key);
+}
diff --git a/src/jvm/clojure/lang/ITransientAssociative.java b/src/jvm/clojure/lang/ITransientAssociative.java
index a4d2655..b7b68bf 100644
--- a/src/jvm/clojure/lang/ITransientAssociative.java
+++ b/src/jvm/clojure/lang/ITransientAssociative.java
@@ -12,7 +12,8 @@
package clojure.lang;
-public interface ITransientAssociative extends ITransientCollection, ILookup{
+public interface ITransientAssociative extends ITransientCollection, IAssociative {
ITransientAssociative assoc(Object key, Object val);
+
}
diff --git a/src/jvm/clojure/lang/ITransientSet.java b/src/jvm/clojure/lang/ITransientSet.java
index 7d1ec51..348dd97 100644
--- a/src/jvm/clojure/lang/ITransientSet.java
+++ b/src/jvm/clojure/lang/ITransientSet.java
@@ -12,8 +12,6 @@
package clojure.lang;
-public interface ITransientSet extends ITransientCollection, Counted{
+public interface ITransientSet extends ITransientCollection, ISet, Counted{
public ITransientSet disjoin(Object key) ;
- public boolean contains(Object key);
- public Object get(Object key);
}
diff --git a/src/jvm/clojure/lang/PersistentArrayMap.java b/src/jvm/clojure/lang/PersistentArrayMap.java
index 2446ed6..0c28da6 100644
--- a/src/jvm/clojure/lang/PersistentArrayMap.java
+++ b/src/jvm/clojure/lang/PersistentArrayMap.java
@@ -295,6 +295,17 @@ static final class TransientArrayMap extends ATransientMap {
this.len = array.length;
}
+ public boolean containsKey(Object key){
+ return indexOf(key) >= 0;
+ }
+
+ public IMapEntry entryAt(Object key){
+ int i = indexOf(key);
+ if(i >= 0)
+ return new MapEntry(array[i],array[i+1]);
+ return null;
+ }
+
private int indexOf(Object key){
for(int i = 0; i < len; i += 2)
{
diff --git a/src/jvm/clojure/lang/PersistentHashMap.java b/src/jvm/clojure/lang/PersistentHashMap.java
index 4d49377..930af4d 100644
--- a/src/jvm/clojure/lang/PersistentHashMap.java
+++ b/src/jvm/clojure/lang/PersistentHashMap.java
@@ -237,6 +237,18 @@ static final class TransientHashMap extends ATransientMap {
this.nullValue = nullValue;
}
+ public boolean containsKey(Object key){
+ if(key == null)
+ return hasNull;
+ return (root != null) ? root.find(0, Util.hash(key), key, NOT_FOUND) != NOT_FOUND : false;
+ }
+
+ public IMapEntry entryAt(Object key){
+ if(key == null)
+ return hasNull ? new MapEntry(null, nullValue) : null;
+ return (root != null) ? root.find(0, Util.hash(key), key) : null;
+ }
+
ITransientMap doAssoc(Object key, Object val) {
if (key == null) {
if (this.nullValue != val)
diff --git a/src/jvm/clojure/lang/PersistentVector.java b/src/jvm/clojure/lang/PersistentVector.java
index e156dcc..8abd2ee 100644
--- a/src/jvm/clojure/lang/PersistentVector.java
+++ b/src/jvm/clojure/lang/PersistentVector.java
@@ -424,6 +424,23 @@ static final class TransientVector extends AFn implements ITransientVector, Coun
this(v.cnt, v.shift, editableRoot(v.root), editableTail(v.tail));
}
+ public boolean containsKey(Object key){
+ if(!(Util.isInteger(key)))
+ return false;
+ int i = ((Number) key).intValue();
+ return i >= 0 && i < count();
+ }
+
+ public IMapEntry entryAt(Object key){
+ if(Util.isInteger(key))
+ {
+ int i = ((Number) key).intValue();
+ if(i >= 0 && i < count())
+ return new MapEntry(key, nth(i));
+ }
+ return null;
+ }
+
public int count(){
ensureEditable();
return cnt;
diff --git a/src/jvm/clojure/lang/RT.java b/src/jvm/clojure/lang/RT.java
index 4d15c28..c773dec 100644
--- a/src/jvm/clojure/lang/RT.java
+++ b/src/jvm/clojure/lang/RT.java
@@ -642,8 +642,8 @@ static Object getFrom(Object coll, Object key){
Map m = (Map) coll;
return m.get(key);
}
- else if(coll instanceof IPersistentSet) {
- IPersistentSet set = (IPersistentSet) coll;
+ else if(coll instanceof ISet) {
+ ISet set = (ISet) coll;
return set.get(key);
}
else if(key instanceof Number && (coll instanceof String || coll.getClass().isArray())) {
@@ -671,8 +671,8 @@ static Object getFrom(Object coll, Object key, Object notFound){
return m.get(key);
return notFound;
}
- else if(coll instanceof IPersistentSet) {
- IPersistentSet set = (IPersistentSet) coll;
+ else if(coll instanceof ISet) {
+ ISet set = (ISet) coll;
if(set.contains(key))
return set.get(key);
return notFound;
@@ -694,10 +694,10 @@ static public Associative assoc(Object coll, Object key, Object val){
static public Object contains(Object coll, Object key){
if(coll == null)
return F;
- else if(coll instanceof Associative)
- return ((Associative) coll).containsKey(key) ? T : F;
- else if(coll instanceof IPersistentSet)
- return ((IPersistentSet) coll).contains(key) ? T : F;
+ else if(coll instanceof IAssociative)
+ return ((IAssociative) coll).containsKey(key) ? T : F;
+ else if(coll instanceof ISet)
+ return ((ISet) coll).contains(key) ? T : F;
else if(coll instanceof Map) {
Map m = (Map) coll;
return m.containsKey(key) ? T : F;
diff --git a/test/clojure/test_clojure/transients.clj b/test/clojure/test_clojure/transients.clj
index 721dcf2..87e577c 100644
--- a/test/clojure/test_clojure/transients.clj
+++ b/test/clojure/test_clojure/transients.clj
@@ -31,3 +31,16 @@
(deftest empty-transient
(is (= false (.contains (transient #{}) :bogus-key))))
+
+(deftest contains-on-transients
+ (are [x y] (contains? (transient x) y)
+ {:x "y"} :x
+ (hash-map :x "y") :x
+ [1 2 3] 0
+ #{:x} :x))
+
+(deftest keyword-access-on-transient-sets
+ (is (= (:x (transient #{:x})) :x)))
+
+(deftest get-access-on-transient-sets
+ (is (= (get (transient #{:x}) :x) :x)))
--
1.7.9.2