svn commit: r823979 - in /lucene/pylucene/trunk/jcc/jcc: cpp.py python.py sources/functions.cpp sources/jccfuncs.h

[va...@apache.org]

Author: vajda
Date: Sat Oct 10 23:27:58 2009
New Revision: 823979

URL: http://svn.apache.org/viewvc?rev=823979&view=rev
Log:
   - renamed _setExceptionTypes to _set_exception_types
   - renamed _set_initVM_self to _set_function_self

Modified:
    lucene/pylucene/trunk/jcc/jcc/cpp.py
    lucene/pylucene/trunk/jcc/jcc/python.py
    lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp
    lucene/pylucene/trunk/jcc/jcc/sources/jccfuncs.h

Modified: lucene/pylucene/trunk/jcc/jcc/cpp.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/cpp.py?rev=823979&r1=823978&r2=823979&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/cpp.py (original)
+++ lucene/pylucene/trunk/jcc/jcc/cpp.py Sat Oct 10 23:27:58 2009
@@ -62,7 +62,7 @@
     pass
 
 
-_jcc._setExceptionTypes(JavaError, InvalidArgsError)
+_jcc._set_exception_types(JavaError, InvalidArgsError)
 from _jcc import *
 
 

Modified: lucene/pylucene/trunk/jcc/jcc/python.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/python.py?rev=823979&r1=823978&r2=823979&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/python.py (original)
+++ lucene/pylucene/trunk/jcc/jcc/python.py Sat Oct 10 23:27:58 2009
@@ -1356,7 +1356,8 @@
     line(out, 0, 'class InvalidArgsError(Exception):')
     line(out, 1, 'pass')
     line(out)
-    line(out, 0, '%s._setExceptionTypes(JavaError, InvalidArgsError)', extname)
+    line(out, 0, '%s._set_exception_types(JavaError, InvalidArgsError)',
+         extname)
 
     if version:
         line(out)
@@ -1365,7 +1366,7 @@
     line(out, 0, 'CLASSPATH = [%s]' %(', '.join(['os.path.join(__dir__, "%s")' %(os.path.basename(jar)) for jar in jars])))
     line(out, 0, 'CLASSPATH = os.pathsep.join(CLASSPATH)')
     line(out, 0, '%s.CLASSPATH = CLASSPATH', extname)
-    line(out, 0, '%s._set_initVM_self(%s.initVM, %s)',
+    line(out, 0, '%s._set_function_self(%s.initVM, %s)',
          extname, extname, extname)
 
     line(out)

Modified: lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp?rev=823979&r1=823978&r2=823979&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp Sat Oct 10 23:27:58 2009
@@ -34,7 +34,7 @@
 PyObject *PyExc_JavaError = PyExc_ValueError;
 PyObject *PyExc_InvalidArgsError = PyExc_ValueError;
 
-PyObject *_setExceptionTypes(PyObject *self, PyObject *args)
+PyObject *_set_exception_types(PyObject *self, PyObject *args)
 {
     if (!PyArg_ParseTuple(args, "OO",
                           &PyExc_JavaError, &PyExc_InvalidArgsError))
@@ -43,24 +43,24 @@
     Py_RETURN_NONE;
 }
 
-PyObject *_set_initVM_self(PyObject *self, PyObject *args)
+PyObject *_set_function_self(PyObject *self, PyObject *args)
 {
-    PyObject *initVM, *module;
+    PyObject *object, *module;
 
-    if (!PyArg_ParseTuple(args, "OO", &initVM, &module))
+    if (!PyArg_ParseTuple(args, "OO", &object, &module))
         return NULL;
 
-    if (!PyCFunction_Check(initVM))
+    if (!PyCFunction_Check(object))
     {
-        PyErr_SetObject(PyExc_TypeError, initVM);
+        PyErr_SetObject(PyExc_TypeError, object);
         return NULL;
     }
 
-    PyCFunctionObject *fn = (PyCFunctionObject *) initVM;
+    PyCFunctionObject *cfn = (PyCFunctionObject *) object;
 
     Py_INCREF(module);
-    Py_XDECREF(fn->m_self);
-    fn->m_self = module;
+    Py_XDECREF(cfn->m_self);
+    cfn->m_self = module;
 
     Py_RETURN_NONE;
 }

Modified: lucene/pylucene/trunk/jcc/jcc/sources/jccfuncs.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/jccfuncs.h?rev=823979&r1=823978&r2=823979&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/jccfuncs.h (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/jccfuncs.h Sat Oct 10 23:27:58 2009
@@ -20,8 +20,8 @@
 PyObject *__initialize__(PyObject *module, PyObject *args, PyObject *kwds);
 PyObject *initVM(PyObject *self, PyObject *args, PyObject *kwds);
 PyObject *getVMEnv(PyObject *self);
-PyObject *_setExceptionTypes(PyObject *self, PyObject *args);
-PyObject *_set_initVM_self(PyObject *self, PyObject *args);
+PyObject *_set_exception_types(PyObject *self, PyObject *args);
+PyObject *_set_function_self(PyObject *self, PyObject *args);
 PyObject *findClass(PyObject *self, PyObject *args);
 PyObject *JArray_Type(PyObject *self, PyObject *arg);
 
@@ -32,9 +32,9 @@
       METH_NOARGS, NULL },
     { "findClass", (PyCFunction) findClass,
       METH_VARARGS, NULL },
-    { "_setExceptionTypes", (PyCFunction) _setExceptionTypes,
+    { "_set_exception_types", (PyCFunction) _set_exception_types,
       METH_VARARGS, NULL },
-    { "_set_initVM_self", (PyCFunction) _set_initVM_self,
+    { "_set_function_self", (PyCFunction) _set_function_self,
       METH_VARARGS, NULL },
     { "JArray", (PyCFunction) JArray_Type,
       METH_O, NULL },