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

Bugfix for Javascript generator: avoid duplicate action code generation.

Browse source
This commit is contained in:
Oliver Buchtala 2013-09-12 05:09:35 +03:00
commit 8bf95c4356
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Modules/javascript.cxx
View file

@ -791,12 +791,15 @@ int JSEmitter::emitCtor(Node *n) {
ParmList *params = Getattr(n, "parms"); ParmList *params = Getattr(n, "parms");
emit_parameter_variables(params, wrapper); emit_parameter_variables(params, wrapper);
emit_attach_parmmaps(params, wrapper); emit_attach_parmmaps(params, wrapper);
// HACK: in test-case `ignore_parameter` emit_attach_parmmaps generated an extra line of applied typemap.
// Deleting wrapper->code here, to reset, and as it seemed to have no side effect elsewhere
Delete(wrapper->code);
wrapper->code = NewString("");
Printf(wrapper->locals, "%sresult;", SwigType_str(Getattr(n, "type"), 0)); Printf(wrapper->locals, "%sresult;", SwigType_str(Getattr(n, "type"), 0));
String *action = emit_action(n);
marshalInputArgs(n, params, wrapper, Ctor, true, false); marshalInputArgs(n, params, wrapper, Ctor, true, false);
String *action = emit_action(n);
Printv(wrapper->code, action, "\n", 0); Printv(wrapper->code, action, "\n", 0);
emitCleanupCode(n, wrapper, params); emitCleanupCode(n, wrapper, params);
@ -1049,13 +1052,14 @@ int JSEmitter::emitConstant(Node *n) {
Setattr(n, "wrap:name", wrap_name); Setattr(n, "wrap:name", wrap_name);
// prepare code part // prepare code part
String *action = NewString("");
String *value = Getattr(n, "rawval"); String *value = Getattr(n, "rawval");
if (value == NULL) { if (value == NULL) {
value = Getattr(n, "rawvalue"); value = Getattr(n, "rawvalue");
if (value == NULL) value = Getattr(n, "value"); if (value == NULL) value = Getattr(n, "value");
} }
assert(value != NULL); assert(value != NULL);
String *action = NewString("");
marshalOutput(n, wrapper, action, value, false); marshalOutput(n, wrapper, action, value, false);
t_getter.replace("$jswrapper", wrap_name) t_getter.replace("$jswrapper", wrap_name)
@ -1091,9 +1095,13 @@ int JSEmitter::emitFunction(Node *n, bool is_member, bool is_static) {
emit_parameter_variables(params, wrapper); emit_parameter_variables(params, wrapper);
emit_attach_parmmaps(params, wrapper); emit_attach_parmmaps(params, wrapper);
// prepare code part // HACK: in test-case `ignore_parameter` emit_attach_parmmaps generated an extra line of applied typemap.
String *action = emit_action(n); // Deleting wrapper->code here, to reset, and as it seemed to have no side effect elsewhere
Delete(wrapper->code);
wrapper->code = NewString("");
marshalInputArgs(n, params, wrapper, Function, is_member, is_static); marshalInputArgs(n, params, wrapper, Function, is_member, is_static);
String *action = emit_action(n);
marshalOutput(n, wrapper, action); marshalOutput(n, wrapper, action);
emitCleanupCode(n, wrapper, params); emitCleanupCode(n, wrapper, params);