X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a333120784e3b3af222c4dd95ed383288bd1a2e0..6bda7508c6e41365b69fdf690b3070991098a7af:/wxPython/src/libpy.c diff --git a/wxPython/src/libpy.c b/wxPython/src/libpy.c index 9c0149bcff..48680c914d 100644 --- a/wxPython/src/libpy.c +++ b/wxPython/src/libpy.c @@ -28,6 +28,7 @@ #define SWIG_TypeCast SWIG_Python_TypeCast #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast #define SWIG_TypeName SWIG_Python_TypeName +#define SWIG_TypePrettyName SWIG_Python_TypePrettyName #define SWIG_TypeQuery SWIG_Python_TypeQuery #define SWIG_TypeClientData SWIG_Python_TypeClientData #define SWIG_PackData SWIG_Python_PackData @@ -104,6 +105,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *); SWIGIMPORT(void *) SWIG_TypeCast(swig_type_info *, void *); SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); +SWIGIMPORT(const char *) SWIG_TypePrettyName(const swig_type_info *); SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); @@ -112,13 +114,14 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #else static swig_type_info *swig_type_list = 0; +static swig_type_info **swig_type_list_handle = &swig_type_list; /* Register a type mapping with the type-checking */ SWIGRUNTIME(swig_type_info *) SWIG_TypeRegister(swig_type_info *ti) { swig_type_info *tc, *head, *ret, *next; /* Check to see if this type has already been registered */ - tc = swig_type_list; + tc = *swig_type_list_handle; while (tc) { if (strcmp(tc->name, ti->name) == 0) { /* Already exists in the table. Just add additional types to the list */ @@ -133,8 +136,8 @@ SWIG_TypeRegister(swig_type_info *ti) { next = 0; /* Place in list */ - ti->prev = swig_type_list; - swig_type_list = ti; + ti->prev = *swig_type_list_handle; + *swig_type_list_handle = ti; /* Build linked lists */ l1: @@ -203,12 +206,69 @@ SWIG_TypeName(const swig_type_info *ty) { return ty->name; } +/* Return the pretty name associated with this type, + that is an unmangled type name in a form presentable to the user. +*/ +SWIGRUNTIME(const char *) +SWIG_TypePrettyName(const swig_type_info *type) { + /* The "str" field contains the equivalent pretty names of the + type, separated by vertical-bar characters. We choose + to print the last name, as it is often (?) the most + specific. */ + if (type->str != NULL) { + const char *last_name = type->str; + const char *s; + for (s = type->str; *s; s++) + if (*s == '|') last_name = s+1; + return last_name; + } + else + return type->name; +} + +/* + Compare two type names skipping the space characters, therefore + "char*" == "char *" and "Class" == "Class", etc. + + Return 0 when the two name types are equivalent, as in + strncmp, but skipping ' '. +*/ +static int +SWIG_TypeNameComp(const char *f1, const char *l1, + const char *f2, const char *l2) { + for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) { + while ((*f1 == ' ') && (f1 != l1)) ++f1; + while ((*f2 == ' ') && (f2 != l2)) ++f2; + if (*f1 != *f2) return *f1 - *f2; + } + return (l1 - f1) - (l2 - f2); +} + +/* + Check type equivalence in a name list like ||... +*/ +static int +SWIG_TypeEquiv(const char *nb, const char *tb) { + int equiv = 0; + const char* te = tb + strlen(tb); + const char* ne = nb; + while (!equiv && *ne) { + for (nb = ne; *ne; ++ne) { + if (*ne == '|') break; + } + equiv = SWIG_TypeNameComp(nb, ne, tb, te) == 0; + if (*ne) ++ne; + } + return equiv; +} + + /* Search for a swig_type_info structure */ SWIGRUNTIME(swig_type_info *) SWIG_TypeQuery(const char *name) { - swig_type_info *ty = swig_type_list; + swig_type_info *ty = *swig_type_list_handle; while (ty) { - if (ty->str && (strcmp(name,ty->str) == 0)) return ty; + if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty; if (ty->name && (strcmp(name,ty->name) == 0)) return ty; ty = ty->prev; } @@ -224,7 +284,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) { equiv = ti->next; while (equiv) { if (!equiv->converter) { - tc = swig_type_list; + tc = *swig_type_list_handle; while (tc) { if ((strcmp(tc->name, equiv->name) == 0)) SWIG_TypeClientData(tc,clientdata); @@ -239,10 +299,10 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) { SWIGRUNTIME(char *) SWIG_PackData(char *c, void *ptr, int sz) { static char hex[17] = "0123456789abcdef"; - int i; unsigned char *u = (unsigned char *) ptr; + const unsigned char *eu = u + sz; register unsigned char uu; - for (i = 0; i < sz; i++,u++) { + for (; u != eu; ++u) { uu = *u; *(c++) = hex[(uu & 0xf0) >> 4]; *(c++) = hex[uu & 0xf]; @@ -256,8 +316,8 @@ SWIG_UnpackData(char *c, void *ptr, int sz) { register unsigned char uu = 0; register int d; unsigned char *u = (unsigned char *) ptr; - int i; - for (i = 0; i < sz; i++, u++) { + const unsigned char *eu = u + sz; + for (; u != eu; ++u) { d = *(c++); if ((d >= '0') && (d <= '9')) uu = ((d - '0') << 4); @@ -279,9 +339,8 @@ SWIG_UnpackData(char *c, void *ptr, int sz) { } #endif - /*********************************************************************** - * python.swg + * pyrun.swg * * This file contains the runtime support for Python modules * and includes code for managing global variables and pointer @@ -290,8 +349,6 @@ SWIG_UnpackData(char *c, void *ptr, int sz) { * Author : David Beazley (beazley@cs.uchicago.edu) ************************************************************************/ -#include "Python.h" - #ifdef __cplusplus extern "C" { #endif @@ -353,27 +410,6 @@ SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); -/* ----------------------------------------------------------------------------- - * the needed conversions between C++ and python - * ----------------------------------------------------------------------------- */ -/* basic types */ -/* - utilities -*/ -SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); -SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); -SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); -SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, - long min_value, long max_value); -SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, - unsigned long max_value); -SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); -SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, - char** cptr, size_t* size); -SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, - char* carray, size_t size); -SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); -SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); #else @@ -441,19 +477,63 @@ swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) { statichere PyTypeObject varlinktype = { PyObject_HEAD_INIT(0) - 0, - (char *)"swigvarlink", /* Type name */ - sizeof(swig_varlinkobject), /* Basic size */ - 0, /* Itemsize */ - 0, /* Deallocator */ - (printfunc) swig_varlink_print, /* Print */ - (getattrfunc) swig_varlink_getattr, /* get attr */ - (setattrfunc) swig_varlink_setattr, /* Set attr */ - 0, /* tp_compare */ - (reprfunc) swig_varlink_repr, /* tp_repr */ + 0, /* Number of items in variable part (ob_size) */ + (char *)"swigvarlink", /* Type name (tp_name) */ + sizeof(swig_varlinkobject), /* Basic size (tp_basicsize) */ + 0, /* Itemsize (tp_itemsize) */ + 0, /* Deallocator (tp_dealloc) */ + (printfunc) swig_varlink_print, /* Print (tp_print) */ + (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */ + (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */ + 0, /* tp_compare */ + (reprfunc) swig_varlink_repr, /* tp_repr */ 0, /* tp_as_number */ - 0, /* tp_as_mapping*/ - 0, /* tp_hash */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + 0, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ +#if PY_VERSION_HEX >= 0x02020000 + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ + 0, /* tp_free */ + 0, /* tp_is_gc */ + 0, /* tp_bases */ + 0, /* tp_mro */ + 0, /* tp_cache */ + 0, /* tp_subclasses */ + 0, /* tp_weaklist */ +#endif +#if PY_VERSION_HEX >= 0x02030200 + 0, /* tp_del */ +#endif +#ifdef COUNT_ALLOCS + /* these must be last */ + 0, /* tp_alloc */ + 0, /* tp_free */ + 0, /* tp_maxalloc */ + 0, /* tp_next */ +#endif }; /* Create a variable linking object for use later */ @@ -527,7 +607,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) goto type_error; } } - c = PyString_AsString(obj); + c = PyString_AS_STRING(obj); /* Pointer values must start with leading underscore */ if (*c != '_') { *ptr = (void *) 0; @@ -555,19 +635,17 @@ cobject: } if ((pyobj) && (flags & SWIG_POINTER_DISOWN)) { - PyObject *zero = PyInt_FromLong(0); - PyObject_SetAttrString(pyobj,(char*)"thisown",zero); - Py_DECREF(zero); + PyObject_SetAttrString(pyobj,(char*)"thisown",Py_False); } return 0; type_error: + PyErr_Clear(); if (flags & SWIG_POINTER_EXCEPTION) { if (ty && c) { - char *temp = (char *) malloc(64+strlen(ty->name)+strlen(c)); - sprintf(temp,"Type error. Got %s, expected %s", c, ty->name); - PyErr_SetString(PyExc_TypeError, temp); - free((char *) temp); + PyErr_Format(PyExc_TypeError, + "Type error. Got %s, expected %s", + c, ty->name); } else { PyErr_SetString(PyExc_TypeError,"Expected a pointer"); } @@ -590,7 +668,7 @@ SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, int sz, swig_type_info *ty, char *c = 0; if ((!obj) || (!PyString_Check(obj))) goto type_error; - c = PyString_AsString(obj); + c = PyString_AS_STRING(obj); /* Pointer values must start with leading underscore */ if (*c != '_') goto type_error; c++; @@ -605,10 +683,9 @@ type_error: if (flags) { if (ty && c) { - char *temp = (char *) malloc(64+strlen(ty->name)+strlen(c)); - sprintf(temp,"Type error. Got %s, expected %s", c, ty->name); - PyErr_SetString(PyExc_TypeError, temp); - free((char *) temp); + PyErr_Format(PyExc_TypeError, + "Type error. Got %s, expected %s", + c, ty->name); } else { PyErr_SetString(PyExc_TypeError,"Expected a pointer"); } @@ -645,9 +722,7 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int own) { Py_DECREF(args); if (inst) { if (own) { - PyObject *n = PyInt_FromLong(1); - PyObject_SetAttrString(inst,(char*)"thisown",n); - Py_DECREF(n); + PyObject_SetAttrString(inst,(char*)"thisown",Py_True); } robj = inst; } @@ -666,196 +741,6 @@ SWIG_Python_NewPackedObj(void *ptr, int sz, swig_type_info *type) { return PyString_FromString(result); } -/* ----------------------------------------------------------------------------- - * the needed conversions between C++ and python - * ----------------------------------------------------------------------------- */ - -#include -#include -#include - -SWIGRUNTIME(unsigned long) -SWIG_PyObj_AsUnsignedLong(PyObject * obj) -{ - if (PyLong_Check(obj)) { - return PyLong_AsUnsignedLong(obj); - } else { - long i = PyInt_AsLong(obj); - if ( !PyErr_Occurred() && (i < 0)) { - PyErr_SetString(PyExc_TypeError, "negative value for unsigned type"); - } - return i; - } -} - -SWIGRUNTIME(long) -SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, - long min_value, long max_value) -{ - long value = PyInt_Check(obj) ? PyInt_AsLong(obj) : (long)PyLong_AsLongLong(obj); - if (!PyErr_Occurred()) { - if (value < min_value) { - PyObject *err = - PyString_FromFormat("value %ld is less than '%s' minimum %ld", - value, type, min_value); - - PyErr_SetObject(PyExc_OverflowError, err); - Py_XDECREF(err); - } else if (value > max_value) { - PyObject *err = - PyString_FromFormat("value %ld is greater than '%s' maximum %ld", - value, type, max_value); - PyErr_SetObject(PyExc_OverflowError, err); - Py_XDECREF(err); - } - } - return value; -} - -SWIGRUNTIME(unsigned long) -SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, - unsigned long max_value) -{ - unsigned long value = SWIG_PyObj_AsUnsignedLong(obj); - if (!PyErr_Occurred()) { - if (value > max_value) { - PyObject *err = - PyString_FromFormat("value %ld is greater than '%s' minimum %ld", - value, type, max_value); - PyErr_SetObject(PyExc_OverflowError, err); - Py_XDECREF(err); - } - } - return value; -} - -SWIGRUNTIME(float) -SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv) -{ - double value = pyconv(obj); - if (!PyErr_Occurred()) { - if (value < FLT_MIN) { - PyObject *err = - PyString_FromFormat("value %g is less than float minimum %g", - value, FLT_MIN); - PyErr_SetObject(PyExc_OverflowError, err); - Py_XDECREF(err); - } else if (value > FLT_MAX) { - PyObject *err = - PyString_FromFormat("value %g is greater than float maximum %g", - value, FLT_MAX); - PyErr_SetObject(PyExc_OverflowError, err); - Py_XDECREF(err); - } - } - return (float) value; -} - -SWIGRUNTIME(void) -SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, - char** cptr, size_t* size) -{ - int psize; - if ((!pchar_info) || SWIG_ConvertPtr(obj,(void **)cptr, pchar_info, 0) == -1) { - if (pchar_info && PyErr_Occurred()) PyErr_Clear(); - PyString_AsStringAndSize(obj, cptr, &psize); - *size = (size_t) psize; - } else { - /* don't like strlen, but ... */ - *size = (*cptr) ? (strlen(*cptr) + 1) : 0; - } -} - - -SWIGRUNTIME(char*) -SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info) -{ - char *res = 0; - char* cptr; size_t csize; - SWIG_PyObj_AsCharPtrAndSize(obj, pchar_info, &cptr, &csize); - if (!PyErr_Occurred() && cptr) { - /* we add the '0' terminator if needed */ - size_t size = (csize && !(cptr[csize - 1])) ? csize : csize + 1; - if (size) { -#ifdef __cplusplus - res = new char[size]; -#else - res = malloc(size); -#endif - if (csize) memcpy(res, cptr, csize); - if (csize < size) res[csize] = 0; - } - } - return res; -} - -SWIGRUNTIME(PyObject *) -SWIG_PyObj_FromCharArray(const char* carray, size_t size) -{ - if (size > INT_MAX) { - PyObject *err = - PyString_FromFormat("a char array of size %d is not allowed in python", - size); - PyErr_SetObject(PyExc_TypeError, err); - Py_XDECREF(err); - Py_INCREF(Py_None); - return Py_None; - } else { - int psize = (int) size; - return PyString_FromStringAndSize(carray, psize); - } -} - -SWIGRUNTIME(void) -SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, - char* carray, size_t size) -{ - char* cptr; size_t csize; - SWIG_PyObj_AsCharPtrAndSize(obj, pchar_info, &cptr, &csize); - if (!PyErr_Occurred()) { - /* in C (but not in C++) you can do: - - char x[5] = "hello"; - - ie, assing the array using an extra '0' char. Here, - we assume the C behavior... - */ - if ((csize == size + 1) && !(cptr[csize-1])) --csize; - if (csize > size) { - PyObject *err = - PyString_FromFormat("a char array of maximum size %d is expected", - size); - PyErr_SetObject(PyExc_TypeError, err); - Py_XDECREF(err); - } else { - if (csize) memcpy(carray, cptr, csize); - if (csize < size) memset(carray + csize, 0, size - csize); - } - } -} - -SWIGRUNTIME(PyObject *) -SWIG_PyObj_FromCharPtr(const char* cptr) -{ - if (cptr) { - return PyString_FromString(cptr); - } else { - Py_INCREF(Py_None); - return Py_None; - } -} - -SWIGRUNTIME(char* ) -SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info) -{ - char* ptr; - if (SWIG_ConvertPtr(obj,(void **)&ptr, pchar_info, 0) == -1) { - if (PyErr_Occurred()) PyErr_Clear(); - ptr = PyString_AsString(obj); - } - return ptr; -} - /* Install Constants */ SWIGRUNTIME(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) { @@ -870,7 +755,12 @@ SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) { obj = PyFloat_FromDouble(constants[i].dvalue); break; case SWIG_PY_STRING: - obj = SWIG_PyObj_FromCharPtr((char *) constants[i].pvalue); + if (constants[i].pvalue) { + obj = PyString_FromString((char *) constants[i].pvalue); + } else { + Py_INCREF(Py_None); + obj = Py_None; + } break; case SWIG_PY_POINTER: obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0); @@ -900,7 +790,6 @@ SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) { #endif - /* -------- TYPES TABLE (BEGIN) -------- */ #define SWIGTYPE_p_char swig_types[0] @@ -908,62 +797,80 @@ static swig_type_info *swig_types[2]; /* -------- TYPES TABLE (END) -------- */ +#define SWIG_init initswigrun -/*----------------------------------------------- - @(target):= _swigrun.so - ------------------------------------------------*/ -#define SWIG_init init_swigrun +#define SWIG_name "swigrun" -#define SWIG_name "_swigrun" +/* Auxiliar swig macros that appear in the header */ -#include -#include -#include +#define SWIG_OLDOBJ 1 +#define SWIG_NEWOBJ SWIG_OLDOBJ + 1 +#define SWIG_PYSTR SWIG_NEWOBJ + 1 -#ifndef SWIGSTATIC #ifdef __cplusplus -#define SWIGSTATIC(a) static inline a -#else +#define SWIGSTATICINLINE(a) static inline a #define SWIGSTATIC(a) static a -#endif -#endif - -#ifndef numeric_cast -#ifdef __cplusplus -#ifdef HAVE_NUMERIC_CAST -#define numeric_cast(type,a) numeric_cast(a) -#else -#define numeric_cast(type,a) static_cast(a) -#endif -#else -#define numeric_cast(type,a) (type)(a) -#endif -#endif - - - -#define SWIG_PyObj_FromSignedChar PyInt_FromLong -#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong -#define SWIG_PyObj_FromShort PyInt_FromLong -#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong -#define SWIG_PyObj_FromInt PyInt_FromLong -#define SWIG_PyObj_FromLong PyInt_FromLong -#define SWIG_PyObj_FromFloat PyFloat_FromDouble -#define SWIG_PyObj_FromDouble PyFloat_FromDouble -#define SWIG_PyObj_FromFloat PyFloat_FromDouble -#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define swig_new_array(size,Type) (new Type[(size)]) +#define swig_delete(cptr) delete cptr +#define swig_delete_array(cptr) delete[] cptr +#define swig_const_cast(a,Type) const_cast(a) +#define swig_static_cast(a,Type) static_cast(a) +#define swig_reinterpret_cast(a,Type) reinterpret_cast(a) +#define swig_new_copy(ptr,Type) (new Type(*ptr)) +#define swig_numeric_cast(a,Type) static_cast(a) + +#else /* C case */ + +#define SWIGSTATICINLINE(a) static a +#define SWIGSTATIC(a) static a +#define swig_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type))) +#define swig_delete(cptr) free((char*)cptr) +#define swig_delete_array(cptr) free((char*)cptr) +#define swig_const_cast(a,Type) (Type)(a) +#define swig_static_cast(a,Type) (Type)(a) +#define swig_reinterpret_cast(a,Type) (Type)(a) +#define swig_numeric_cast(a,Type) (Type)(a) +#define swig_new_copy(ptr,Type) ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type))) + +#endif /* __cplusplus */ + + +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_signed_SS_char PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_unsigned_SS_char PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_short PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_unsigned_SS_short PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_int PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_long PyInt_FromLong +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_float PyFloat_FromDouble +/*@@*/ +/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/ +#define SWIG_From_double PyFloat_FromDouble +/*@@*/ #ifdef __cplusplus extern "C" { #endif static PyMethodDef SwigMethods[] = { - { NULL, NULL } + { NULL, NULL, 0, NULL } }; /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info *swig_types_initial[] = { _swigt__p_char, @@ -974,7 +881,7 @@ _swigt__p_char, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{0}}; +{0, 0, 0, 0.0, 0, 0}}; #ifdef __cplusplus }