Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5147] branches/asm/src/org/python/core
|
From: <pj...@us...> - 2008-08-11 06:59:31
|
Revision: 5147
http://jython.svn.sourceforge.net/jython/?rev=5147&view=rev
Author: pjenvey
Date: 2008-08-11 06:59:28 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
o change PySlice.indices to work like CPython's PySlice_GetIndicesEx (include a
slicelength value)
o reject PySequence slice assignments with a step and mismatching slicelengths
Modified Paths:
--------------
branches/asm/src/org/python/core/PySequence.java
branches/asm/src/org/python/core/PySlice.java
Modified: branches/asm/src/org/python/core/PySequence.java
===================================================================
--- branches/asm/src/org/python/core/PySequence.java 2008-08-11 05:52:43 UTC (rev 5146)
+++ branches/asm/src/org/python/core/PySequence.java 2008-08-11 06:59:28 UTC (rev 5147)
@@ -327,8 +327,8 @@
}
final synchronized PyObject seq___getslice__(PyObject start, PyObject stop, PyObject step) {
- int[] slice = new PySlice(start, stop, step).indices(__len__());
- return getslice(slice[0], slice[1], slice[2]);
+ int[] indices = new PySlice(start, stop, step).indicesEx(__len__());
+ return getslice(indices[0], indices[1], indices[2]);
}
public synchronized void __setslice__(PyObject start,
@@ -346,8 +346,13 @@
PyObject stop,
PyObject step,
PyObject value) {
- int[] slice = new PySlice(start, stop, step).indices(__len__());
- setslice(slice[0], slice[1], slice[2], value);
+ PySlice slice = new PySlice(start, stop, step);
+ int[] indices = slice.indicesEx(__len__());
+ 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]));
+ }
+ setslice(indices[0], indices[1], indices[2], value);
}
public synchronized void __delslice__(PyObject start, PyObject stop, PyObject step) {
@@ -355,8 +360,8 @@
}
final synchronized void seq___delslice__(PyObject start, PyObject stop, PyObject step) {
- int[] slice = new PySlice(start, stop, step).indices(__len__());
- delRange(slice[0], slice[1], slice[2]);
+ int[] indices = new PySlice(start, stop, step).indicesEx(__len__());
+ delRange(indices[0], indices[1], indices[2]);
}
public synchronized void __setitem__(int index, PyObject value) {
Modified: branches/asm/src/org/python/core/PySlice.java
===================================================================
--- branches/asm/src/org/python/core/PySlice.java 2008-08-11 05:52:43 UTC (rev 5146)
+++ branches/asm/src/org/python/core/PySlice.java 2008-08-11 06:59:28 UTC (rev 5147)
@@ -114,12 +114,9 @@
@ExposedMethod
public PyObject slice_indices(PyObject len) {
- int[] slice = indices(len.asIndex(Py.OverflowError));
- PyInteger[] pyInts = new PyInteger[slice.length];
- for(int i = 0; i < pyInts.length; i++) {
- pyInts[i] = Py.newInteger(slice[i]);
- }
- return new PyTuple(pyInts);
+ int[] indices = indicesEx(len.asIndex(Py.OverflowError));
+ return new PyTuple(Py.newInteger(indices[0]), Py.newInteger(indices[1]),
+ Py.newInteger(indices[2]));
}
public static int calculateSliceIndex(PyObject v) {
@@ -130,52 +127,66 @@
}
/**
- * Calculates the actual indices of a slice with this slice's start, stop
- * and step values for a sequence of length <code>len</code>.
+ * Calculates the actual indices of a slice with this slice's start, stop, step and
+ * slicelength values for a sequence of length <code>len</code>.
*
- * @return an array with the start at index 0, stop at index 1 and step and
- * index 2.
+ * @return an array with the start at index 0, stop at index 1, step at index 2 and
+ * slicelength at index 3
*/
- public int[] indices(int len) {
- int[] slice = new int[3];
+ public int[] indicesEx(int len) {
+ int start;
+ int stop;
+ int step;
+ int slicelength;
+
if (getStep() == Py.None) {
- slice[STEP] = 1;
+ step = 1;
} else {
- slice[STEP] = calculateSliceIndex(getStep());
- if (slice[STEP] == 0) {
+ step = calculateSliceIndex(getStep());
+ if (step == 0) {
throw Py.ValueError("slice step cannot be zero");
}
}
if (getStart() == Py.None) {
- slice[START] = slice[STEP] < 0 ? len - 1 : 0;
+ start = step < 0 ? len - 1 : 0;
} else {
- slice[START] = calculateSliceIndex(getStart());
- if(slice[START] < 0) {
- slice[START] += len;
+ start = calculateSliceIndex(getStart());
+ if (start < 0) {
+ start += len;
}
- if(slice[START] < 0) {
- slice[START] = slice[STEP] < 0 ? -1 : 0;
+ if (start < 0) {
+ start = step < 0 ? -1 : 0;
}
- if(slice[START] >= len) {
- slice[START] = slice[STEP] < 0 ? len - 1 : len;
+ if (start >= len) {
+ start = step < 0 ? len - 1 : len;
}
}
- if(getStop() == Py.None) {
- slice[STOP] = slice[STEP] < 0 ? -1 : len;
+
+ if (getStop() == Py.None) {
+ stop = step < 0 ? -1 : len;
} else {
- slice[STOP] = calculateSliceIndex(getStop());
- if(slice[STOP] < 0) {
- slice[STOP] += len;
+ stop = calculateSliceIndex(getStop());
+ if (stop < 0) {
+ stop += len;
}
- if(slice[STOP] < 0) {
- slice[STOP] = -1;
+ if (stop < 0) {
+ stop = -1;
}
- if(slice[STOP] > len) {
- slice[STOP] = len;
+ if (stop > len) {
+ stop = len;
}
}
- return slice;
+
+ if ((step < 0 && stop >= start) || (step > 0 && start >= stop)) {
+ slicelength = 0;
+ } else if (step < 0) {
+ slicelength = (stop - start + 1) / (step) + 1;
+ } else {
+ slicelength = (stop - start - 1) / (step) + 1;
+ }
+
+ return new int[] {start, stop, step, slicelength};
}
/**
@@ -211,8 +222,6 @@
return indices;
}
- private static final int START = 0, STOP = 1, STEP = 2;
-
@ExposedGet
public PyObject start = Py.None;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
