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

Fix a bug where anonymous arguments were misnumbered when used in constructors

Browse source
This commit is contained in:
Alec Woods 2019-01-13 10:49:58 -05:00
commit 97a624f360
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Modules/python.cxx
View file

@ -2153,7 +2153,7 @@ public:
* Generate parameter list for Python functions or methods, * Generate parameter list for Python functions or methods,
* reuse make_autodocParmList() to do so. * reuse make_autodocParmList() to do so.
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
String *make_pyParmList(Node *n, bool in_class, bool is_calling, int kw) { String *make_pyParmList(Node *n, bool in_class, bool is_calling, int kw, bool has_self_for_count = false) {
/* Get the original function for a defaultargs copy, /* Get the original function for a defaultargs copy,
* see default_arguments() in parser.y. */ * see default_arguments() in parser.y. */
Node *nn = Getattr(n, "defaultargs"); Node *nn = Getattr(n, "defaultargs");
@ -2186,7 +2186,7 @@ public:
bool funcanno = py3 ? true : false; bool funcanno = py3 ? true : false;
String *params = NewString(""); String *params = NewString("");
String *_params = make_autodocParmList(n, false, (in_class? 2 : 1), is_calling, funcanno); String *_params = make_autodocParmList(n, false, ((in_class || has_self_for_count)? 2 : 1), is_calling, funcanno);
if (in_class) { if (in_class) {
Printf(params, "self"); Printf(params, "self");
@ -4785,7 +4785,7 @@ public:
String *parms = make_pyParmList(n, true, false, allow_kwargs); String *parms = make_pyParmList(n, true, false, allow_kwargs);
/* Pass 'self' only if using director */ /* Pass 'self' only if using director */
String *callParms = make_pyParmList(n, false, true, allow_kwargs); String *callParms = make_pyParmList(n, false, true, allow_kwargs, true);
if (use_director) { if (use_director) {
Insert(callParms, 0, "_self, "); Insert(callParms, 0, "_self, ");