Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5832] trunk/jython/src/org/python/core
|
From: <fwi...@us...> - 2009-01-02 03:51:11
|
Revision: 5832
http://jython.svn.sourceforge.net/jython/?rev=5832&view=rev
Author: fwierzbicki
Date: 2009-01-02 03:51:08 +0000 (Fri, 02 Jan 2009)
Log Message:
-----------
__doc__ for long and enumerate
Modified Paths:
--------------
trunk/jython/src/org/python/core/PyEnumerate.java
trunk/jython/src/org/python/core/PyLong.java
Modified: trunk/jython/src/org/python/core/PyEnumerate.java
===================================================================
--- trunk/jython/src/org/python/core/PyEnumerate.java 2009-01-02 03:27:32 UTC (rev 5831)
+++ trunk/jython/src/org/python/core/PyEnumerate.java 2009-01-02 03:51:08 UTC (rev 5832)
@@ -37,12 +37,12 @@
return enumerate_next();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.enumerate_next_doc)
final PyObject enumerate_next() {
return doNext(enumerate___iternext__());
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.enumerate___iter___doc)
final PyObject enumerate___iter__() {
return super.__iter__();
}
Modified: trunk/jython/src/org/python/core/PyLong.java
===================================================================
--- trunk/jython/src/org/python/core/PyLong.java 2009-01-02 03:27:32 UTC (rev 5831)
+++ trunk/jython/src/org/python/core/PyLong.java 2009-01-02 03:51:08 UTC (rev 5832)
@@ -118,7 +118,7 @@
return long_toString();
}
- @ExposedMethod(names = {"__str__", "__repr__"})
+ @ExposedMethod(names = {"__str__", "__repr__"}, doc = BuiltinDocs.long___str___doc)
final String long_toString() {
return value.toString()+"L";
}
@@ -127,7 +127,7 @@
return long___hash__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___hash___doc)
final int long___hash__() {
return value.intValue();
}
@@ -136,7 +136,7 @@
return !value.equals(BigInteger.valueOf(0));
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___nonzero___doc)
public boolean long___nonzero__() {
return __nonzero__();
}
@@ -248,7 +248,7 @@
return long___cmp__(other);
}
- @ExposedMethod(type = MethodType.CMP)
+ @ExposedMethod(type = MethodType.CMP, doc = BuiltinDocs.long___cmp___doc)
final int long___cmp__(PyObject other) {
if (!canCoerce(other))
return -2;
@@ -259,7 +259,7 @@
return long___coerce_ex__(other);
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___coerce___doc)
final PyObject long___coerce__(PyObject other) {
return adaptToCoerceTuple(long___coerce_ex__(other));
}
@@ -297,7 +297,7 @@
return long___add__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___add___doc)
final PyObject long___add__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -308,7 +308,7 @@
return long___radd__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___radd___doc)
final PyObject long___radd__(PyObject left) {
return __add__(left);
}
@@ -317,7 +317,7 @@
return long___sub__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___sub___doc)
final PyObject long___sub__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -328,7 +328,7 @@
return long___rsub__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rsub___doc)
final PyObject long___rsub__(PyObject left) {
return Py.newLong(coerce(left).subtract(value));
}
@@ -337,7 +337,7 @@
return long___mul__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___mul___doc)
final PyObject long___mul__(PyObject right) {
if (right instanceof PySequence)
return ((PySequence) right).repeat(coerceInt(this));
@@ -351,7 +351,7 @@
return long___rmul__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rmul___doc)
final PyObject long___rmul__(PyObject left) {
if (left instanceof PySequence)
return ((PySequence) left).repeat(coerceInt(this));
@@ -382,7 +382,7 @@
return long___div__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___div___doc)
final PyObject long___div__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -395,7 +395,7 @@
return long___rdiv__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rdiv___doc)
final PyObject long___rdiv__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -408,7 +408,7 @@
return long___floordiv__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___floordiv___doc)
final PyObject long___floordiv__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -419,7 +419,7 @@
return long___rfloordiv__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rfloordiv___doc)
final PyObject long___rfloordiv__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -458,7 +458,7 @@
return long___truediv__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___truediv___doc)
final PyObject long___truediv__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -469,7 +469,7 @@
return long___rtruediv__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rtruediv___doc)
final PyObject long___rtruediv__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -484,7 +484,7 @@
return long___mod__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___mod___doc)
final PyObject long___mod__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -496,7 +496,7 @@
return long___rmod__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rmod___doc)
final PyObject long___rmod__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -508,7 +508,7 @@
return long___divmod__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___divmod___doc)
final PyObject long___divmod__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -522,7 +522,7 @@
return long___rdivmod__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rdivmod___doc)
final PyObject long___rdivmod__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -536,7 +536,7 @@
return long___pow__(right, modulo);
}
- @ExposedMethod(type = MethodType.BINARY, defaults = {"null"})
+ @ExposedMethod(type = MethodType.BINARY, defaults = {"null"}, doc = BuiltinDocs.long___pow___doc)
final PyObject long___pow__(PyObject right, PyObject modulo) {
if (!canCoerce(right))
return null;
@@ -550,7 +550,7 @@
return long___rpow__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rpow___doc)
final PyObject long___rpow__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -615,7 +615,7 @@
return long___lshift__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___lshift___doc)
final PyObject long___lshift__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -625,7 +625,7 @@
return Py.newLong(value.shiftLeft(rightv));
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rlshift___doc)
final PyObject long___rlshift__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -638,7 +638,7 @@
return long___rshift__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rshift___doc)
final PyObject long___rshift__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -648,7 +648,7 @@
return Py.newLong(value.shiftRight(rightv));
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rrshift___doc)
final PyObject long___rrshift__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -661,7 +661,7 @@
return long___and__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___and___doc)
final PyObject long___and__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -672,7 +672,7 @@
return long___rand__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rand___doc)
final PyObject long___rand__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -683,7 +683,7 @@
return long___xor__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___xor___doc)
final PyObject long___xor__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -694,7 +694,7 @@
return long___rxor__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___rxor___doc)
final PyObject long___rxor__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -705,7 +705,7 @@
return long___or__(right);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___or___doc)
final PyObject long___or__(PyObject right) {
if (!canCoerce(right))
return null;
@@ -716,7 +716,7 @@
return long___ror__(left);
}
- @ExposedMethod(type = MethodType.BINARY)
+ @ExposedMethod(type = MethodType.BINARY, doc = BuiltinDocs.long___ror___doc)
final PyObject long___ror__(PyObject left) {
if (!canCoerce(left))
return null;
@@ -727,7 +727,7 @@
return long___neg__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___neg___doc)
final PyObject long___neg__() {
return Py.newLong(value.negate());
}
@@ -736,7 +736,7 @@
return long___pos__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___pos___doc)
final PyObject long___pos__() {
return Py.newLong(value);
}
@@ -745,7 +745,7 @@
return long___abs__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___abs___doc)
final PyObject long___abs__() {
return Py.newLong(value.abs());
}
@@ -754,7 +754,7 @@
return long___invert__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___invert___doc)
final PyObject long___invert__() {
return Py.newLong(value.not());
}
@@ -763,7 +763,7 @@
return long___int__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___int___doc)
final PyObject long___int__() {
if (value.compareTo(PyInteger.maxInt) <= 0 && value.compareTo(PyInteger.minInt) >= 0) {
return Py.newInteger(value.intValue());
@@ -776,7 +776,7 @@
return long___long__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___long___doc)
final PyObject long___long__() {
return Py.newLong(value);
}
@@ -785,7 +785,7 @@
return long___float__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___float___doc)
final PyFloat long___float__() {
return new PyFloat(doubleValue());
}
@@ -802,7 +802,7 @@
return long___oct__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___oct___doc)
final PyString long___oct__() {
String s = value.toString(8);
if (s.startsWith("-"))
@@ -818,7 +818,7 @@
return long___hex__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___hex___doc)
final PyString long___hex__() {
String s = value.toString(16);
if (s.startsWith("-"))
@@ -835,7 +835,7 @@
return new PyUnicode(value.toString());
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___getnewargs___doc)
final PyTuple long___getnewargs__() {
return new PyTuple(new PyLong(this.getValue()));
}
@@ -849,7 +849,7 @@
return long___index__();
}
- @ExposedMethod
+ @ExposedMethod(doc = BuiltinDocs.long___index___doc)
final PyObject long___index__() {
return this;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
