jyapayne/llvmpy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve error-handling for PyCapsule_GetPointer and related functions.

Browse source
This commit is contained in:
Siu Kwan Lam 2012-09-15 19:10:05 -07:00
commit 9767ac4d47
4 changed files with 17 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

13
llvm/_core.cpp
View file

@ -298,7 +298,6 @@ obj2arr(PyObject *self, PyObject *args, arrcnt_fn_t cntfunc, obj2arr_fn_t arrfun
/* get the function object ptr */ /* get the function object ptr */
const LLVMTypeRef type = get_object_arg<LLVMTypeRef>(args) ; const LLVMTypeRef type = get_object_arg<LLVMTypeRef>(args) ;
if (!type) return NULL;
/* get param count */ /* get param count */
param_count = cntfunc(type); param_count = cntfunc(type);
@ -400,7 +399,6 @@ _wLLVMValueGetUses(PyObject *self, PyObject *args)
{ {
_TRY _TRY
const LLVMValueRef value = get_object_arg<LLVMValueRef>(args) ; const LLVMValueRef value = get_object_arg<LLVMValueRef>(args) ;
if (!value) return NULL;
LLVMValueRef *uses = 0; LLVMValueRef *uses = 0;
size_t n = LLVMValueGetUses(value, &uses); size_t n = LLVMValueGetUses(value, &uses);
@ -648,7 +646,7 @@ _wLLVMGetNamedMetadataOperands(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "Os", &obj_module, &name)) if (!PyArg_ParseTuple(args, "Os", &obj_module, &name))
return NULL; return NULL;
LLVMModuleRef module = (LLVMModuleRef)PyCapsule_GetPointer(obj_module, NULL); LLVMModuleRef module = pycap_get<LLVMModuleRef>(obj_module);
unsigned num_operands = LLVMGetNamedMetadataNumOperands(module, name); unsigned num_operands = LLVMGetNamedMetadataNumOperands(module, name);
LLVMValueRef *operands = new LLVMValueRef[num_operands]; LLVMValueRef *operands = new LLVMValueRef[num_operands];
LLVMGetNamedMetadataOperands(module, name, operands); LLVMGetNamedMetadataOperands(module, name, operands);
@ -1145,7 +1143,6 @@ _wLLVMTargetDataAsString(PyObject *self, PyObject *args)
{ {
_TRY _TRY
const LLVMTargetDataRef td = get_object_arg<LLVMTargetDataRef>(args); const LLVMTargetDataRef td = get_object_arg<LLVMTargetDataRef>(args);
if (!td) return NULL;
char *tdrep = LLVMCopyStringRepOfTargetData(td); char *tdrep = LLVMCopyStringRepOfTargetData(td);
PyObject *ret = PyUnicode_FromString(tdrep); PyObject *ret = PyUnicode_FromString(tdrep);
@ -1195,8 +1192,6 @@ _wLLVMEngineBuilderCreate(PyObject *self, PyObject *args)
_TRY _TRY
const LLVMEngineBuilderRef obj const LLVMEngineBuilderRef obj
= get_object_arg<LLVMEngineBuilderRef>(args) ; = get_object_arg<LLVMEngineBuilderRef>(args) ;
if (!obj)
return NULL;
std::string outmsg; std::string outmsg;
const LLVMExecutionEngineRef ee = LLVMEngineBuilderCreate(obj, outmsg); const LLVMExecutionEngineRef ee = LLVMEngineBuilderCreate(obj, outmsg);
@ -1488,11 +1483,7 @@ static PyObject *
_wPyCObjectVoidPtrToPyLong(PyObject *self, PyObject *args) _wPyCObjectVoidPtrToPyLong(PyObject *self, PyObject *args)
{ {
_TRY _TRY
void *p; void *p = get_object_arg(args);
if (!(p = get_object_arg(args)))
return NULL;
return PyLong_FromVoidPtr(p); return PyLong_FromVoidPtr(p);
_CATCH_ALL _CATCH_ALL
} }

4
llvm/extra.cpp
View file

@ -320,10 +320,6 @@ unsigned char* LLVMTargetMachineEmitFile(LLVMTargetMachineRef tmref,
// and then into a new buffer // and then into a new buffer
size_t bclen = bc.size(); size_t bclen = bc.size();
unsigned char *bytes = new unsigned char[bclen]; unsigned char *bytes = new unsigned char[bclen];
if (!bytes){
error = "Out of memory";
return NULL;
}
memcpy(bytes, bc.data(), bclen); memcpy(bytes, bc.data(), bclen);
/* return */ /* return */

12
llvm/wrap.cpp
View file

@ -86,11 +86,9 @@ void *get_object_arg(PyObject *args)
PyObject *o; PyObject *o;
if (!PyArg_ParseTuple(args, "O", &o)) if (!PyArg_ParseTuple(args, "O", &o))
return NULL; throw py_exception();
void *ptr = PyCapsule_GetPointer(o, NULL); return pycap_get<void*>(o);
if ( !ptr ) return NULL;
else return ptr;
} }
// must delete [] returned array // must delete [] returned array
@ -104,9 +102,7 @@ void **make_array_from_list(PyObject *list, int n)
if ( e == Py_None ) { // is None object? if ( e == Py_None ) { // is None object?
arr[i] = NULL; arr[i] = NULL;
} else { // otherwise, it must be a PyCapsule } else { // otherwise, it must be a PyCapsule
void * ptr = PyCapsule_GetPointer(e, NULL); arr[i] = pycap_get<void*>(e);
if ( !ptr ) return NULL; // exception is raised
else arr[i] = ptr;
} }
} }
@ -120,7 +116,7 @@ PyObject *make_list_from_ ## TYPE ## _array( TYPE *p, size_t n) \
PyObject *list = PyList_New(n); \ PyObject *list = PyList_New(n); \
\ \
if (!list) \ if (!list) \
return NULL; \ throw py_exception(); \
\ \
for (i=0; i<n; i++) { \ for (i=0; i<n; i++) { \
PyObject *elem = ctor_ ## TYPE (p[i]); \ PyObject *elem = ctor_ ## TYPE (p[i]); \

107
llvm/wrap.h
View file

@ -61,13 +61,16 @@
#include <new> #include <new>
#define _CHECK_PYCAP(X) if( !(X) ) return NULL; class py_exception: public std::exception{};
#define _TRY \ #define _TRY \
try { try {
#define _CATCH_ALL \ #define _CATCH_ALL \
} catch (const std::bad_alloc&) { \ } catch (const std::bad_alloc&) { \
return PyErr_NoMemory(); \ return PyErr_NoMemory(); \
} catch (const py_exception &) { \
return NULL; \
} catch (const std::exception& e) { \ } catch (const std::exception& e) { \
PyErr_SetString(PyExc_RuntimeError, e.what()); \ PyErr_SetString(PyExc_RuntimeError, e.what()); \
return NULL; \ return NULL; \
@ -156,7 +159,9 @@ PyObject *make_list_from_LLVMValueRef_array(LLVMValueRef *p, size_t n);
template <typename LLTYPE> template <typename LLTYPE>
LLTYPE pycap_get( PyObject* obj ) LLTYPE pycap_get( PyObject* obj )
{ {
return static_cast<LLTYPE> ( PyCapsule_GetPointer(obj, NULL) ); LLTYPE p = static_cast<LLTYPE> ( PyCapsule_GetPointer(obj, NULL) );
if ( !p ) throw py_exception();
return p;
} }
template <typename LLTYPE> template <typename LLTYPE>
@ -209,10 +214,7 @@ static PyObject * \
_w ## func (PyObject *self, PyObject *args) \ _w ## func (PyObject *self, PyObject *args) \
{ \ { \
_TRY \ _TRY \
intype1 arg1; \ intype1 arg1 = get_object_arg<intype1>(args); \
\
if (!(arg1 = get_object_arg<intype1>(args))) \
return NULL; \
\ \
return ctor_ ## outtype ( func (arg1)); \ return ctor_ ## outtype ( func (arg1)); \
_CATCH_ALL \ _CATCH_ALL \
@ -251,11 +253,8 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
\ \
if ( !arg1 || !arg2 ) return NULL; \
return ctor_ ## outtype ( func (arg1, arg2)); \ return ctor_ ## outtype ( func (arg1, arg2)); \
_CATCH_ALL \ _CATCH_ALL \
} }
@ -275,9 +274,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
intype1 arg1 = pycap_get< intype1 > (obj1); \ intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
intype2 arg2 = pycap_get< intype2 > (obj2); \ intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
\ \
func (arg1, arg2); \ func (arg1, arg2); \
Py_RETURN_NONE; \ Py_RETURN_NONE; \
@ -300,7 +297,6 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
\ \
return ctor_ ## outtype ( func (arg1, arg2)); \ return ctor_ ## outtype ( func (arg1, arg2)); \
_CATCH_ALL \ _CATCH_ALL \
@ -321,11 +317,8 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3)); \
_CATCH_ALL \ _CATCH_ALL \
@ -346,11 +339,8 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
\ \
func (arg1, arg2, arg3); \ func (arg1, arg2, arg3); \
Py_RETURN_NONE; \ Py_RETURN_NONE; \
@ -373,9 +363,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3)); \
_CATCH_ALL \ _CATCH_ALL \
@ -397,9 +385,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3)); \
_CATCH_ALL \ _CATCH_ALL \
@ -465,10 +451,7 @@ static PyObject * \
_w ## func (PyObject *self, PyObject *args) \ _w ## func (PyObject *self, PyObject *args) \
{ \ { \
_TRY \ _TRY \
intype1 arg1; \ intype1 arg1 = get_object_arg<intype1>(args); \
\
if (!(arg1 = get_object_arg<intype1>(args))) \
return NULL; \
\ \
return PyUnicode_FromString( func (arg1)); \ return PyUnicode_FromString( func (arg1)); \
_CATCH_ALL \ _CATCH_ALL \
@ -483,10 +466,7 @@ static PyObject * \
_w ## func (PyObject *self, PyObject *args) \ _w ## func (PyObject *self, PyObject *args) \
{ \ { \
_TRY \ _TRY \
intype1 arg1; \ intype1 arg1 = get_object_arg<intype1>(args); \
\
if (!(arg1 = get_object_arg<intype1>(args))) \
return NULL; \
\ \
func (arg1); \ func (arg1); \
Py_RETURN_NONE; \ Py_RETURN_NONE; \
@ -509,7 +489,6 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
\ \
func (arg1, arg2); \ func (arg1, arg2); \
Py_RETURN_NONE; \ Py_RETURN_NONE; \
@ -532,7 +511,6 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
\ \
return ctor_ ## outtype ( func (arg1, arg2)); \ return ctor_ ## outtype ( func (arg1, arg2)); \
_CATCH_ALL \ _CATCH_ALL \
@ -554,7 +532,6 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
\ \
func (arg1, arg2); \ func (arg1, arg2); \
Py_RETURN_NONE; \ Py_RETURN_NONE; \
@ -577,7 +554,6 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
\ \
func (arg1, arg2); \ func (arg1, arg2); \
Py_RETURN_NONE; \ Py_RETURN_NONE; \
@ -600,9 +576,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3)); \
_CATCH_ALL \ _CATCH_ALL \
@ -624,9 +598,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3)) ; \ return ctor_ ## outtype ( func (arg1, arg2, arg3)) ; \
_CATCH_ALL \ _CATCH_ALL \
@ -648,9 +620,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3)) ; \ return ctor_ ## outtype ( func (arg1, arg2, arg3)) ; \
_CATCH_ALL \ _CATCH_ALL \
@ -672,7 +642,6 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
\ \
func (arg1, arg2, arg3); \ func (arg1, arg2, arg3); \
Py_RETURN_NONE; \ Py_RETURN_NONE; \
@ -718,9 +687,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3)); \
_CATCH_ALL \ _CATCH_ALL \
@ -742,9 +709,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
\ \
func(arg1, arg2, arg3); \ func(arg1, arg2, arg3); \
\ \
@ -770,9 +735,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4)) ; \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4)) ; \
_CATCH_ALL \ _CATCH_ALL \
@ -796,11 +759,8 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5)) ; \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5)) ; \
_CATCH_ALL \ _CATCH_ALL \
@ -822,11 +782,8 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4)); \
_CATCH_ALL \ _CATCH_ALL \
@ -849,9 +806,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4)); \
_CATCH_ALL \ _CATCH_ALL \
@ -877,9 +832,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5)); \
_CATCH_ALL \ _CATCH_ALL \
@ -902,7 +855,6 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3)); \
_CATCH_ALL \ _CATCH_ALL \
@ -926,11 +878,8 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5)); \
_CATCH_ALL \ _CATCH_ALL \
@ -957,11 +906,8 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5, arg6)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5, arg6)); \
_CATCH_ALL \ _CATCH_ALL \
@ -984,13 +930,9 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
const intype4 arg4 = pycap_get< intype4 > (obj4); \ const intype4 arg4 = pycap_get< intype4 > (obj4); \
_CHECK_PYCAP(arg4); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5, arg6)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5, arg6)); \
_CATCH_ALL \ _CATCH_ALL \
@ -1015,11 +957,8 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
const intype4 arg4 = pycap_get< intype4 > (obj4); \ const intype4 arg4 = pycap_get< intype4 > (obj4); \
_CHECK_PYCAP(arg4); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5, arg6)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5, arg6)); \
_CATCH_ALL \ _CATCH_ALL \
@ -1041,11 +980,8 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4)); \
_CATCH_ALL \ _CATCH_ALL \
@ -1066,13 +1002,9 @@ _w ## func (PyObject *self, PyObject *args)
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
const intype4 arg4 = pycap_get< intype4 > (obj4); \ const intype4 arg4 = pycap_get< intype4 > (obj4); \
_CHECK_PYCAP(arg4); \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4)); \
_CATCH_ALL \ _CATCH_ALL \
} }
@ -1093,13 +1025,9 @@ _w ## func (PyObject *self, PyObject *args)
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
const intype4 arg4 = pycap_get< intype4 > (obj4); \ const intype4 arg4 = pycap_get< intype4 > (obj4); \
_CHECK_PYCAP(arg4); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5)); \
_CATCH_ALL \ _CATCH_ALL \
@ -1122,11 +1050,8 @@ _w ## func (PyObject *self, PyObject *args)
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype3 arg3 = pycap_get< intype3 > (obj3); \ const intype3 arg3 = pycap_get< intype3 > (obj3); \
_CHECK_PYCAP(arg3); \
const intype4 arg4 = pycap_get< intype4 > (obj4); \ const intype4 arg4 = pycap_get< intype4 > (obj4); \
_CHECK_PYCAP(arg4); \
\ \
return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5)); \ return ctor_ ## outtype ( func (arg1, arg2, arg3, arg4, arg5)); \
_CATCH_ALL \ _CATCH_ALL \
@ -1223,7 +1148,6 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
intype1 arg1 = pycap_get< intype1 > (obj1); \ intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const size_t arg2n = PyList_Size(obj2); \ const size_t arg2n = PyList_Size(obj2); \
intype2 *arg2v = make_array_from_list< intype2 *>(obj2, arg2n); \ intype2 *arg2v = make_array_from_list< intype2 *>(obj2, arg2n); \
\ \
@ -1251,7 +1175,6 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const size_t arg2n = PyList_Size(obj2); \ const size_t arg2n = PyList_Size(obj2); \
intype2 *arg2v = make_array_from_list< intype2 *>(obj2, arg2n); \ intype2 *arg2v = make_array_from_list< intype2 *>(obj2, arg2n); \
\ \
@ -1278,7 +1201,6 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const size_t arg3n = PyList_Size(obj3); \ const size_t arg3n = PyList_Size(obj3); \
intype3 *arg3v = make_array_from_list< intype3 *>(obj3, arg3n); \ intype3 *arg3v = make_array_from_list< intype3 *>(obj3, arg3n); \
\ \
@ -1304,9 +1226,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const size_t arg3n = PyList_Size(obj3); \ const size_t arg3n = PyList_Size(obj3); \
intype3 *arg3v = make_array_from_list< intype3 *>(obj3, arg3n); \ intype3 *arg3v = make_array_from_list< intype3 *>(obj3, arg3n); \
\ \
@ -1333,9 +1253,7 @@ _w ## func (PyObject *self, PyObject *args) \
return NULL; \ return NULL; \
\ \
const intype1 arg1 = pycap_get< intype1 > (obj1); \ const intype1 arg1 = pycap_get< intype1 > (obj1); \
_CHECK_PYCAP(arg1); \
const intype2 arg2 = pycap_get< intype2 > (obj2); \ const intype2 arg2 = pycap_get< intype2 > (obj2); \
_CHECK_PYCAP(arg2); \
const size_t arg3n = PyList_Size(obj3); \ const size_t arg3n = PyList_Size(obj3); \
intype3 *arg3v = make_array_from_list< intype3 *>(obj3, arg3n); \ intype3 *arg3v = make_array_from_list< intype3 *>(obj3, arg3n); \
\ \
@ -1356,10 +1274,7 @@ static PyObject * \
_w ## func (PyObject *self, PyObject *args) \ _w ## func (PyObject *self, PyObject *args) \
{ \ { \
_TRY \ _TRY \
intype1 arg1; \ intype1 arg1 = get_object_arg<intype1>(args); \
\
if (!(arg1 = get_object_arg<intype1>(args))) \
return NULL; \
\ \
const char *val = func (arg1); \ const char *val = func (arg1); \
PyObject *ret = PyUnicode_FromString(val); \ PyObject *ret = PyUnicode_FromString(val); \