SF.net SVN: mahogany:[7556] trunk/M
[email protected] Fri, 16 Jan 2009 14:14:14 +0000
| Newsgroups | gmane.mail.mahogany.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 7556
http://mahogany.svn.sourceforge.net/mahogany/?rev=7556&view=rev
Author: vadz
Date: 2009-01-16 14:14:14 +0000 (Fri, 16 Jan 2009)
Log Message:
-----------
added symbols used by newer SWIG
Modified Paths:
--------------
trunk/M/include/MPython.h
trunk/M/src/Python/PythonDll.cpp
Modified: trunk/M/include/MPython.h
===================================================================
--- trunk/M/include/MPython.h 2009-01-16 14:13:34 UTC (rev 7555)
+++ trunk/M/include/MPython.h 2009-01-16 14:14:14 UTC (rev 7556)
@@ -104,6 +104,7 @@
M_PY_WRAPPER_DECL(void , PyErr_Restore, (PyObject *, PyObject *, PyObject *));
//M_PY_WRAPPER_DECL(void , PyErr_SetNone, (PyObject *));
M_PY_WRAPPER_DECL(void , PyErr_SetString, (PyObject *, const char *));
+ M_PY_WRAPPER_DECL(void , PyErr_SetObject, (PyObject *, PyObject *));
M_PY_WRAPPER_DECL(PyObject *, PyErr_Format, (PyObject *, const char *, ...));
// objects
@@ -123,6 +124,7 @@
M_PY_WRAPPER_DECL(PyObject *, PyObject_Str, (PyObject *));
M_PY_WRAPPER_DECL(void *, PyCObject_Import, (char *module_name, char *cobject_name));
M_PY_WRAPPER_DECL(PyObject *, PyCObject_FromVoidPtr, (void *cobj, void (*destruct)(void*)));
+ M_PY_WRAPPER_DECL(void *, PyCObject_AsVoidPtr, (PyObject *));
M_PY_WRAPPER_DECL(PyObject **, _PyObject_GetDictPtr, (PyObject *));
// instances
@@ -138,11 +140,17 @@
M_PY_WRAPPER_DECL(PyObject *, PyLong_FromVoidPtr, (void *));
M_PY_WRAPPER_DECL(long , PyLong_AsLong, (PyObject *));
M_PY_WRAPPER_DECL(unsigned long , PyLong_AsUnsignedLong, (PyObject *));
+ M_PY_WRAPPER_DECL(double, PyLong_AsDouble, (PyObject *));
M_PY_VAR_DECL(PyTypeObject *, PyInt_Type);
M_PY_VAR_DECL(PyTypeObject *, PyLong_Type);
M_PY_VAR_DECL(PyIntObject *, _Py_TrueStruct);
M_PY_VAR_DECL(PyIntObject *, _Py_ZeroStruct);
+ // floats
+ M_PY_VAR_DECL(PyTypeObject *, PyFloat_Type);
+ M_PY_WRAPPER_DECL(PyObject *, PyFloat_FromDouble, (double));
+ M_PY_WRAPPER_DECL(double, PyFloat_AsDouble, (PyObject *));
+
// strings
M_PY_WRAPPER_DECL(char *, PyString_AsString, (PyObject *));
M_PY_WRAPPER_DECL(int , PyString_AsStringAndSize, (PyObject *, char **, int *));
@@ -180,9 +188,10 @@
M_PY_WRAPPER_DECL(PyThreadState*, PyEval_SaveThread, (void));
M_PY_WRAPPER_DECL(PyObject*, PyList_GetItem, (PyObject *, int));
M_PY_WRAPPER_DECL(PyObject*, PyList_New, (int size));
+ M_PY_WRAPPER_DECL(int, PyList_Append, (PyObject *, PyObject *));
M_PY_WRAPPER_DECL(int, PyList_SetItem, (PyObject *, int, PyObject *));
M_PY_WRAPPER_DECL(int, PyList_Size, (PyObject *));
- M_PY_VAR_DECL(PyTypeObject* , PyList_Type);
+ M_PY_VAR_DECL(PyTypeObject *, PyList_Type);
M_PY_WRAPPER_DECL(PyObject*, PyImport_ImportModule, (const char *));
M_PY_WRAPPER_DECL(PyObject*, PyModule_GetDict, (PyObject *));
M_PY_WRAPPER_DECL(int, PyModule_AddObject, (PyObject *, char *, PyObject *));
@@ -192,7 +201,6 @@
M_PY_WRAPPER_DECL(PyObject*, Py_FindMethod, (PyMethodDef[], PyObject *, char *));
M_PY_WRAPPER_DECL(PyObject*, Py_InitModule4, (char *, PyMethodDef *, char *, PyObject *, int));
M_PY_WRAPPER_DECL(PyObject *, PyEval_CallObjectWithKeywords, (PyObject *, PyObject *, PyObject *));
- M_PY_WRAPPER_DECL(PyObject *, PyFloat_FromDouble, (double));
M_PY_WRAPPER_DECL(PyObject *, PyImport_AddModule, (char *name));
M_PY_WRAPPER_DECL(PyObject *, PyImport_GetModuleDict, (void));
M_PY_WRAPPER_DECL(PyObject *, PyImport_ReloadModule, (PyObject *));
@@ -247,6 +255,7 @@
#define PyErr_Occurred M_PyErr_Occurred
#define PyErr_Restore M_PyErr_Restore
#define PyErr_SetString M_PyErr_SetString
+#define PyErr_SetObject M_PyErr_SetObject
#define PyErr_Format M_PyErr_Format
// objects
@@ -271,6 +280,7 @@
#define PyObject_Str M_PyObject_Str
#define PyCObject_Import M_PyCObject_Import
#define PyCObject_FromVoidPtr M_PyCObject_FromVoidPtr
+#define PyCObject_AsVoidPtr M_PyCObject_AsVoidPtr
#define _PyObject_GetDictPtr M__PyObject_GetDictPtr
// instances
@@ -286,11 +296,17 @@
#define PyLong_FromVoidPtr M_PyLong_FromVoidPtr
#define PyLong_AsLong M_PyLong_AsLong
#define PyLong_AsUnsignedLong M_PyLong_AsUnsignedLong
+#define PyLong_AsDouble (*M_PyLong_AsDouble)
#define PyInt_Type (*M_PyInt_Type)
#define PyLong_Type (*M_PyLong_Type)
#define _Py_TrueStruct (*M__Py_TrueStruct)
#define _Py_ZeroStruct (*M__Py_ZeroStruct)
+// floats
+#define PyFloat_Type (*M_PyFloat_Type)
+#define PyFloat_FromDouble M_PyFloat_FromDouble
+#define PyFloat_AsDouble (*M_PyFloat_AsDouble)
+
// strings
#define PyString_AsString M_PyString_AsString
#define PyString_AsStringAndSize M_PyString_AsStringAndSize
@@ -308,6 +324,12 @@
#define PyTuple_SetItem M_PyTuple_SetItem
#define PyTuple_Type (*M_PyTuple_Type)
+// lists
+#define PyList_Type (*M_PyList_Type)
+#define PyList_New M_PyList_New
+#define PyList_SetItem M_PyList_SetItem
+#define PyList_Append M_PyList_Append
+
// dicts
#define PyDict_GetItem M_PyDict_GetItem
#define PyDict_GetItemString M_PyDict_GetItemString
@@ -339,7 +361,6 @@
#define PyModule_AddObject M_PyModule_AddObject
#define PyType_Type (*M_PyType_Type)
#define PyEval_CallObjectWithKeywords M_PyEval_CallObjectWithKeywords
-#define PyFloat_FromDouble M_PyFloat_FromDouble
#define PyImport_AddModule M_PyImport_AddModule
#define PyImport_GetModuleDict M_PyImport_GetModuleDict
#define PyImport_ReloadModule M_PyImport_ReloadModule
Modified: trunk/M/src/Python/PythonDll.cpp
===================================================================
--- trunk/M/src/Python/PythonDll.cpp 2009-01-16 14:13:34 UTC (rev 7555)
+++ trunk/M/src/Python/PythonDll.cpp 2009-01-16 14:14:14 UTC (rev 7556)
@@ -82,6 +82,7 @@
M_PY_WRAPPER_DEF(PyErr_Restore);
//M_PY_WRAPPER_DEF(PyErr_SetNone);
M_PY_WRAPPER_DEF(PyErr_SetString);
+ M_PY_WRAPPER_DEF(PyErr_SetObject);
M_PY_WRAPPER_DEF(PyErr_Format);
// objects
@@ -101,6 +102,7 @@
M_PY_WRAPPER_DEF(PyObject_Str);
M_PY_WRAPPER_DEF(PyCObject_Import);
M_PY_WRAPPER_DEF(PyCObject_FromVoidPtr);
+ M_PY_WRAPPER_DEF(PyCObject_AsVoidPtr);
M_PY_WRAPPER_DEF(_PyObject_GetDictPtr);
// instances
@@ -116,11 +118,17 @@
M_PY_WRAPPER_DEF(PyLong_FromVoidPtr);
M_PY_WRAPPER_DEF(PyLong_AsLong);
M_PY_WRAPPER_DEF(PyLong_AsUnsignedLong);
+ M_PY_WRAPPER_DEF(PyLong_AsDouble);
M_PY_VAR_DEF(PyInt_Type);
M_PY_VAR_DEF(PyLong_Type);
M_PY_VAR_DEF(_Py_TrueStruct);
M_PY_VAR_DEF(_Py_ZeroStruct);
+ // floats
+ M_PY_VAR_DEF(PyFloat_Type);
+ M_PY_WRAPPER_DEF(PyFloat_FromDouble);
+ M_PY_WRAPPER_DEF(PyFloat_AsDouble);
+
// strings
M_PY_WRAPPER_DEF(PyString_AsString);
M_PY_WRAPPER_DEF(PyString_AsStringAndSize);
@@ -158,6 +166,7 @@
M_PY_WRAPPER_DEF(PyEval_SaveThread);
M_PY_WRAPPER_DEF(PyList_GetItem);
M_PY_WRAPPER_DEF(PyList_New);
+ M_PY_WRAPPER_DEF(PyList_Append);
M_PY_WRAPPER_DEF(PyList_SetItem);
M_PY_WRAPPER_DEF(PyList_Size);
M_PY_VAR_DEF(PyList_Type);
@@ -170,7 +179,6 @@
M_PY_WRAPPER_DEF(Py_FindMethod);
M_PY_WRAPPER_DEF(Py_InitModule4);
M_PY_WRAPPER_DEF(PyEval_CallObjectWithKeywords);
- M_PY_WRAPPER_DEF(PyFloat_FromDouble);
M_PY_WRAPPER_DEF(PyImport_AddModule);
M_PY_WRAPPER_DEF(PyImport_GetModuleDict);
M_PY_WRAPPER_DEF(PyImport_ReloadModule);
@@ -244,6 +252,7 @@
PYTHON_SYMBOL(PyErr_Occurred)
PYTHON_SYMBOL(PyErr_Restore)
PYTHON_SYMBOL(PyErr_SetString)
+ PYTHON_SYMBOL(PyErr_SetObject)
PYTHON_SYMBOL(PyErr_Format)
// objects
@@ -263,6 +272,7 @@
PYTHON_SYMBOL(PyObject_Str)
PYTHON_SYMBOL(PyCObject_Import)
PYTHON_SYMBOL(PyCObject_FromVoidPtr)
+ PYTHON_SYMBOL(PyCObject_AsVoidPtr)
PYTHON_SYMBOL(_PyObject_GetDictPtr)
// instances
@@ -278,11 +288,17 @@
PYTHON_SYMBOL(PyLong_FromVoidPtr)
PYTHON_SYMBOL(PyLong_AsLong)
PYTHON_SYMBOL(PyLong_AsUnsignedLong)
+ PYTHON_SYMBOL(PyLong_AsDouble)
PYTHON_SYMBOL(PyInt_Type)
PYTHON_SYMBOL(PyLong_Type)
PYTHON_SYMBOL(_Py_TrueStruct)
PYTHON_SYMBOL(_Py_ZeroStruct)
+ // floats
+ PYTHON_SYMBOL(PyFloat_Type)
+ PYTHON_SYMBOL(PyFloat_FromDouble)
+ PYTHON_SYMBOL(PyFloat_AsDouble)
+
// strings
PYTHON_SYMBOL(PyString_AsString)
PYTHON_SYMBOL(PyString_AsStringAndSize)
@@ -352,7 +368,6 @@
PYTHON_SYMBOL(PyExc_ValueError)
PYTHON_SYMBOL(PyExc_ZeroDivisionError)
- PYTHON_SYMBOL(PyFloat_FromDouble)
PYTHON_SYMBOL(PyImport_AddModule)
PYTHON_SYMBOL(PyImport_GetModuleDict)
PYTHON_SYMBOL(PyImport_ReloadModule)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword