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

$arg and $input were incorrectly substituted in the argout typemap

Browse source 
when two or more arguments were present.

Closes #1559
This commit is contained in:
William S Fulton 2019-06-28 08:09:47 +01:00
commit b58995c89e
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -7,6 +7,10 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
Version 4.0.1 (in progress) Version 4.0.1 (in progress)
=========================== ===========================
2019-06-28: wsfulton
[MzScheme, OCaml] #1559 $arg and $input were incorrectly substituted in the
argout typemap when two or more arguments were present.
2019-06-24: wsfulton 2019-06-24: wsfulton
[Python, Ruby] #1538 Remove the UnknownExceptionHandler class in order to be [Python, Ruby] #1538 Remove the UnknownExceptionHandler class in order to be
C++17 compliant as it uses std::unexpected_handler which was removed in C++17. C++17 compliant as it uses std::unexpected_handler which was removed in C++17.

6
Source/Modules/mzscheme.cxx
View file

@ -221,7 +221,6 @@ public:
Wrapper *f = NewWrapper(); Wrapper *f = NewWrapper();
String *proc_name = NewString(""); String *proc_name = NewString("");
String *source = NewString("");
String *target = NewString(""); String *target = NewString("");
String *arg = NewString(""); String *arg = NewString("");
String *cleanup = NewString(""); String *cleanup = NewString("");
@ -312,10 +311,9 @@ public:
String *ln = Getattr(p, "lname"); String *ln = Getattr(p, "lname");
// Produce names of source and target // Produce names of source and target
Clear(source);
Clear(target); Clear(target);
Clear(arg); Clear(arg);
Printf(source, "argv[%d]", i); String *source = NewStringf("argv[%d]", i);
Printf(target, "%s", ln); Printf(target, "%s", ln);
Printv(arg, Getattr(p, "name"), NIL); Printv(arg, Getattr(p, "name"), NIL);
@ -339,6 +337,7 @@ public:
if (i >= numreq) { if (i >= numreq) {
Printf(f->code, "}\n"); Printf(f->code, "}\n");
} }
Delete(source);
} }
/* Insert constraint checking code */ /* Insert constraint checking code */
@ -465,7 +464,6 @@ public:
} }
Delete(proc_name); Delete(proc_name);
Delete(source);
Delete(target); Delete(target);
Delete(arg); Delete(arg);
Delete(outarg); Delete(outarg);

6
Source/Modules/ocaml.cxx
View file

@ -473,7 +473,6 @@ public:
Wrapper *f = NewWrapper(); Wrapper *f = NewWrapper();
String *proc_name = NewString(""); String *proc_name = NewString("");
String *source = NewString("");
String *target = NewString(""); String *target = NewString("");
String *arg = NewString(""); String *arg = NewString("");
String *cleanup = NewString(""); String *cleanup = NewString("");
@ -580,10 +579,9 @@ public:
pt = SwigType_typedef_qualified(pt); pt = SwigType_typedef_qualified(pt);
// Produce names of source and target // Produce names of source and target
Clear(source);
Clear(target); Clear(target);
Clear(arg); Clear(arg);
Printf(source, "caml_list_nth(args,%d)", i); String *source = NewStringf("caml_list_nth(args,%d)", i);
Printf(target, "%s", ln); Printf(target, "%s", ln);
Printv(arg, Getattr(p, "name"), NIL); Printv(arg, Getattr(p, "name"), NIL);
@ -607,6 +605,7 @@ public:
if (i >= numreq) { if (i >= numreq) {
Printf(f->code, "}\n"); Printf(f->code, "}\n");
} }
Delete(source);
} }
/* Insert constraint checking code */ /* Insert constraint checking code */
@ -787,7 +786,6 @@ public:
Printf(f_mlibody, "val %s : c_obj -> c_obj\n", mangled_name); Printf(f_mlibody, "val %s : c_obj -> c_obj\n", mangled_name);
Delete(proc_name); Delete(proc_name);
Delete(source);
Delete(target); Delete(target);
Delete(arg); Delete(arg);
Delete(outarg); Delete(outarg);