author | hannesw |
Sat, 02 Sep 2017 14:26:29 +0200 | |
changeset 47205 | 6ddad446ba23 |
parent 34732 | 6605efbe8447 |
permissions | -rw-r--r-- |
27525
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
1 |
package jdk.nashorn.internal.runtime.arrays; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
2 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
3 |
import java.util.Iterator; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
4 |
import java.util.List; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
5 |
import java.util.SortedMap; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
6 |
import java.util.TreeMap; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
7 |
import jdk.nashorn.internal.runtime.JSType; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
8 |
import jdk.nashorn.internal.runtime.ScriptRuntime; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
9 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
10 |
/** |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
11 |
* Filter to use for ArrayData where the length is not writable. |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
12 |
* The default behavior is just to ignore {@link ArrayData#setLength} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
13 |
*/ |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
14 |
final class LengthNotWritableFilter extends ArrayFilter { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
15 |
private final SortedMap<Long, Object> extraElements; //elements with index >= length |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
16 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
17 |
/** |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
18 |
* Constructor |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
19 |
* @param underlying array |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
20 |
*/ |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
21 |
LengthNotWritableFilter(final ArrayData underlying) { |
27526
1ed00adaaed0
8064705: Build breaking warning in LengthNotWritableFilter
lagergren
parents:
27525
diff
changeset
|
22 |
this(underlying, new TreeMap<Long, Object>()); |
27525
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
23 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
24 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
25 |
private LengthNotWritableFilter(final ArrayData underlying, final SortedMap<Long, Object> extraElements) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
26 |
super(underlying); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
27 |
this.extraElements = extraElements; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
28 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
29 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
30 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
31 |
public ArrayData copy() { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
32 |
return new LengthNotWritableFilter(underlying.copy(), new TreeMap<>(extraElements)); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
33 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
34 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
35 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
36 |
public boolean has(final int index) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
37 |
return super.has(index) || extraElements.containsKey((long)index); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
38 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
39 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
40 |
/** |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
41 |
* Set the length of the data array |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
42 |
* |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
43 |
* @param length the new length for the data array |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
44 |
*/ |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
45 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
46 |
public void setLength(final long length) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
47 |
//empty - setting length for a LengthNotWritableFilter is always a nop |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
48 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
49 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
50 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
51 |
public ArrayData ensure(final long index) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
52 |
return this; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
53 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
54 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
55 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
56 |
public ArrayData slice(final long from, final long to) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
57 |
//return array[from...to), or array[from...length] if undefined, in this case not as we are an ArrayData |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
58 |
return new LengthNotWritableFilter(underlying.slice(from, to), extraElements.subMap(from, to)); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
59 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
60 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
61 |
private boolean checkAdd(final long index, final Object value) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
62 |
if (index >= length()) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
63 |
extraElements.put(index, value); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
64 |
return true; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
65 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
66 |
return false; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
67 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
68 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
69 |
private Object get(final long index) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
70 |
final Object obj = extraElements.get(index); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
71 |
if (obj == null) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
72 |
return ScriptRuntime.UNDEFINED; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
73 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
74 |
return obj; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
75 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
76 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
77 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
78 |
public int getInt(final int index) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
79 |
if (index >= length()) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
80 |
return JSType.toInt32(get(index)); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
81 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
82 |
return underlying.getInt(index); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
83 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
84 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
85 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
86 |
public int getIntOptimistic(final int index, final int programPoint) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
87 |
if (index >= length()) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
88 |
return JSType.toInt32Optimistic(get(index), programPoint); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
89 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
90 |
return underlying.getIntOptimistic(index, programPoint); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
91 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
92 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
93 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
94 |
public double getDouble(final int index) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
95 |
if (index >= length()) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
96 |
return JSType.toNumber(get(index)); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
97 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
98 |
return underlying.getDouble(index); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
99 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
100 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
101 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
102 |
public double getDoubleOptimistic(final int index, final int programPoint) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
103 |
if (index >= length()) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
104 |
return JSType.toNumberOptimistic(get(index), programPoint); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
105 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
106 |
return underlying.getDoubleOptimistic(index, programPoint); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
107 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
108 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
109 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
110 |
public Object getObject(final int index) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
111 |
if (index >= length()) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
112 |
return get(index); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
113 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
114 |
return underlying.getObject(index); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
115 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
116 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
117 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
118 |
public ArrayData set(final int index, final Object value, final boolean strict) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
119 |
if (checkAdd(index, value)) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
120 |
return this; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
121 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
122 |
underlying = underlying.set(index, value, strict); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
123 |
return this; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
124 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
125 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
126 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
127 |
public ArrayData set(final int index, final int value, final boolean strict) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
128 |
if (checkAdd(index, value)) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
129 |
return this; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
130 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
131 |
underlying = underlying.set(index, value, strict); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
132 |
return this; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
133 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
134 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
135 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
136 |
public ArrayData set(final int index, final double value, final boolean strict) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
137 |
if (checkAdd(index, value)) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
138 |
return this; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
139 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
140 |
underlying = underlying.set(index, value, strict); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
141 |
return this; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
142 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
143 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
144 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
145 |
public ArrayData delete(final int index) { |
47205
6ddad446ba23
8169233: LengthNotWritableFilter extraElements.remove(index) has no effect
hannesw
parents:
34732
diff
changeset
|
146 |
extraElements.remove(ArrayIndex.toLongIndex(index)); |
27525
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
147 |
underlying = underlying.delete(index); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
148 |
return this; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
149 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
150 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
151 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
152 |
public ArrayData delete(final long fromIndex, final long toIndex) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
153 |
for (final Iterator<Long> iter = extraElements.keySet().iterator(); iter.hasNext();) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
154 |
final long next = iter.next(); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
155 |
if (next >= fromIndex && next <= toIndex) { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
156 |
iter.remove(); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
157 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
158 |
if (next > toIndex) { //ordering guaranteed because TreeSet |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
159 |
break; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
160 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
161 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
162 |
underlying = underlying.delete(fromIndex, toIndex); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
163 |
return this; |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
164 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
165 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
166 |
@Override |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
167 |
public Iterator<Long> indexIterator() { |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
168 |
final List<Long> keys = computeIteratorKeys(); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
169 |
keys.addAll(extraElements.keySet()); //even if they are outside length this is fine |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
170 |
return keys.iterator(); |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
171 |
} |
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
172 |
|
e7d3c00b9fb8
8035312: Various array and ScriptObject length issues for non writable length fields
lagergren
parents:
diff
changeset
|
173 |
} |