You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pylucene-commits@lucene.apache.org by va...@apache.org on 2014/07/07 14:56:16 UTC
svn commit: r1608440 - in /lucene/pylucene/trunk/jcc/jcc/sources: JArray.h
functions.cpp
Author: vajda
Date: Mon Jul 7 12:56:16 2014
New Revision: 1608440
URL: http://svn.apache.org/r1608440
Log:
cleanups in ... support
Modified:
lucene/pylucene/trunk/jcc/jcc/sources/JArray.h
lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp
Modified: lucene/pylucene/trunk/jcc/jcc/sources/JArray.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/JArray.h?rev=1608440&r1=1608439&r2=1608440&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/JArray.h (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/JArray.h Mon Jul 7 12:56:16 2014
@@ -24,7 +24,7 @@ typedef int Py_ssize_t;
#endif
extern jobjectArray fromPySequence(jclass cls, PyObject *sequence);
-extern jobjectArray fromPySequence(jclass cls, PyObject **sequence, int length);
+extern jobjectArray fromPySequence(jclass cls, PyObject **args, int length);
extern PyObject *PyErr_SetJavaError();
extern PyTypeObject *PY_TYPE(JArrayObject);
@@ -68,7 +68,7 @@ public:
length = this$ ? env->getArrayLength((jobjectArray) this$) : 0;
}
- JArray<T>(jclass cls, PyObject **sequence, int length) : java::lang::Object(fromPySequence(cls, sequence, length)) {
+ JArray<T>(jclass cls, PyObject **args, int length) : java::lang::Object(fromPySequence(cls, args, length)) {
length = this$ ? env->getArrayLength((jobjectArray) this$) : 0;
}
@@ -127,7 +127,7 @@ template<> class JArray<jobject> : publi
length = this$ ? env->getArrayLength((jobjectArray) this$) : 0;
}
- JArray<jobject>(jclass cls, PyObject **sequence, int length) : java::lang::Object(fromPySequence(cls, sequence, length)) {
+ JArray<jobject>(jclass cls, PyObject **args, int length) : java::lang::Object(fromPySequence(cls, args, length)) {
length = this$ ? env->getArrayLength((jobjectArray) this$) : 0;
}
@@ -421,12 +421,12 @@ template<> class JArray<jboolean> : publ
}
}
- JArray<jboolean>(PyObject **sequence, int length) : java::lang::Object(env->get_vm_env()->NewBooleanArray(length)) {
+ JArray<jboolean>(PyObject **args, int length) : java::lang::Object(env->get_vm_env()->NewBooleanArray(length)) {
arrayElements elts = elements();
jboolean *buf = (jboolean *) elts;
for (int i = 0; i < length; i++) {
- PyObject *obj = sequence[i];
+ PyObject *obj = args[i];
if (!obj)
break;
@@ -595,12 +595,12 @@ template<> class JArray<jbyte> : public
}
}
- JArray<jbyte>(PyObject **sequence, int length) : java::lang::Object(env->get_vm_env()->NewByteArray(length)) {
+ JArray<jbyte>(PyObject **args, int length) : java::lang::Object(env->get_vm_env()->NewByteArray(length)) {
arrayElements elts = elements();
jbyte *buf = (jbyte *) elts;
for (int i = 0; i < length; i++) {
- PyObject *obj = sequence[i];
+ PyObject *obj = args[i];
if (!obj)
break;
@@ -796,12 +796,12 @@ template<> class JArray<jchar> : public
}
}
- JArray<jchar>(PyObject **sequence, int length) : java::lang::Object(env->get_vm_env()->NewCharArray(length)) {
+ JArray<jchar>(PyObject **args, int length) : java::lang::Object(env->get_vm_env()->NewCharArray(length)) {
arrayElements elts = elements();
jchar *buf = (jchar *) elts;
for (int i = 0; i < length; i++) {
- PyObject *obj = sequence[i];
+ PyObject *obj = args[i];
if (!obj)
break;
@@ -990,12 +990,12 @@ template<> class JArray<jdouble> : publi
}
}
- JArray<jdouble>(PyObject **sequence, int length) : java::lang::Object(env->get_vm_env()->NewDoubleArray(length)) {
+ JArray<jdouble>(PyObject **args, int length) : java::lang::Object(env->get_vm_env()->NewDoubleArray(length)) {
arrayElements elts = elements();
jdouble *buf = (jdouble *) elts;
for (int i = 0; i < length; i++) {
- PyObject *obj = sequence[i];
+ PyObject *obj = args[i];
if (!obj)
break;
@@ -1157,12 +1157,12 @@ template<> class JArray<jfloat> : public
}
}
- JArray<jfloat>(PyObject **sequence, int length) : java::lang::Object(env->get_vm_env()->NewFloatArray(length)) {
+ JArray<jfloat>(PyObject **args, int length) : java::lang::Object(env->get_vm_env()->NewFloatArray(length)) {
arrayElements elts = elements();
jfloat *buf = (jfloat *) elts;
for (int i = 0; i < length; i++) {
- PyObject *obj = sequence[i];
+ PyObject *obj = args[i];
if (!obj)
break;
@@ -1324,12 +1324,12 @@ template<> class JArray<jint> : public j
}
}
- JArray<jint>(PyObject **sequence, int length) : java::lang::Object(env->get_vm_env()->NewIntArray(length)) {
+ JArray<jint>(PyObject **args, int length) : java::lang::Object(env->get_vm_env()->NewIntArray(length)) {
arrayElements elts = elements();
jint *buf = (jint *) elts;
for (int i = 0; i < length; i++) {
- PyObject *obj = sequence[i];
+ PyObject *obj = args[i];
if (!obj)
break;
@@ -1491,12 +1491,12 @@ template<> class JArray<jlong> : public
}
}
- JArray<jlong>(PyObject **sequence, int length) : java::lang::Object(env->get_vm_env()->NewLongArray(length)) {
+ JArray<jlong>(PyObject **args, int length) : java::lang::Object(env->get_vm_env()->NewLongArray(length)) {
arrayElements elts = elements();
jlong *buf = (jlong *) elts;
for (int i = 0; i < length; i++) {
- PyObject *obj = sequence[i];
+ PyObject *obj = args[i];
if (!obj)
break;
@@ -1658,12 +1658,12 @@ template<> class JArray<jshort> : public
}
}
- JArray<jshort>(PyObject **sequence, int length) : java::lang::Object(env->get_vm_env()->NewShortArray(length)) {
+ JArray<jshort>(PyObject **args, int length) : java::lang::Object(env->get_vm_env()->NewShortArray(length)) {
arrayElements elts = elements();
jshort *buf = (jshort *) elts;
for (int i = 0; i < length; i++) {
- PyObject *obj = sequence[i];
+ PyObject *obj = args[i];
if (!obj)
break;
Modified: lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp?rev=1608440&r1=1608439&r2=1608440&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp Mon Jul 7 12:56:16 2014
@@ -352,11 +352,11 @@ int _parseArgs(PyObject **args, unsigned
return -1;
}
- bool last = false;
- bool varargs = false;
- bool empty = false;
+ bool last = false; /* true if last expected parameter */
+ bool varargs = false; /* true if in varargs mode */
+ bool empty = false; /* true if in varargs mode and no params passed */
+ int array = 0; /* > 0 if expecting an array, its nesting level */
unsigned int pos = 0;
- int array = 0;
for (unsigned int a = 0; a < count; a++, pos++) {
PyObject *arg = args[a];
@@ -1563,7 +1563,7 @@ static bool setArrayObj(jobjectArray arr
else if (PyString_Check(obj) || PyUnicode_Check(obj))
{
jobj = env->fromPyString(obj);
- deleteLocal = 1;
+ deleteLocal = true;
}
else if (PyObject_TypeCheck(obj, &PY_TYPE(JObject)))
jobj = ((t_JObject *) obj)->object.this$;
@@ -1572,22 +1572,22 @@ static bool setArrayObj(jobjectArray arr
else if (obj == Py_True || obj == Py_False)
{
jobj = env->boxBoolean(obj == Py_True);
- deleteLocal = 1;
+ deleteLocal = true;
}
else if (PyFloat_Check(obj))
{
jobj = env->boxDouble(PyFloat_AS_DOUBLE(obj));
- deleteLocal = 1;
+ deleteLocal = true;
}
else if (PyInt_Check(obj))
{
jobj = env->boxInteger(PyInt_AS_LONG(obj));
- deleteLocal = 1;
+ deleteLocal = true;
}
else if (PyLong_Check(obj))
{
jobj = env->boxLong(PyLong_AsLongLong(obj));
- deleteLocal = 1;
+ deleteLocal = true;
}
else
{