Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5829] trunk/jython/src/org/python/core
|
From: <fwi...@us...> - 2009-01-01 22:18:16
|
Revision: 5829
http://jython.svn.sourceforge.net/jython/?rev=5829&view=rev
Author: fwierzbicki
Date: 2009-01-01 21:52:35 +0000 (Thu, 01 Jan 2009)
Log Message:
-----------
Some __doc__ for super, slice, and list.
Modified Paths:
--------------
trunk/jython/src/org/python/core/PyList.java
trunk/jython/src/org/python/core/PySlice.java
trunk/jython/src/org/python/core/PySuper.java
Modified: trunk/jython/src/org/python/core/PyList.java
===================================================================
--- trunk/jython/src/org/python/core/PyList.java 2009-01-01 01:13:50 UTC (rev 5828)
+++ trunk/jython/src/org/python/core/PyList.java 2009-01-01 21:52:35 UTC (rev 5829)
@@ -62,7 +62,7 @@
}
@ExposedNew
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list___init___doc)
final void list___init__(PyObject[] args, String[] kwds) {
ArgParser ap = new ArgParser("list", args, kwds, new String[] {"sequence"}, 0);
PyObject seq = ap.getPyObject(0, null);
@@ -84,7 +84,7 @@
return list___len__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list___len___doc)
final int list___len__() {
return size();
}
@@ -206,32 +206,32 @@
return new PyList(newArray);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.list___ne___doc)
final PyObject list___ne__(PyObject o) {
return seq___ne__(o);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.list___eq___doc)
final PyObject list___eq__(PyObject o) {
return seq___eq__(o);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.list___lt___doc)
final PyObject list___lt__(PyObject o) {
return seq___lt__(o);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.list___le___doc)
final PyObject list___le__(PyObject o) {
return seq___le__(o);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.list___gt___doc)
final PyObject list___gt__(PyObject o) {
return seq___gt__(o);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.list___ge___doc)
final PyObject list___ge__(PyObject o) {
return seq___ge__(o);
}
@@ -240,7 +240,7 @@
return list___imul__(o);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.list___imul___doc)
final PyObject list___imul__(PyObject o) {
if (!o.isIndex()) {
return null;
@@ -276,7 +276,7 @@
return list___mul__(o);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.list___mul___doc)
final PyObject list___mul__(PyObject o) {
if (!o.isIndex()) {
return null;
@@ -289,7 +289,7 @@
return list___rmul__(o);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.list___rmul___doc)
final PyObject list___rmul__(PyObject o) {
if (!o.isIndex()) {
return null;
@@ -301,7 +301,7 @@
return list___add__(o);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.list___add___doc)
final PyObject list___add__(PyObject o) {
PyList sum = null;
if(o instanceof PyList) {
@@ -331,6 +331,7 @@
return list___radd__(o);
}
+ //XXX: needs __doc__
@ExposedMethod(type = MethodType.BINARY)
final PyObject list___radd__(PyObject o) {
// Support adding java.util.List, but prevent adding PyTuple.
@@ -348,22 +349,22 @@
return sum;
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list___contains___doc)
final boolean list___contains__(PyObject o) {
return object___contains__(o);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list___delitem___doc)
final void list___delitem__(PyObject index) {
seq___delitem__(index);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list___setitem___doc)
final void list___setitem__(PyObject o, PyObject def) {
seq___setitem__(o, def);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list___getitem___doc)
final PyObject list___getitem__(PyObject o) {
PyObject ret = seq___finditem__(o);
if(ret == null) {
@@ -376,22 +377,22 @@
return list___iter__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list___iter___doc)
public PyObject list___iter__() {
return new PyFastSequenceIter(this);
}
- @ExposedMethod(defaults = "null")
+ @ExposedMethod(defaults = "null", doc = BuiltinDocs.list___getslice___doc)
final PyObject list___getslice__(PyObject start, PyObject stop, PyObject step) {
return seq___getslice__(start, stop, step);
}
- @ExposedMethod(defaults = "null")
+ @ExposedMethod(defaults = "null", doc = BuiltinDocs.list___setslice___doc)
final void list___setslice__(PyObject start, PyObject stop, PyObject step, PyObject value) {
seq___setslice__(start, stop, step, value);
}
- @ExposedMethod(defaults = "null")
+ @ExposedMethod(defaults = "null", doc = BuiltinDocs.list___delslice___doc)
final void list___delslice__(PyObject start, PyObject stop, PyObject step) {
seq___delslice__(start, stop, step);
}
@@ -407,6 +408,7 @@
return list_toString();
}
+ //XXX: needs __doc__
@ExposedMethod(names = "__repr__")
final String list_toString() {
ThreadState ts = Py.getThreadState();
@@ -438,7 +440,7 @@
list_append(o);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list_append_doc)
final void list_append(PyObject o) {
pyadd(o);
gListAllocatedStatus = __len__();
@@ -454,7 +456,7 @@
return list_count(o);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list_count_doc)
final int list_count(PyObject o) {
int count = 0;
PyObject[] array = getArray();
@@ -484,7 +486,7 @@
return list_index(o, start, stop);
}
- @ExposedMethod(defaults = {"null", "null"})
+ @ExposedMethod(defaults = {"null", "null"}, doc = BuiltinDocs.list_index_doc)
final int list_index(PyObject o, PyObject start, PyObject stop) {
int startInt = start == null ? 0 : PySlice.calculateSliceIndex(start);
int stopInt = stop == null ? size() : PySlice.calculateSliceIndex(stop);
@@ -529,7 +531,7 @@
list_insert(index, o);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list_insert_doc)
final void list_insert(int index, PyObject o) {
if(index < 0) {
index = Math.max(0, size() + index);
@@ -553,7 +555,7 @@
list_remove(o);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list_remove_doc)
final void list_remove(PyObject o) {
del(_index(o, "list.remove(x): x not in list", 0, size()));
gListAllocatedStatus = __len__();
@@ -568,7 +570,7 @@
list_reverse();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list_reverse_doc)
final void list_reverse() {
PyObject tmp;
int n = size();
@@ -599,7 +601,7 @@
return list_pop(n);
}
- @ExposedMethod(defaults = "-1")
+ @ExposedMethod(defaults = "-1", doc = BuiltinDocs.list_pop_doc)
final PyObject list_pop(int n) {
int length = size();
if(length == 0) {
@@ -627,7 +629,7 @@
list_extend(o);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list_extend_doc)
final void list_extend(PyObject o) {
int length = size();
setslice(length, length, 1, o);
@@ -638,7 +640,7 @@
return list___iadd__(o);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.list___iadd___doc)
final PyObject list___iadd__(PyObject o) {
PyType oType = o.getType();
if (oType == TYPE || oType == PyTuple.TYPE || this == o) {
@@ -677,7 +679,7 @@
*/
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list_sort_doc)
final void list_sort(PyObject[] args, String[] kwds) {
ArgParser ap = new ArgParser("list", args, kwds, new String[]{"cmp", "key", "reverse"}, 0);
PyObject cmp = ap.getPyObject(0, Py.None);
@@ -703,7 +705,7 @@
return list___hash__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.list___hash___doc)
final int list___hash__() {
throw Py.TypeError(String.format("unhashable type: '%.200s'", getType().fastGetName()));
}
Modified: trunk/jython/src/org/python/core/PySlice.java
===================================================================
--- trunk/jython/src/org/python/core/PySlice.java 2009-01-01 01:13:50 UTC (rev 5828)
+++ trunk/jython/src/org/python/core/PySlice.java 2009-01-01 21:52:35 UTC (rev 5829)
@@ -69,7 +69,7 @@
return slice___hash__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.slice___hash___doc)
final int slice___hash__() {
throw Py.TypeError(String.format("unhashable type: '%.200s'", getType().fastGetName()));
}
@@ -111,7 +111,7 @@
return slice_indices(len);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.slice_indices_doc)
final PyObject slice_indices(PyObject len) {
int[] indices = indicesEx(len.asIndex(Py.OverflowError));
return new PyTuple(Py.newInteger(indices[0]), Py.newInteger(indices[1]),
Modified: trunk/jython/src/org/python/core/PySuper.java
===================================================================
--- trunk/jython/src/org/python/core/PySuper.java 2009-01-01 01:13:50 UTC (rev 5828)
+++ trunk/jython/src/org/python/core/PySuper.java 2009-01-01 21:52:35 UTC (rev 5829)
@@ -110,7 +110,7 @@
return super.__findattr_ex__(name);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.super___getattribute___doc)
final PyObject super___getattribute__(PyObject name) {
PyObject ret = super___findattr_ex__(asName(name));
if (ret == null) {
@@ -123,7 +123,7 @@
return super___get__(obj, type);
}
- @ExposedMethod(defaults = "null")
+ @ExposedMethod(defaults = "null", doc = BuiltinDocs.super___get___doc)
final PyObject super___get__(PyObject obj, PyObject type) {
if (obj == null || obj == Py.None || this.obj != null) {
return this;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
