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 2010/04/06 07:19:40 UTC
svn commit: r931022 - in /lucene/pylucene/trunk/jcc: CHANGES jcc/python.py
jcc/sources/functions.cpp
Author: vajda
Date: Tue Apr 6 05:19:39 2010
New Revision: 931022
URL: http://svn.apache.org/viewvc?rev=931022&view=rev
Log:
'O' not only for generics
Modified:
lucene/pylucene/trunk/jcc/CHANGES
lucene/pylucene/trunk/jcc/jcc/python.py
lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp
Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=931022&r1=931021&r2=931022&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Tue Apr 6 05:19:39 2010
@@ -11,7 +11,7 @@ Version 2.5 ->
- added support for of_() method to set instance type parameters
- fixed bug with not heeding type parameter for --sequence get method
- parameterized return values are now unboxed
- - improved auto-boxing of primitive type parameters into their class
+ - improved auto-boxing of primitive type parameters
-
Version 2.4 -> 2.5
Modified: lucene/pylucene/trunk/jcc/jcc/python.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/python.py?rev=931022&r1=931021&r2=931022&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/python.py (original)
+++ lucene/pylucene/trunk/jcc/jcc/python.py Tue Apr 6 05:19:39 2010
@@ -147,13 +147,13 @@ def parseArgs(params, current, generics,
if genericParams:
sig = ''.join([signature(param, genericParam)
for param, genericParam in izip(params, genericParams)])
- check = ''.join([checkarg(param, genericParam)
- for param, genericParam in izip(params, genericParams)])
+ chk = ''.join([checkarg(param, genericParam)
+ for param, genericParam in izip(params, genericParams)])
else:
sig = ''.join([signature(param) for param in params])
- check = ''.join([checkarg(param) for param in params])
+ chk = ''.join([checkarg(param) for param in params])
- return (sig, check,
+ return (sig, chk,
''.join([callarg(params[i], i) for i in xrange(len(params))]))
Modified: lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp?rev=931022&r1=931021&r2=931022&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp Tue Apr 6 05:19:39 2010
@@ -91,7 +91,6 @@ PyObject *findClass(PyObject *self, PyOb
Py_RETURN_NONE;
}
-#ifdef _java_generics
static boxfn get_boxfn(PyTypeObject *type)
{
static PyObject *boxfn_ = PyString_FromString("boxfn_");
@@ -106,7 +105,6 @@ static boxfn get_boxfn(PyTypeObject *typ
return fn;
}
-#endif
static int is_instance_of(PyObject *arg, PyTypeObject *type)
{
@@ -537,7 +535,6 @@ int _parseArgs(PyObject **args, unsigned
case 'o': /* java.lang.Object */
break;
-#ifdef _java_generics
case 'O': /* java.lang.Object with type param */
{
PyTypeObject *type = va_arg(list, PyTypeObject *);
@@ -551,7 +548,7 @@ int _parseArgs(PyObject **args, unsigned
}
break;
}
-#endif
+
case 'T': /* tuple of python types with wrapfn_ */
{
static PyObject *wrapfn_ = PyString_FromString("wrapfn_");
@@ -899,9 +896,7 @@ int _parseArgs(PyObject **args, unsigned
}
case 'o': /* java.lang.Object */
-#ifdef _java_generics
case 'O': /* java.lang.Object with type param */
-#endif
{
if (array)
{
@@ -919,7 +914,6 @@ int _parseArgs(PyObject **args, unsigned
{
Object *obj = va_arg(list, Object *);
-#ifdef _java_generics
if (types[pos] == 'O')
{
PyTypeObject *type = va_arg(check, PyTypeObject *);
@@ -934,7 +928,7 @@ int _parseArgs(PyObject **args, unsigned
break;
}
}
-#endif
+
if (boxObject(NULL, arg, obj) < 0)
return -1;
}