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

Refactor: add parentheses in get_wrapper_func_proto() itself

Browse source 
Return the prototype strings already surrounded by parentheses instead of
having to add them in the caller.

No real changes.
This commit is contained in:
Vadim Zeitlin 2016-04-21 18:37:08 +02:00
commit e2738ad524
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/Modules/c.cxx
View file

@ -791,7 +791,7 @@ ready:
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* get_wrapper_func_proto() * get_wrapper_func_proto()
* *
* Return the function signature, i.e. the comma-separated list of argument types and names. * Return the function signature, i.e. the comma-separated list of argument types and names surrounded by parentheses.
* If a non-null wrapper is specified, it is used to emit typemap-defined code in it and it also determines whether we're generating the prototype for the * If a non-null wrapper is specified, it is used to emit typemap-defined code in it and it also determines whether we're generating the prototype for the
* declarations or the definitions, which changes the type used for the C++ objects. * declarations or the definitions, which changes the type used for the C++ objects.
* ---------------------------------------------------------------------- */ * ---------------------------------------------------------------------- */
@ -800,7 +800,7 @@ ready:
ParmList *parms = Getattr(n, "parms"); ParmList *parms = Getattr(n, "parms");
Parm *p; Parm *p;
String *proto = NewString(""); String *proto = NewString("(");
int gencomma = 0; int gencomma = 0;
// attach the standard typemaps // attach the standard typemaps
@ -885,6 +885,8 @@ ready:
Delete(arg_name); Delete(arg_name);
Delete(c_parm_type); Delete(c_parm_type);
} }
Printv(proto, ")", NIL);
return proto; return proto;
} }
@ -905,7 +907,7 @@ ready:
String *wrapper_call = NewString(""); String *wrapper_call = NewString("");
// add function declaration to the proxy header file // add function declaration to the proxy header file
Printv(f_wrappers_decl, preturn_type, " ", wname, "(", pproto, ");\n\n", NIL); Printv(f_wrappers_decl, preturn_type, " ", wname, pproto, ";\n\n", NIL);
if (is_global) { if (is_global) {
if (!f_wrappers_aliases) { if (!f_wrappers_aliases) {
@ -956,10 +958,9 @@ ready:
} }
// create wrapper function prototype // create wrapper function prototype
Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, "(", NIL); Printv(wrapper->def, "SWIGEXPORTC ", return_type, " ", wname, NIL);
Printv(wrapper->def, (DOH*)scoped_dohptr(get_wrapper_func_proto(n, wrapper)), NIL); Printv(wrapper->def, (DOH*)scoped_dohptr(get_wrapper_func_proto(n, wrapper)), NIL);
Printv(wrapper->def, ")", NIL);
Printv(wrapper->def, " {", NIL); Printv(wrapper->def, " {", NIL);
if (Cmp(nodeType(n), "destructor") != 0) { if (Cmp(nodeType(n), "destructor") != 0) {