lucene-pylucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject svn commit: r1148017 - in /lucene/pylucene/trunk/jcc: CHANGES jcc/cpp.py setup.py
Date Mon, 18 Jul 2011 19:45:40 GMT
Author: vajda
Date: Mon Jul 18 19:45:39 2011
New Revision: 1148017

URL: http://svn.apache.org/viewvc?rev=1148017&view=rev
Log:
 - fixed bug with Constructor.getGenericParameterTypes() losing first parameter
 - version 2.10

Modified:
    lucene/pylucene/trunk/jcc/CHANGES
    lucene/pylucene/trunk/jcc/jcc/cpp.py
    lucene/pylucene/trunk/jcc/setup.py

Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=1148017&r1=1148016&r2=1148017&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Mon Jul 18 19:45:39 2011
@@ -1,4 +1,8 @@
 
+Version 2.9 -> 2.10
+-------------------
+ - fixed bug with Constructor.getGenericParameterTypes() losing first parameter
+
 Version 2.8 -> 2.9
 ------------------
  - fixed bug with excluding inner classes only (Christian Heimes)

Modified: lucene/pylucene/trunk/jcc/jcc/cpp.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/cpp.py?rev=1148017&r1=1148016&r2=1148017&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/cpp.py (original)
+++ lucene/pylucene/trunk/jcc/jcc/cpp.py Mon Jul 18 19:45:39 2011
@@ -692,7 +692,15 @@ def header(env, out, cls, typeset, packa
     for constructor in cls.getDeclaredConstructors():
         if Modifier.isPublic(constructor.getModifiers()):
             if generics:
-                params = constructor.getGenericParameterTypes()
+                genericParams = constructor.getGenericParameterTypes()
+                params = constructor.getParameterTypes()
+                # It appears that the implicit instance-of-the-declaring-class
+                # parameter of a non-static inner class is missing from 
+                # getGenericParameterTypes()
+                if len(params) == len(genericParams) + 1:
+                    params[1:] = genericParams
+                else:
+                    params = genericParams
                 if len(params) == 1:
                     if params[0] == cls:
                         continue

Modified: lucene/pylucene/trunk/jcc/setup.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/setup.py?rev=1148017&r1=1148016&r2=1148017&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/setup.py (original)
+++ lucene/pylucene/trunk/jcc/setup.py Mon Jul 18 19:45:39 2011
@@ -12,7 +12,7 @@
 
 import os, sys, platform, subprocess
 
-jcc_ver = '2.9'
+jcc_ver = '2.10'
 machine = platform.machine()
 
 if machine.startswith("iPod") or machine.startswith("iPhone"):



Mime
View raw message