From: <wsf...@us...> - 2011-04-04 20:13:24
|
Revision: 12608 http://swig.svn.sourceforge.net/swig/?rev=12608&view=rev Author: wsfulton Date: 2011-04-04 20:13:14 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Cosmetic Python changes and replace DOH types Modified Paths: -------------- trunk/Lib/python/boost_shared_ptr.i trunk/Lib/python/pyinit.swg trunk/Lib/python/pytypemaps.swg trunk/Source/Modules/python.cxx Modified: trunk/Lib/python/boost_shared_ptr.i =================================================================== --- trunk/Lib/python/boost_shared_ptr.i 2011-04-04 07:11:02 UTC (rev 12607) +++ trunk/Lib/python/boost_shared_ptr.i 2011-04-04 20:13:14 UTC (rev 12608) @@ -318,14 +318,5 @@ %template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; -#if defined(SWIGPYTHON_BUILTIN) - -%typemap(builtin_init, fragment="SWIG_null_deleter_python") CONST TYPE * { - SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0; - %set_output(SWIG_Python_NewBuiltinObj(self, %as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), $owner | SWIG_POINTER_OWN)); -} - -#endif - %enddef Modified: trunk/Lib/python/pyinit.swg =================================================================== --- trunk/Lib/python/pyinit.swg 2011-04-04 07:11:02 UTC (rev 12607) +++ trunk/Lib/python/pyinit.swg 2011-04-04 20:13:14 UTC (rev 12608) @@ -388,7 +388,7 @@ /* All objects have a 'this' attribute */ static PyGetSetDef this_getset_def = { - (char*) "this", SwigPyBuiltin_ThisClosure, NULL, NULL, NULL + (char *)"this", SwigPyBuiltin_ThisClosure, NULL, NULL, NULL }; PyObject *this_descr = PyDescr_NewGetSet(SwigPyObject_type(), &this_getset_def); @@ -398,7 +398,7 @@ (PyCFunction) SwigPyObject_own }; static PyGetSetDef thisown_getset_def = { - const_cast<char*>("thisown"), SwigPyBuiltin_GetterClosure, SwigPyBuiltin_SetterClosure, NULL, &thisown_getset_closure + (char *)"thisown", SwigPyBuiltin_GetterClosure, SwigPyBuiltin_SetterClosure, NULL, &thisown_getset_closure }; PyObject *thisown_descr = PyDescr_NewGetSet(SwigPyObject_type(), &thisown_getset_def); Modified: trunk/Lib/python/pytypemaps.swg =================================================================== --- trunk/Lib/python/pytypemaps.swg 2011-04-04 07:11:02 UTC (rev 12607) +++ trunk/Lib/python/pytypemaps.swg 2011-04-04 20:13:14 UTC (rev 12608) @@ -88,12 +88,6 @@ $result = SWIG_NewPointerObj(%new_copy(*$1, $*ltype), $descriptor, SWIG_POINTER_OWN | %newpointer_flags); } -/* -%typemap(builtin_init,noblock=1) const SWIGTYPE & SMARTPOINTER { - $result = SWIG_NewBuiltinObj(self, %new_copy(*$1, $*ltype), $descriptor, SWIG_POINTER_OWN | %newpointer_flags); -} -*/ - %typemap(ret,noblock=1) const SWIGTYPE & SMARTPOINTER, SWIGTYPE SMARTPOINTER { if ($result) { PyObject *robj = PyObject_CallMethod($result, (char *)"__deref__", NULL); @@ -105,24 +99,3 @@ } } -/* ------------------------------------------------------------- - * Output typemap for the __init__ method of a built-in type. - * ------------------------------------------------------------ */ - -/* Pointers, references */ -/* -%typemap(builtin_init,noblock=1) SWIGTYPE *, SWIGTYPE &, SWIGTYPE[] { - %set_output(SWIG_Python_NewBuiltinObj(self, %as_voidptr($1), $descriptor, $owner | %newpointer_flags)); -} -*/ -/* -%typemap(builtin_init, noblock=1) SWIGTYPE *const& { - %set_output(SWIG_Python_NewBuiltinObj(self, %as_voidptr(*$1), $*descriptor, $owner | %newpointer_flags)); -} -*/ -/* Return by value */ -/* -%typemap(builtin_init, noblock=1) SWIGTYPE { - %set_output(SWIG_Python_NewBuiltinObj(self, %new_copy($1, $ltype), $&descriptor, $owner | %newpointer_flags)); -} -*/ Modified: trunk/Source/Modules/python.cxx =================================================================== --- trunk/Source/Modules/python.cxx 2011-04-04 07:11:02 UTC (rev 12607) +++ trunk/Source/Modules/python.cxx 2011-04-04 20:13:14 UTC (rev 12608) @@ -171,14 +171,14 @@ return val ? val : slot_default; } -static void printSlot (File *f, DOH const *slotval, DOH const *slotname, DOH const *functype = NULL, bool comma=true) { - if (functype) - slotval = NewStringf("(%s) %s", functype, slotval); +static void printSlot(File *f, const String *slotval, const char *slotname, const char *functype = NULL, bool comma=true) { + String *slotval_override = functype ? NewStringf("(%s) %s", functype, slotval) : 0; + if (slotval_override) + slotval = slotval_override; int len = Len(slotval); int fieldwidth = len > 40 ? 0 : 40 - len; Printf(f, " %s%s%*s/* %s */\n", slotval, comma ? "," : "", fieldwidth, "", slotname); - if (functype) - Delete((DOH*) slotval); + Delete(slotval_override); } static String *getClosure(String *functype, String *wrapper, int funpack = 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |