Return-Path: X-Original-To: apmail-lucene-pylucene-commits-archive@minotaur.apache.org Delivered-To: apmail-lucene-pylucene-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A56557D5F for ; Mon, 18 Jul 2011 19:46:10 +0000 (UTC) Received: (qmail 66584 invoked by uid 500); 18 Jul 2011 19:46:10 -0000 Delivered-To: apmail-lucene-pylucene-commits-archive@lucene.apache.org Received: (qmail 66565 invoked by uid 500); 18 Jul 2011 19:46:10 -0000 Mailing-List: contact pylucene-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: pylucene-dev@lucene.apache.org Delivered-To: mailing list pylucene-commits@lucene.apache.org Received: (qmail 66556 invoked by uid 99); 18 Jul 2011 19:46:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jul 2011 19:46:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jul 2011 19:46:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5C4F22388980; Mon, 18 Jul 2011 19:45:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1148017 - in /lucene/pylucene/trunk/jcc: CHANGES jcc/cpp.py setup.py Date: Mon, 18 Jul 2011 19:45:40 -0000 To: pylucene-commits@lucene.apache.org From: vajda@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110718194541.5C4F22388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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"):