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

[Go] Correct goargout typemap when matching multiple parameters.

Browse source
This commit is contained in:
Ian Lance Taylor 2015-03-16 11:45:15 -07:00
commit baf1fe036a
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/Modules/go.cxx
View file

@ -1353,7 +1353,7 @@ private:
Delete(ret_type); Delete(ret_type);
} }
goargout(info->parms, parm_count); goargout(info->parms);
if (SwigType_type(info->result) != T_VOID) { if (SwigType_type(info->result) != T_VOID) {
String *goout = goTypemapLookup("goout", info->n, "swig_r"); String *goout = goTypemapLookup("goout", info->n, "swig_r");
@ -1945,7 +1945,7 @@ private:
Printv(f_go_wrappers, call, NULL); Printv(f_go_wrappers, call, NULL);
Delete(call); Delete(call);
goargout(parms, parm_count); goargout(parms);
if (need_return_var) { if (need_return_var) {
if (goout == NULL) { if (goout == NULL) {
@ -2487,18 +2487,17 @@ private:
* property with the name to use to refer to that parameter. * property with the name to use to refer to that parameter.
* ----------------------------------------------------------------------- */ * ----------------------------------------------------------------------- */
void goargout(ParmList *parms, int parm_count) { void goargout(ParmList *parms) {
Parm *p = parms; Parm *p = parms;
for (int i = 0; i < parm_count; ++i) { while (p) {
p = getParm(p); String *tm = Getattr(p, "tmap:goargout");
String *tm = goGetattr(p, "tmap:goargout");
if (!tm) { if (!tm) {
p = nextSibling(p); p = nextSibling(p);
} else { } else {
tm = Copy(tm); tm = Copy(tm);
Replaceall(tm, "$result", "swig_r"); Replaceall(tm, "$result", "swig_r");
Replaceall(tm, "$input", Getattr(p, "emit:goinput")); Replaceall(tm, "$input", Getattr(p, "emit:goinput"));
Printv(f_go_wrappers, tm, NULL); Printv(f_go_wrappers, tm, "\n", NULL);
Delete(tm); Delete(tm);
p = Getattr(p, "tmap:goargout:next"); p = Getattr(p, "tmap:goargout:next");
} }
@ -4456,7 +4455,7 @@ private:
Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL); Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL);
} }
goargout(parms, parm_count); goargout(parms);
if (SwigType_type(result) != T_VOID) { if (SwigType_type(result) != T_VOID) {
if (goout == NULL) { if (goout == NULL) {
@ -4758,7 +4757,7 @@ private:
Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL); Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL);
} }
goargout(parms, parm_count); goargout(parms);
if (SwigType_type(result) != T_VOID) { if (SwigType_type(result) != T_VOID) {
if (goout == NULL) { if (goout == NULL) {