jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eliminate dead director code and convert remaining blocks

Browse source
This commit is contained in:
Robert Stone 2013-11-13 12:38:04 -08:00
commit 7d80d9b59e
2 changed files with 23 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

127
Lib/perl5/director.swg
View file

@ -17,41 +17,6 @@
#include <map> #include <map>
/*
Use -DSWIG_PYTHON_DIRECTOR_NO_VTABLE if you don't want to generate a 'virtual
table', and avoid multiple GetAttr calls to retrieve the python
methods.
*/
#ifndef SWIG_PERL_DIRECTOR_NO_VTABLE
#ifndef SWIG_PERL_DIRECTOR_VTABLE
#define SWIG_PERL_DIRECTOR_VTABLE
#endif
#endif
/*
Use -DSWIG_DIRECTOR_NO_UEH if you prefer to avoid the use of the
Undefined Exception Handler provided by swig.
*/
#ifndef SWIG_DIRECTOR_NO_UEH
#ifndef SWIG_DIRECTOR_UEH
#define SWIG_DIRECTOR_UEH
#endif
#endif
/*
Use -DSWIG_DIRECTOR_STATIC if you prefer to avoid the use of the
'Swig' namespace. This could be useful for multi-modules projects.
*/
#ifdef SWIG_DIRECTOR_STATIC
/* Force anonymous (static) namespace */
#define Swig
#endif
/* /*
Use -DSWIG_DIRECTOR_NORTTI if you prefer to avoid the use of the Use -DSWIG_DIRECTOR_NORTTI if you prefer to avoid the use of the
native C++ RTTI and dynamic_cast<>. But be aware that directors native C++ RTTI and dynamic_cast<>. But be aware that directors
@ -267,77 +232,6 @@ namespace Swig {
throw DirectorPureVirtualException(name); throw DirectorPureVirtualException(name);
} }
}; };
// /* unknown exception handler */
// class UnknownExceptionHandler
// {
//#ifdef SWIG_DIRECTOR_UEH
// static void handler() {
// try {
// throw;
// } catch (DirectorException& e) {
// std::cerr << "SWIG Director exception caught:" << std::endl
// << e.getMessage() << std::endl;
// } catch (std::exception& e) {
// std::cerr << "std::exception caught: "<< e.what() << std::endl;
// } catch (...) {
// std::cerr << "Unknown exception caught." << std::endl;
// }
//
// //std::cerr << std::endl
// // << "Python interpreter traceback:" << std::endl;
// //PyErr_Print();
// //std::cerr << std::endl;
//
// std::cerr << "This exception was caught by the SWIG unexpected exception handler." << std::endl
// << "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl
// << std::endl
// << "Exception is being re-thrown, program will likely abort/terminate." << std::endl;
// throw;
// }
//
// public:
//
// std::unexpected_handler old;
// UnknownExceptionHandler(std::unexpected_handler nh = handler)
// {
// old = std::set_unexpected(nh);
// }
//
// ~UnknownExceptionHandler()
// {
// std::set_unexpected(old);
// }
//#endif
// };
#if defined(SWIG_PYTHON_THREADS)
/* __THREAD__ is the old macro to activate some thread support */
# if !defined(__THREAD__)
# define __THREAD__ 1
# endif
#endif
#ifdef __THREAD__
# include "pythread.h"
class Guard
{
PyThread_type_lock & mutex_;
public:
Guard(PyThread_type_lock & mutex) : mutex_(mutex)
{
PyThread_acquire_lock(mutex_, WAIT_LOCK);
}
~Guard()
{
PyThread_release_lock(mutex_);
}
};
# define SWIG_GUARD(mutex) Guard _guard(mutex)
#else
# define SWIG_GUARD(mutex)
#endif
/* director base class */ /* director base class */
class Director { class Director {
@ -410,16 +304,12 @@ namespace Swig {
private: private:
typedef std::map<void*, GCItem_var> swig_ownership_map; typedef std::map<void*, GCItem_var> swig_ownership_map;
mutable swig_ownership_map swig_owner; mutable swig_ownership_map swig_owner;
#ifdef __THREAD__
static PyThread_type_lock swig_mutex_own;
#endif
public: public:
template <typename Type> template <typename Type>
void swig_acquire_ownership_array(Type *vptr) const void swig_acquire_ownership_array(Type *vptr) const
{ {
if (vptr) { if (vptr) {
SWIG_GUARD(swig_mutex_own);
swig_owner[vptr] = new GCArray_T<Type>(vptr); swig_owner[vptr] = new GCArray_T<Type>(vptr);
} }
} }
@ -428,7 +318,6 @@ namespace Swig {
void swig_acquire_ownership(Type *vptr) const void swig_acquire_ownership(Type *vptr) const
{ {
if (vptr) { if (vptr) {
SWIG_GUARD(swig_mutex_own);
swig_owner[vptr] = new GCItem_T<Type>(vptr); swig_owner[vptr] = new GCItem_T<Type>(vptr);
} }
} }
@ -436,7 +325,6 @@ namespace Swig {
void swig_acquire_ownership_obj(void *vptr, int own) const void swig_acquire_ownership_obj(void *vptr, int own) const
{ {
if (vptr && own) { if (vptr && own) {
SWIG_GUARD(swig_mutex_own);
swig_owner[vptr] = new GCItem_Object(own); swig_owner[vptr] = new GCItem_Object(own);
} }
} }
@ -445,7 +333,6 @@ namespace Swig {
{ {
int own = 0; int own = 0;
if (vptr) { if (vptr) {
SWIG_GUARD(swig_mutex_own);
swig_ownership_map::iterator iter = swig_owner.find(vptr); swig_ownership_map::iterator iter = swig_owner.find(vptr);
if (iter != swig_owner.end()) { if (iter != swig_owner.end()) {
own = iter->second->get_own(); own = iter->second->get_own();
@ -455,22 +342,8 @@ namespace Swig {
return own; return own;
} }
//template <typename Type>
//static PyObject* swig_pyobj_disown(PyObject *pyobj, PyObject *SWIGUNUSEDPARM(args))
//{
// SwigPyObject *sobj = (SwigPyObject *)pyobj;
// sobj->own = 0;
// Director *d = SWIG_DIRECTOR_CAST(reinterpret_cast<Type *>(sobj->ptr));
// if (d)
// d->swig_disown();
// return PyWeakref_NewProxy(pyobj, NULL);
//}
}; };
#ifdef __THREAD__
PyThread_type_lock Director::swig_mutex_own = PyThread_allocate_lock();
#endif
} }
#endif /* __cplusplus */ #endif /* __cplusplus */

100
Source/Modules/perl5.cxx
View file

@ -1707,12 +1707,8 @@ public:
String *saved_nc = none_comparison; String *saved_nc = none_comparison;
none_comparison = NewStringf("strcmp(SvPV_nolen(ST(0)), \"%s::%s\") != 0", module, class_name); none_comparison = NewStringf("strcmp(SvPV_nolen(ST(0)), \"%s::%s\") != 0", module, class_name);
String *saved_director_prot_ctor_code = director_prot_ctor_code; String *saved_director_prot_ctor_code = director_prot_ctor_code;
director_prot_ctor_code = NewStringf( director_prot_ctor_code = NewStringf( "if ($comparison) { /* subclassed */\n" " $director_new\n" "} else {\n" "
"if ($comparison) { /* subclassed */\n" SWIG_exception_fail(SWIG_RuntimeError, \"accessing abstract class or protected constructor\");\n" "}\n");
" $director_new\n"
"} else {\n"
" SWIG_exception_fail(SWIG_RuntimeError, \"accessing abstract class or protected constructor\");\n"
"}\n");
Language::constructorHandler(n); Language::constructorHandler(n);
Delete(none_comparison); Delete(none_comparison);
none_comparison = saved_nc; none_comparison = saved_nc;
@ -2084,7 +2080,6 @@ public:
int status = SWIG_OK; int status = SWIG_OK;
int idx; int idx;
bool ignored_method = GetFlag(n, "feature:ignore") ? true : false; bool ignored_method = GetFlag(n, "feature:ignore") ? true : false;
int addfail = 0;
if (Cmp(storage, "virtual") == 0) { if (Cmp(storage, "virtual") == 0) {
if (Cmp(value, "0") == 0) { if (Cmp(value, "0") == 0) {
@ -2157,11 +2152,6 @@ public:
} }
} }
//if (builtin) {
// Printv(w->code, "PyObject *self = NULL;\n", NIL);
// Printv(w->code, "(void)self;\n", NIL);
//}
if (ignored_method) { if (ignored_method) {
if (!pure_virtual) { if (!pure_virtual) {
if (!is_void) if (!is_void)
@ -2175,7 +2165,6 @@ public:
} }
} else { } else {
/* attach typemaps to arguments (C/C++ -> Perl) */ /* attach typemaps to arguments (C/C++ -> Perl) */
String *arglist = NewString("");
String *parse_args = NewString(""); String *parse_args = NewString("");
String *pstack = NewString(""); String *pstack = NewString("");
@ -2211,7 +2200,6 @@ public:
/* build argument list and type conversion string */ /* build argument list and type conversion string */
idx = 0; idx = 0;
p = l; p = l;
int use_parse = 0;
while (p) { while (p) {
if (checkAttribute(p, "tmap:in:numinputs", "0")) { if (checkAttribute(p, "tmap:in:numinputs", "0")) {
p = Getattr(p, "tmap:in:next"); p = Getattr(p, "tmap:in:next");
@ -2232,35 +2220,20 @@ public:
String *pname = Getattr(p, "name"); String *pname = Getattr(p, "name");
String *ptype = Getattr(p, "type"); String *ptype = Getattr(p, "type");
Putc(',', arglist);
if ((tm = Getattr(p, "tmap:directorin")) != 0) { if ((tm = Getattr(p, "tmap:directorin")) != 0) {
String *parse = Getattr(p, "tmap:directorin:parse"); sprintf(source, "obj%d", idx++);
if (!parse) { String *input = NewString(source);
sprintf(source, "obj%d", idx++); Setattr(p, "emit:directorinput", input);
String *input = NewString(source); Replaceall(tm, "$input", input);
Setattr(p, "emit:directorinput", input); Delete(input);
Replaceall(tm, "$input", input); Replaceall(tm, "$owner", "0");
Delete(input); Replaceall(tm, "$shadow", "0");
Replaceall(tm, "$owner", "0"); /* Wrapper_add_localv(w, source, "SV *", source, "= 0", NIL); */
Replaceall(tm, "$shadow", "0"); Printv(wrap_args, "SV *", source, ";\n", NIL);
/* Wrapper_add_localv(w, source, "SV *", source, "= 0", NIL); */
Printv(wrap_args, "SV *", source, ";\n", NIL);
Printv(wrap_args, tm, "\n", NIL); Printv(wrap_args, tm, "\n", NIL);
Printv(arglist, "(PyObject *)", source, NIL); Putc('O', parse_args);
Putc('O', parse_args); Printv(pstack, "XPUSHs(", source, ");\n", NIL);
Printv(pstack, "XPUSHs(", source, ");\n", NIL);
} else {
use_parse = 1;
Append(parse_args, parse);
Setattr(p, "emit:directorinput", pname);
Replaceall(tm, "$input", pname);
Replaceall(tm, "$owner", "0");
Replaceall(tm, "$shadow", "0");
if (Len(tm) == 0)
Append(tm, pname);
Append(arglist, tm);
}
p = Getattr(p, "tmap:directorin:next"); p = Getattr(p, "tmap:directorin:next");
continue; continue;
} else if (Cmp(ptype, "void")) { } else if (Cmp(ptype, "void")) {
@ -2303,23 +2276,19 @@ public:
if (target) { if (target) {
String *director = NewStringf("director_%s", mangle); String *director = NewStringf("director_%s", mangle);
Wrapper_add_localv(w, director, "Swig::Director *", director, "= 0", NIL); Wrapper_add_localv(w, director, "Swig::Director *", director, "= 0", NIL);
Wrapper_add_localv(w, source, "swig::SwigVar_PyObject", source, "= 0", NIL); Wrapper_add_localv(w, source, "SV *", source, "= 0", NIL);
Printf(wrap_args, "%s = SWIG_DIRECTOR_CAST(%s);\n", director, nonconst); Printf(wrap_args, "%s = SWIG_DIRECTOR_CAST(%s);\n", director, nonconst);
Printf(wrap_args, "if (!%s) {\n", director); Printf(wrap_args, "if (!%s) {\n", director);
Printf(wrap_args, "%s = SWIG_InternalNewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle); Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
Append(wrap_args, "} else {\n"); Append(wrap_args, "} else {\n");
Printf(wrap_args, "%s = %s->swig_get_self();\n", source, director); Printf(wrap_args, "%s = %s->swig_get_self();\n", source, director);
Printf(wrap_args, "Py_INCREF((PyObject *)%s);\n", source); Printf(wrap_args, "SvREFCNT_inc((SV *)%s);\n", source);
Append(wrap_args, "}\n"); Append(wrap_args, "}\n");
Delete(director); Delete(director);
Printv(arglist, source, NIL);
} else { } else {
Wrapper_add_localv(w, source, "SV *", source, "= 0", NIL); Wrapper_add_localv(w, source, "SV *", source, "= 0", NIL);
Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle); Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE%s, 0);\n", source, nonconst, mangle);
Printf(pstack, "XPUSHs(sv_2mortal(%s));\n", source); Printf(pstack, "XPUSHs(sv_2mortal(%s));\n", source);
//Printf(wrap_args, "%s = SWIG_NewPointerObj(%s, SWIGTYPE_p_%s, 0);\n",
// source, nonconst, base);
Printv(arglist, source, NIL);
} }
Putc('O', parse_args); Putc('O', parse_args);
Delete(mangle); Delete(mangle);
@ -2338,13 +2307,6 @@ public:
/* add the method name as a PyString */ /* add the method name as a PyString */
String *pyname = Getattr(n, "sym:name"); String *pyname = Getattr(n, "sym:name");
//int allow_thread = threads_enable(n);
//
//if (allow_thread) {
// thread_begin_block(n, w->code);
// Append(w->code, "{\n");
//}
/* wrap complex arguments to PyObjects */ /* wrap complex arguments to PyObjects */
Printv(w->code, wrap_args, NIL); Printv(w->code, wrap_args, NIL);
@ -2374,7 +2336,7 @@ public:
Append(w->code, "if (SvTRUE(ERRSV)) {\n"); Append(w->code, "if (SvTRUE(ERRSV)) {\n");
Append(w->code, " PUTBACK;\n FREETMPS;\n LEAVE;\n"); Append(w->code, " PUTBACK;\n FREETMPS;\n LEAVE;\n");
if ((tm) && Len(tm) && (Strcmp(tm, "1") != 0)) { if ((tm) && Len(tm) && (Strcmp(tm, "1") != 0)) {
Replaceall(tm, "$error", "error"); Replaceall(tm, "$error", "ERRSV");
Printv(w->code, Str(tm), "\n", NIL); Printv(w->code, Str(tm), "\n", NIL);
} else { } else {
Printf(w->code, " Swig::DirectorMethodException::raise(ERRSV);\n", classname, pyname); Printf(w->code, " Swig::DirectorMethodException::raise(ERRSV);\n", classname, pyname);
@ -2395,9 +2357,9 @@ public:
String *outarg = NewString(""); String *outarg = NewString("");
if (outputs > 1) { if (outputs > 1) {
Wrapper_add_local(w, "output", "PyObject *output"); Wrapper_add_local(w, "output", "SV *output");
Printf(w->code, "if (!PyTuple_Check(%s)) {\n", Swig_cresult_name()); Printf(w->code, "if (count != %d) {\n", outputs);
Printf(w->code, " Swig::DirectorTypeMismatchException::raise(\"Python method %s.%sfailed to return a tuple.\");\n", classname, pyname); Printf(w->code, " Swig::DirectorTypeMismatchException::raise(\"Perl method %s.%sfailed to return a list.\");\n", classname, pyname);
Append(w->code, "}\n"); Append(w->code, "}\n");
} }
@ -2410,7 +2372,7 @@ public:
tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w); tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w);
if (tm != 0) { if (tm != 0) {
if (outputs > 1) { if (outputs > 1) {
Printf(w->code, "output = PyTuple_GetItem(%s, %d);\n", Swig_cresult_name(), idx++); Printf(w->code, "output = POPs;\n");
Replaceall(tm, "$input", "output"); Replaceall(tm, "$input", "output");
} else { } else {
Replaceall(tm, "$input", Swig_cresult_name()); Replaceall(tm, "$input", Swig_cresult_name());
@ -2425,14 +2387,10 @@ public:
} else { } else {
Replaceall(tm, "$disown", "0"); Replaceall(tm, "$disown", "0");
} }
//if (Getattr(n, "tmap:directorout:implicitconv")) {
// Replaceall(tm, "$implicitconv", get_implicitconv_flag(n));
//}
Replaceall(tm, "$result", "c_result"); Replaceall(tm, "$result", "c_result");
Printv(w->code, tm, "\n", NIL); Printv(w->code, tm, "\n", NIL);
Delete(tm); Delete(tm);
} else { } else {
Swig_print_node(n);
Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number, Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
"Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(returntype, 0), SwigType_namestr(c_classname), "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(returntype, 0), SwigType_namestr(c_classname),
SwigType_namestr(name)); SwigType_namestr(name));
@ -2444,7 +2402,7 @@ public:
for (p = l; p;) { for (p = l; p;) {
if ((tm = Getattr(p, "tmap:directorargout")) != 0) { if ((tm = Getattr(p, "tmap:directorargout")) != 0) {
if (outputs > 1) { if (outputs > 1) {
Printf(w->code, "output = PyTuple_GetItem(%s, %d);\n", Swig_cresult_name(), idx++); Printf(w->code, "output = POPs;\n");
Replaceall(tm, "$result", "output"); Replaceall(tm, "$result", "output");
} else { } else {
Replaceall(tm, "$result", Swig_cresult_name()); Replaceall(tm, "$result", Swig_cresult_name());
@ -2457,14 +2415,7 @@ public:
} }
} }
/* any existing helper functions to handle this? */
//if (allow_thread) {
// Append(w->code, "}\n");
// thread_end_block(n, w->code);
//}
Delete(parse_args); Delete(parse_args);
Delete(arglist);
Delete(cleanup); Delete(cleanup);
Delete(outarg); Delete(outarg);
} }
@ -2487,11 +2438,6 @@ public:
} }
} }
if (addfail) {
Append(w->code, "fail:\n");
Printf(w->code, " Swig::DirectorMethodException::raise(\"Error detected when calling '%s->%s'\");\n", classname, Getattr(n, "sym:name"));
}
Append(w->code, "}\n"); Append(w->code, "}\n");
// We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method // We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method