Changeset 12004 for issm/branches/trunk-jpl-damage/src/c/include/macros.h

Timestamp:

04/16/12 16:06:52 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 11990

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/include/macros.h (modified) (4 diffs)

issm/branches/trunk-jpl-damage/src/c/include/macros.h

@@ -34 +34 @@
 #ifdef _ISSM_DEBUG_ 
 #define _assert_(statement)\
-  if (!(statement)) _error_("Assertion \"%s\" failed, please report bug to ISSM developers",#statement)
+  if (!(statement)) _error_("Assertion \"%s\" failed, please report bug to %s",#statement,PACKAGE_BUGREPORT)
 #else
 #define _assert_(ignore)\
@@ -40 +40 @@
 #endif
 /*}}}*/
+
 /* MODULEBOOT/MODULEEND {{{1*/
+
 /*The following macros hide the error exception handling in a matlab module. Just put 
  * MODULEBOOT(); and MODULEEND(); at the beginning and end of a module, and c++ exceptions 
  * will be trapped. Really nifty!*/
+
 #ifdef _SERIAL_
-
+#ifdef _HAVE_MATLAB_ //{{{2
 #define MODULEBOOT(); ModuleBoot(); \
         try{
@@ -58 +61 @@
                 mexErrMsgTxt(" ");\
         }
+#endif //}}}
+#ifdef _HAVE_PYTHON_ //{{{2
+#define MODULEBOOT(); ModuleBoot();  \
+        PyObject* output = PyTuple_New(NLHS); if (!output) return NULL;
 
+#define MODULEEND();  ModuleEnd(); \
+                                                 return output;
+#endif //}}}
 #else 
-
+//{{{2
 #define MODULEBOOT(); \
         try{
@@ -73 +83 @@
                 return 1;\
         }
+//}}}
+#endif
+/*}}}*/
+/* WRAPPER {{{1*/
+#ifdef _HAVE_MATLAB_
+#define WRAPPER(modulename,...) void mexFunction(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) 
+#endif
+#ifdef _HAVE_PYTHON_
+#define WRAPPER(modulename,...)  \
+\
+static PyObject* modulename(PyObject* self,PyObject* args);\
+static PyMethodDef modulename##_funcs[] = {\
+        {#modulename, (PyCFunction)modulename, METH_VARARGS, ""},\
+        {NULL,NULL,0,NULL}\
+};\
+\
+static struct PyModuleDef modulename##module= {\
+        PyModuleDef_HEAD_INIT,\
+        #modulename,   /* name of module */\
+        NULL, /* module documentation, may be NULL */\
+        -1,       /* size of per-interpreter state of the module,\
+                                 or -1 if the module keeps state in global variables. */\
+        modulename##_funcs\
+};\
+\
+PyMODINIT_FUNC PyInit_##modulename(void){\
+\
+        import_array();\
+        return PyModule_Create(&modulename##module);\
+}\
+\
+static PyObject* modulename(PyObject* self,PyObject* args)
+
+#endif
+
+/*}}}*/
+/* CHECKARGUMENTS {{{1*/
+#ifdef _HAVE_MATLAB_
+#define CHECKARGUMENTS(NLHS,NRHS,functionpointer) CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,functionpointer)
+#endif
+#ifdef _HAVE_PYTHON_
+#define CHECKARGUMENTS(NLHS,NRHS,functionpointer) CheckNumPythonArguments(args, NRHS,functionpointer)
 #endif
 /*}}}*/
 
+
 #endif