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

Bugfix Javascript generator: valid name for dispatcher functions.

Browse source
This commit is contained in:
Oliver Buchtala 2013-09-12 05:10:23 +02:00
commit acfed20eba
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Source/Modules/javascript.cxx
View file

@ -1146,21 +1146,17 @@ int JSEmitter::emitFunctionDispatcher(Node *n, bool /*is_member */ ) {
} while ((sibl = Getattr(sibl, "sym:nextSibling"))); } while ((sibl = Getattr(sibl, "sym:nextSibling")));
Template t_function(getTemplate("js_function_dispatcher")); Template t_function(getTemplate("js_function_dispatcher"));
// String *wrap_name = Swig_name_wrapper(Getattr(n, "name")); // Note: this dispatcher function gets called after the last overloaded function has been created.
// At this time, n.wrap:name contains the name of the last wrapper function.
// To get a valid function name for the dispatcher function we take the last wrapper name and
String *fun_name = Getattr(n, "sym:name"); // substract the extension "sym:overname",
String *wrap_name = NewString(Getattr(n, "wrap:name"));
Node *methodclass = Swig_methodclass(n); String *overname = Getattr(n, "sym:overname");
String *class_name = Getattr(methodclass, "sym:name"); int l1 = Len(wrap_name);
int l2 = Len(overname);
String *new_string = NewStringf("%s_%s", class_name, fun_name); Delslice(wrap_name, l1-l2, l1);
String *wrap_name = Swig_name_wrapper(new_string);
Setattr(n, "wrap:name", wrap_name); Setattr(n, "wrap:name", wrap_name);
state.function(WRAPPER_NAME, wrap_name); state.function(WRAPPER_NAME, wrap_name);