You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2009/04/06 19:23:49 UTC

svn commit: r762425 - in /lucene/pylucene/branches/pylucene_2_4/jcc: CHANGES jcc/cpp.py jcc/sources/functions.cpp jcc/sources/functions.h jcc/sources/types.cpp

Author: vajda
Date: Mon Apr  6 17:23:49 2009
New Revision: 762425

URL: http://svn.apache.org/viewvc?rev=762425&view=rev
Log:
merged trunk revs 762423 and 762424

Modified:
    lucene/pylucene/branches/pylucene_2_4/jcc/CHANGES
    lucene/pylucene/branches/pylucene_2_4/jcc/jcc/cpp.py
    lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/functions.cpp
    lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/functions.h
    lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/types.cpp

Modified: lucene/pylucene/branches/pylucene_2_4/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_2_4/jcc/CHANGES?rev=762425&r1=762424&r2=762425&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_2_4/jcc/CHANGES (original)
+++ lucene/pylucene/branches/pylucene_2_4/jcc/CHANGES Mon Apr  6 17:23:49 2009
@@ -1,4 +1,10 @@
 
+Version 2.2 ->
+------------------
+ - fixed Solaris compilation issue with using va_arg() with function pointers
+ - added --reserved command line arg to extend list of words to mangle
+ - 
+
 Version 2.1 -> 2.2
 ------------------
  - JCC now a subproject of the Apache PyLucene project

Modified: lucene/pylucene/branches/pylucene_2_4/jcc/jcc/cpp.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_2_4/jcc/jcc/cpp.py?rev=762425&r1=762424&r2=762425&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_2_4/jcc/jcc/cpp.py (original)
+++ lucene/pylucene/branches/pylucene_2_4/jcc/jcc/cpp.py Mon Apr  6 17:23:49 2009
@@ -343,6 +343,9 @@
             elif arg == '--compiler':
                 i += 1
                 compiler = args[i]
+            elif arg == '--reserved':
+                i += 1
+                RESERVED.update(args[i].split(','))
             else:
                 raise ValueError, "Invalid argument: %s" %(arg)
         else:

Modified: lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/functions.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/functions.cpp?rev=762425&r1=762424&r2=762425&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/functions.cpp (original)
+++ lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/functions.cpp Mon Apr  6 17:23:49 2009
@@ -151,7 +151,7 @@
                   break;
                 case 'k':
                   try {
-                      jclass (*initializeClass)() = va_arg(list, jclass (*)());
+                      getclassfn initializeClass = va_arg(list, getclassfn);
                       cls = (*initializeClass)();
                   } catch (JCCEnv::pythonError e) {
                       return -1;
@@ -497,7 +497,7 @@
                   cls = (jclass) va_arg(check, Class *)->this$;
                   break;
                 case 'k':
-                  jclass (*initializeClass)() = va_arg(check, jclass (*)());
+                  getclassfn initializeClass = va_arg(check, getclassfn);
                   cls = (*initializeClass)();
               }
 
@@ -1034,7 +1034,7 @@
     return value;
 }
 
-PyObject *castCheck(PyObject *obj, jclass (*initializeClass)(),
+PyObject *castCheck(PyObject *obj, getclassfn initializeClass,
                     int reportError)
 {
     if (PyObject_TypeCheck(obj, &FinalizerProxy$$Type))

Modified: lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/functions.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/functions.h?rev=762425&r1=762424&r2=762425&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/functions.h (original)
+++ lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/functions.h Mon Apr  6 17:23:49 2009
@@ -30,6 +30,8 @@
 typedef intintobjargproc ssizessizeobjargproc;
 #endif
 
+typedef jclass (*getclassfn)(void);
+
 PyObject *PyErr_SetArgsError(char *name, PyObject *args);
 PyObject *PyErr_SetArgsError(PyObject *self, char *name, PyObject *args);
 PyObject *PyErr_SetArgsError(PyTypeObject *type, char *name, PyObject *args);
@@ -72,7 +74,7 @@
 java::lang::String p2j(PyObject *object);
 
 PyObject *make_descriptor(PyTypeObject *value);
-PyObject *make_descriptor(jclass (*initializeClass)(void));
+PyObject *make_descriptor(getclassfn initializeClass);
 PyObject *make_descriptor(PyObject *value);
 PyObject *make_descriptor(PyObject *(*wrapfn)(const jobject &));
 PyObject *make_descriptor(jboolean value);
@@ -167,7 +169,7 @@
 PyObject *get_extension_nextElement(PyObject *self);
 
 jobjectArray fromPySequence(jclass cls, PyObject *sequence);
-PyObject *castCheck(PyObject *obj, jclass (*initializeClass)(),
+PyObject *castCheck(PyObject *obj, getclassfn initializeClass,
                     int reportError);
 
 extern PyTypeObject FinalizerClass$$Type;

Modified: lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/types.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/types.cpp?rev=762425&r1=762424&r2=762425&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/types.cpp (original)
+++ lucene/pylucene/branches/pylucene_2_4/jcc/jcc/sources/types.cpp Mon Apr  6 17:23:49 2009
@@ -290,7 +290,7 @@
     int flags;
     union {
         PyObject *value;
-        jclass (*initializeClass)(void);
+        getclassfn initializeClass;
     } access;
 };
     
@@ -373,7 +373,7 @@
     return (PyObject *) self;
 }
 
-PyObject *make_descriptor(jclass (*initializeClass)(void))
+PyObject *make_descriptor(getclassfn initializeClass)
 {
     t_descriptor *self = (t_descriptor *)
         ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);