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

Python -builtin %rename constructor refactor

Browse source 
The implementation for a renamed constructor for -builtin no longer
uses the same implementation for non-builtin mode which makes a call
into the compiled C module, eg _constructor_rename for a module called
constructor_rename. The output in the constructor_rename.py file is now:

  RenamedConstructor = new_RenamedConstructor

instead of

  def RenamedConstructor():
      val = _constructor_rename.new_RenamedConstructor()
      return val

when wrapping:

  struct Foo {
      %rename(RenamedConstructor) Foo();
      Foo() {}
  };

See the constructor_rename.i testcase.

This change has been made to make the wrapper more efficient and is a
step towards the next commit which will remove duplicating the symbols
in both the pure Python module and implementation C module
(constructor_rename and _constructor_rename respectively in this case).
This commit is contained in:
William S Fulton 2018-11-28 08:06:05 +00:00
commit b380de031e
1 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Source/Modules/python.cxx
View file

@ -2599,6 +2599,7 @@ public:
builtin_self = false; builtin_self = false;
else else
builtin_ctor = true; builtin_ctor = true;
Delete(mrename);
} }
bool director_class = (getCurrentClass() && Swig_directorclass(getCurrentClass())); bool director_class = (getCurrentClass() && Swig_directorclass(getCurrentClass()));
bool add_self = builtin_self && (!builtin_ctor || director_class); bool add_self = builtin_self && (!builtin_ctor || director_class);
@ -4727,11 +4728,12 @@ public:
Delete(cname); Delete(cname);
} }
String *subfunc = Swig_name_construct(NSPACE_TODO, symname);
if (!have_constructor && handled_as_init) { if (!have_constructor && handled_as_init) {
if (!builtin) { if (!builtin) {
if (Getattr(n, "feature:shadow")) { if (Getattr(n, "feature:shadow")) {
String *pycode = indent_pythoncode(Getattr(n, "feature:shadow"), tab4, Getfile(n), Getline(n), "%feature(\"shadow\")"); String *pycode = indent_pythoncode(Getattr(n, "feature:shadow"), tab4, Getfile(n), Getline(n), "%feature(\"shadow\")");
String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(NSPACE_TODO, symname)); String *pyaction = NewStringf("%s.%s", module, subfunc);
Replaceall(pycode, "$action", pyaction); Replaceall(pycode, "$action", pyaction);
Delete(pyaction); Delete(pyaction);
Printv(f_shadow, pycode, "\n", NIL); Printv(f_shadow, pycode, "\n", NIL);
@ -4761,7 +4763,7 @@ public:
if (have_pythonprepend(n)) if (have_pythonprepend(n))
Printv(f_shadow, indent_pythoncode(pythonprepend(n), tab8, Getfile(n), Getline(n), "%pythonprepend or %feature(\"pythonprepend\")"), "\n", NIL); Printv(f_shadow, indent_pythoncode(pythonprepend(n), tab8, Getfile(n), Getline(n), "%pythonprepend or %feature(\"pythonprepend\")"), "\n", NIL);
Printv(f_shadow, pass_self, NIL); Printv(f_shadow, pass_self, NIL);
Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self, ", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), ")\n", NIL); Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self, ", funcCall(subfunc, callParms), ")\n", NIL);
if (have_pythonappend(n)) if (have_pythonappend(n))
Printv(f_shadow, indent_pythoncode(pythonappend(n), tab8, Getfile(n), Getline(n), "%pythonappend or %feature(\"pythonappend\")"), "\n\n", NIL); Printv(f_shadow, indent_pythoncode(pythonappend(n), tab8, Getfile(n), Getline(n), "%pythonappend or %feature(\"pythonappend\")"), "\n\n", NIL);
Delete(pass_self); Delete(pass_self);
@ -4771,39 +4773,36 @@ public:
} else { } else {
/* Hmmm. We seem to be creating a different constructor. We're just going to create a /* Hmmm. We seem to be creating a different constructor. We're just going to create a
function for it. */ function for it. */
if (Getattr(n, "feature:shadow")) { if (!builtin) {
String *pycode = indent_pythoncode(Getattr(n, "feature:shadow"), "", Getfile(n), Getline(n), "%feature(\"shadow\")"); if (Getattr(n, "feature:shadow")) {
String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(NSPACE_TODO, symname)); String *pycode = indent_pythoncode(Getattr(n, "feature:shadow"), "", Getfile(n), Getline(n), "%feature(\"shadow\")");
Replaceall(pycode, "$action", pyaction); String *pyaction = NewStringf("%s.%s", module, subfunc);
Delete(pyaction); Replaceall(pycode, "$action", pyaction);
Printv(f_shadow_stubs, pycode, "\n", NIL); Delete(pyaction);
Delete(pycode); Printv(f_shadow_stubs, pycode, "\n", NIL);
} else { Delete(pycode);
String *parms = make_pyParmList(n, false, false, allow_kwargs); } else {
String *callParms = make_pyParmList(n, false, true, allow_kwargs); String *parms = make_pyParmList(n, false, false, allow_kwargs);
String *callParms = make_pyParmList(n, false, true, allow_kwargs);
Printv(f_shadow_stubs, "\ndef ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL); Printv(f_shadow_stubs, "\ndef ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL);
if (have_docstring(n)) if (have_docstring(n))
Printv(f_shadow_stubs, tab4, docstring(n, AUTODOC_CTOR, tab4), "\n", NIL); Printv(f_shadow_stubs, tab4, docstring(n, AUTODOC_CTOR, tab4), "\n", NIL);
if (have_pythonprepend(n)) if (have_pythonprepend(n))
Printv(f_shadow_stubs, indent_pythoncode(pythonprepend(n), tab4, Getfile(n), Getline(n), "%pythonprepend or %feature(\"pythonprepend\")"), "\n", NIL); Printv(f_shadow_stubs, indent_pythoncode(pythonprepend(n), tab4, Getfile(n), Getline(n), "%pythonprepend or %feature(\"pythonprepend\")"), "\n", NIL);
String *subfunc = NULL; Printv(f_shadow_stubs, tab4, "val = ", funcCall(subfunc, callParms), "\n", NIL);
/*
if (builtin)
subfunc = Copy(Getattr(getCurrentClass(), "sym:name"));
else
*/
subfunc = Swig_name_construct(NSPACE_TODO, symname);
Printv(f_shadow_stubs, tab4, "val = ", funcCall(subfunc, callParms), "\n", NIL);
#ifdef USE_THISOWN #ifdef USE_THISOWN
Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL); Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL);
#endif #endif
if (have_pythonappend(n)) if (have_pythonappend(n))
Printv(f_shadow_stubs, indent_pythoncode(pythonappend(n), tab4, Getfile(n), Getline(n), "%pythonappend or %feature(\"pythonappend\")"), "\n", NIL); Printv(f_shadow_stubs, indent_pythoncode(pythonappend(n), tab4, Getfile(n), Getline(n), "%pythonappend or %feature(\"pythonappend\")"), "\n", NIL);
Printv(f_shadow_stubs, tab4, "return val\n", NIL); Printv(f_shadow_stubs, tab4, "return val\n", NIL);
Delete(subfunc); }
} else {
Printf(f_shadow_stubs, "%s = %s\n", symname, subfunc);
} }
} }
Delete(subfunc);
} }
} }
return SWIG_OK; return SWIG_OK;