Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[6227] branches/newlist/src/org/python/core
|
From: <zy...@us...> - 2009-04-15 05:59:10
|
Revision: 6227
http://jython.svn.sourceforge.net/jython/?rev=6227&view=rev
Author: zyasoft
Date: 2009-04-15 05:58:59 +0000 (Wed, 15 Apr 2009)
Log Message:
-----------
Reverted to r6222
Modified Paths:
--------------
branches/newlist/src/org/python/core/AstList.java
branches/newlist/src/org/python/core/PyArray.java
branches/newlist/src/org/python/core/PyJavaType.java
branches/newlist/src/org/python/core/PyList.java
branches/newlist/src/org/python/core/PySequence.java
branches/newlist/src/org/python/core/SequenceIndexDelegate.java
Modified: branches/newlist/src/org/python/core/AstList.java
===================================================================
--- branches/newlist/src/org/python/core/AstList.java 2009-04-14 23:00:40 UTC (rev 6226)
+++ branches/newlist/src/org/python/core/AstList.java 2009-04-15 05:58:59 UTC (rev 6227)
@@ -361,7 +361,7 @@
@ExposedMethod
final void astlist_extend(PyObject iterable){
int length = size();
- setslice(length, length, 1, iterable,-1,-1);
+ setslice(length, length, 1, iterable);
}
public void extend(PyObject iterable) {
@@ -454,7 +454,7 @@
return new AstList(newList);
}
- protected void setslice(int start, int stop, int step, PyObject value,int sliceLength,int valueLength) {
+ protected void setslice(int start, int stop, int step, PyObject value) {
if(stop < start) {
stop = start;
}
Modified: branches/newlist/src/org/python/core/PyArray.java
===================================================================
--- branches/newlist/src/org/python/core/PyArray.java 2009-04-14 23:00:40 UTC (rev 6226)
+++ branches/newlist/src/org/python/core/PyArray.java 2009-04-15 05:58:59 UTC (rev 6227)
@@ -1528,7 +1528,7 @@
* @param step
* stepping increment of the slice
*/
- protected void setslice(int start, int stop, int step, PyObject value,int sliceLength,int valueLength) {
+ protected void setslice(int start, int stop, int step, PyObject value) {
if (stop < start) {
stop = start;
}
Modified: branches/newlist/src/org/python/core/PyJavaType.java
===================================================================
--- branches/newlist/src/org/python/core/PyJavaType.java 2009-04-14 23:00:40 UTC (rev 6226)
+++ branches/newlist/src/org/python/core/PyJavaType.java 2009-04-15 05:58:59 UTC (rev 6227)
@@ -877,7 +877,7 @@
}
@Override
- public void setSlice(int start, int stop, int step, PyObject value, int sliceLength,int valueLength) {
+ public void setSlice(int start, int stop, int step, PyObject value) {
if (stop < start) {
stop = start;
}
Modified: branches/newlist/src/org/python/core/PyList.java
===================================================================
--- branches/newlist/src/org/python/core/PyList.java 2009-04-14 23:00:40 UTC (rev 6226)
+++ branches/newlist/src/org/python/core/PyList.java 2009-04-15 05:58:59 UTC (rev 6227)
@@ -20,7 +20,7 @@
public class PyList extends PySequenceList implements List {
public static final PyType TYPE = PyType.fromClass(PyList.class);
- protected List<PyObject> list;
+ protected final List<PyObject> list;
public PyList() {
this(TYPE);
@@ -126,76 +126,21 @@
}
@Override
- protected void setslice(int start, int stop, int step, PyObject value, int sliceLength, int valueLength) {
+ protected void setslice(int start, int stop, int step, PyObject value) {
if (stop < start) {
stop = start;
}
- int size = list.size();
-// System.err.println("start=" + start + ",stop=" + stop + ",step=" + step + ",sliceLength=" + sliceLength);
-
-
- // optimize copy into: x[:] = ...
- if (start == 0 && stop == size && step == 1) { // x[:] = ...
- Iterator<PyObject> src;
- if (value == this) {
- src = ((PyList) value).safeIterator();
- } else if (value instanceof PySequenceList) {
- src = ((PySequenceList) value).iterator();
- } else {
- src = value.asIterable().iterator();
+ if (value instanceof PySequence) {
+ if (value == this) { // copy
+ value = new PyList((PySequence) value);
}
- List<PyObject> copy = new ArrayList<PyObject>(valueLength > 0 ? valueLength : 4);
- if (src != null) {
- while (src.hasNext()) {
- copy.add(src.next());
- }
- }
- list = copy;
- return;
- }
-
- if (value instanceof PyObject) {
- Iterator<PyObject> src;
- if (value == this) {
- PyList valueList = (PyList) value;
- if (start == 0 && stop == 0 && step == -1) { // x[::-1] = x
- valueList.reverse();
- return;
- }
- src = ((PyList) value).safeIterator();
- } else if (value instanceof PySequenceList) {
- src = ((PySequenceList) value).iterator();
- } else if (value instanceof PySequence) {
- src = value.asIterable().iterator();
- } else {
- src = new PyList(value).iterator();
- }
-
- if (sliceLength != -1) {
- int srcRange = stop - start;
- int destRange = step * sliceLength;
-
-// System.err.println("start=" + start + ",stop=" + stop + ",step=" + step +
-// ",sliceLength=" + sliceLength + ",srcRange=" + srcRange + ",destRange=" + destRange);
-
- if ((destRange >= srcRange && srcRange > destRange - step)) {
- setsliceSimple(start, stop, step, src);
- return;
- }
- }
- if (stop == start && step < 0) {
- setsliceSimple(start, stop, step, src);
- } else {
- setsliceIterator(start, stop, src);
- }
-
- } // else if (value != null && !(value instanceof List)) {
- // //XXX: can we avoid copying here? Needed to pass test_userlist
- // value = new PyList(value);
- // setsliceIterator(start, stop, value.asIterable().iterator());
- // }
- else {
-// System.err.println("List");
+ setsliceIterator(start, stop, step, value.asIterable().iterator());
+ } else if (value != null && !(value instanceof List)) {
+ //XXX: can we avoid copying here? Needed to pass test_userlist
+ value = new PyList(value);
+ setsliceIterator(start, stop, step, value.asIterable().iterator());
+ } else {
+ System.err.println("List");
List valueList = (List) value.__tojava__(List.class);
if (valueList != null && valueList != Py.NoConversion) {
setsliceList(start, stop, step, valueList);
@@ -203,53 +148,40 @@
}
}
- private final Iterator<PyObject> safeIterator() {
- return new Iterator<PyObject>() {
-
- private int i = 0;
- private final PyObject elements[] = getArray();
-
- public boolean hasNext() {
- return (i < elements.length);
- }
-
- public PyObject next() {
- return elements[i++];
- }
-
- public void remove() {
- throw new UnsupportedOperationException("Immutable");
- }
- };
- }
-
- private final void setsliceSimple(int start, int stop, int step, Iterator<PyObject> src) {
- for (int i = start; src.hasNext(); i += step) {
- list.set(i, src.next());
+ protected void setsliceList(int start, int stop, int step, List value) {
+ int n = sliceLength(start, stop, step);
+ if (list instanceof ArrayList) {
+ ((ArrayList) list).ensureCapacity(start + n);
}
- }
-
- // XXX needs to follow below logic for setsliceIterator
- private final void setsliceList(int start, int stop, int step, List value) {
ListIterator src = value.listIterator();
for (int j = start; src.hasNext(); j += step) {
set(j, src.next());
}
}
-
- // XXX need to support prepending via ops like x[:0] = whatever;
- // note that step must equal 1 in this case
- private final void setsliceIterator(int start, int stop, Iterator<PyObject> iter) {
- List<PyObject> copy = new ArrayList<PyObject>();
- copy.addAll(this.list.subList(0, start));
- if (iter != null) {
- while (iter.hasNext()) {
- copy.add(iter.next());
+ protected void setsliceIterator(int start, int stop, int step, Iterator<PyObject> iter) {
+ if(step == 1) {
+ List<PyObject> copy = new ArrayList<PyObject>();
+ copy.addAll(this.list.subList(0, start));
+ if (iter != null) {
+ while (iter.hasNext()) {
+ copy.add(iter.next());
+ }
}
+ copy.addAll(this.list.subList(stop, this.list.size()));
+ this.list.clear();
+ this.list.addAll(copy);
+ } else {
+ int size = list.size();
+ for (int j = start; iter.hasNext(); j += step) {
+ PyObject item = iter.next();
+ if (j >= size) {
+ list.add(item);
+ } else {
+ list.set(j, item);
+ }
+ }
}
- copy.addAll(this.list.subList(stop, this.list.size()));
- this.list = copy;
}
@Override
@@ -854,7 +786,7 @@
public boolean equals(Object o) {
if (o instanceof PyList) {
return (((PyList) o).list.equals(list));
- } else if (o instanceof List) { // XXX copied from PyList, but...
+ } else if(o instanceof List) { // XXX copied from PyList, but...
return o.equals(this); // XXX shouldn't this compare using py2java?
}
return false;
@@ -865,6 +797,7 @@
return list.get(index).__tojava__(Object.class);
}
+ /** @deprecated */
@Override
public PyObject[] getArray() {
PyObject a[] = new PyObject[list.size()];
@@ -991,27 +924,6 @@
return fromList(newList);
}
- // NOTE: this attempt would seem faster, but the JVM is better optimized for
- // the ArrayList implementation in limited testing
- // keeping around for now...
-// protected PyObject getslice(int start, int stop, int step) {
-// if (step > 0 && stop < start) {
-// stop = start;
-// }
-// int n = sliceLength(start, stop, step);
-// PyObject elements[] = new PyObject[n];
-// if (step == 1) {
-// ListIterator<PyObject> iter = list.listIterator(start);
-// for (int i = 0; i < n; i++) {
-// elements[i] = iter.next();
-// }
-// } else {
-// for (int i = start, j = 0; j < n; i += step, j++) {
-// elements[j] = list.get(i);
-// }
-// }
-// return new PyList(elements);
-// }
@Override
public boolean remove(Object o) {
return list.remove(Py.java2py(o));
Modified: branches/newlist/src/org/python/core/PySequence.java
===================================================================
--- branches/newlist/src/org/python/core/PySequence.java 2009-04-14 23:00:40 UTC (rev 6226)
+++ branches/newlist/src/org/python/core/PySequence.java 2009-04-15 05:58:59 UTC (rev 6227)
@@ -67,7 +67,7 @@
/**
* Sets the given range of elements.
*/
- protected void setslice(int start, int stop, int step, PyObject value,int sliceLength,int valueLength) {
+ protected void setslice(int start, int stop, int step, PyObject value) {
throw Py.TypeError(String.format("'%s' object does not support item assignment",
getType().fastGetName()));
}
@@ -400,8 +400,8 @@
}
@Override
- public void setSlice(int start, int stop, int step, PyObject value, int sliceLength,int valueLength) {
- setslice(start, stop, step, value, sliceLength, valueLength);
+ public void setSlice(int start, int stop, int step, PyObject value) {
+ setslice(start, stop, step, value);
}
@Override
Modified: branches/newlist/src/org/python/core/SequenceIndexDelegate.java
===================================================================
--- branches/newlist/src/org/python/core/SequenceIndexDelegate.java 2009-04-14 23:00:40 UTC (rev 6226)
+++ branches/newlist/src/org/python/core/SequenceIndexDelegate.java 2009-04-15 05:58:59 UTC (rev 6227)
@@ -17,7 +17,7 @@
public abstract PyObject getSlice(int start, int stop, int step);
- public abstract void setSlice(int start, int stop, int step, PyObject value, int sliceLength, int valueLength);
+ public abstract void setSlice(int start, int stop, int step, PyObject value);
public abstract void delItems(int start, int stop);
@@ -35,29 +35,11 @@
public void checkIdxAndSetSlice(PySlice slice, PyObject value) {
int[] indices = slice.indicesEx(len());
- final int valueLength;
- if (slice.step != Py.None) {
- valueLength = value.__len__();
- if (valueLength != indices[3]) {
+ if ((slice.step != Py.None) && value.__len__() != indices[3]) {
throw Py.ValueError(String.format("attempt to assign sequence of size %d to extended "
+ "slice of size %d", value.__len__(), indices[3]));
- }
- } else {
- valueLength = -1;
}
-
- final int sliceLength;
- // this enables PyList to use a simpler implementation to avoid List.add for inserts
- if (slice.step == Py.None) {
- if (valueLength == indices[3]) {
- sliceLength = valueLength;
- } else {
- sliceLength = -1;
- }
- } else {
- sliceLength = valueLength;
- }
- setSlice(indices[0], indices[1], indices[2], value, sliceLength, valueLength);
+ setSlice(indices[0], indices[1], indices[2], value);
}
public void checkIdxAndSetItem(int idx, PyObject value) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
