diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2005-09-29 22:07:36 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2005-09-29 22:07:36 +0000 |
| commit | 2a6cdce89409dc0275e23523c3807972a82f2cf7 (patch) | |
| tree | 678a0ca5221d8b6725d064803848ccf535d149b7 /lib/python | |
| parent | c60c214a532e2ecb877276c23c6121f363cd62e0 (diff) | |
| download | enigma2-2a6cdce89409dc0275e23523c3807972a82f2cf7.tar.gz enigma2-2a6cdce89409dc0275e23523c3807972a82f2cf7.zip | |
swig: some more simplifying magic
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/enigma_python.i | 15 | ||||
| -rw-r--r-- | lib/python/swig.h | 3 |
2 files changed, 16 insertions, 2 deletions
diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index 79f9296e..8b918bf0 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -83,9 +83,10 @@ extern PSignal1<void,int> &keyPressedSignal(); %feature("ref") iObject "$this->AddRef(); eDebug(\"AddRef (%s:%d)!\", __FILE__, __LINE__); " %feature("unref") iObject "$this->Release(); eDebug(\"Release! %s:%d\", __FILE__, __LINE__); " + /* this magic allows smartpointer to be used as OUTPUT arguments, i.e. call-by-reference-styled return value. */ -%define %typemap_output_ptr(Type) +%define %typemap_output_simple(Type) %typemap(in,numinputs=0) Type *OUTPUT ($*1_ltype temp), Type &OUTPUT ($*1_ltype temp) "$1 = new Type;"; @@ -95,7 +96,17 @@ extern PSignal1<void,int> &keyPressedSignal(); "$result = t_output_helper($result, (SWIG_NewPointerObj((void*)($1), $1_descriptor, 1)));" %enddef -%newobject eDebugClassPtr::operator->; +%define %typemap_output_ptr(Type) + %typemap(in,numinputs=0) Type *OUTPUT ($*1_ltype temp), + Type &OUTPUT ($*1_ltype temp) + "$1 = new Type;"; + %fragment("t_out_helper"{Type},"header", + fragment="t_output_helper") {} + %typemap(argout,fragment="t_out_helper"{Type}) Type *OUTPUT, Type &OUTPUT + // generate None if smartpointer is NULL + "$result = t_output_helper($result, ((*$1) ? SWIG_NewPointerObj((void*)($1), $1_descriptor, 1) : (Py_INCREF(Py_None), Py_None)));" +%enddef + #define DEBUG %include "typemaps.i" diff --git a/lib/python/swig.h b/lib/python/swig.h index ae0bfd07..23ce9aad 100644 --- a/lib/python/swig.h +++ b/lib/python/swig.h @@ -6,10 +6,13 @@ %template(y) x; \ typedef x y; \ %typemap_output_ptr(x); +#define SWIG_ALLOW_OUTPUT_SIMPLE(x) %typemap_output_simple(x); #else #define TEMPLATE_TYPEDEF(x, y) typedef x y +#define SWIG_ALLOW_OUTPUT_SIMPLE(x) #endif + #ifdef SWIG #define SWIG_INPUT INPUT #define SWIG_OUTPUT OUTPUT |