XS-MLVP
/
swig
mirror of https://github.com/swig/swig
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Javascript - ignore constructor renaming 

Improve the constructor rename detection and attempts to ignore it.
This has not worked previously, but the recent addition of the
template_templated_constructors testcase resulted in code that did not
compile.

These are the testcases that are affected as they attempt to use a
renamed constructor:
  constructor_rename
  conversion_ns_template
  overload_rename
  template_templated_constructors
This commit is contained in:
William S Fulton 2023-07-24 19:38:13 +01:00
parent eb18619178
commit ad09c09040
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Source/Modules/javascript.cxx
View File

@ -228,6 +228,13 @@ public:
protected:
/**
* Helper function for detecting if the constructor Node does not use a name that matches
* the expected name for a constructor. Occurs when %rename is used for just a constructor
* or %template instantiates a templated constructor with a different name to the class.
*/
bool isRenamedConstructor(Node *n);
/**
* Generates code for a constructor function.
*/
@ -896,8 +903,24 @@ const char *JSEmitter::getSetterTemplate(bool) {
return "js_setter";
}
bool JSEmitter::isRenamedConstructor(Node *n) {
Node *cls = parentNode(n);
if (!Equal(nodeType(cls), "class")) {
cls = parentNode(cls);
assert(Equal(nodeType(cls), "class"));
}
return !Equal(Getattr(n, "constructorHandler:sym:name"), Getattr(cls, "sym:name"));
}
int JSEmitter::emitCtor(Node *n) {
// Constructor renaming does not work in JavaScript.
// This allows us to slip past the unit tests which are broken for all JavaScript backends.
// TODO: fix by correcting the bad constructor name - this is the approach used in the Java module.
if (isRenamedConstructor(n))
return SWIG_ERROR;
Wrapper *wrapper = NewWrapper();
bool is_overloaded = GetFlag(n, "sym:overloaded") != 0;
@ -2983,21 +3006,7 @@ int NAPIEmitter::emitNamespaces() {
}
int NAPIEmitter::emitCtor(Node *n) {
int r;
// Constructor renaming does not work in JavaScript
// This allows us to slip past the unit test which
// is broken for all JavaScript backends
if (GetFlag(n, "sym:overloaded")) {
if (!Getattr(n, "sym:nextSibling")) {
if (GetFlag(state.clazz(), "ctor:dispatcher:emitted")) {
return SWIG_OK;
}
SetFlag(state.clazz(), "ctor:dispatcher:emitted");
}
}
r = JSEmitter::emitCtor(n);
int r = JSEmitter::emitCtor(n);
if (r != SWIG_OK)
return r;