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

Fix bug and regression in javascript namespace generator.

This commit is contained in:
Oliver Buchtala 2014-04-27 00:34:49 +02:00
parent d81fe244e3
commit 7a7faab765
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Examples/test-suite/javascript/nspace_runme.js
View File

@ -48,8 +48,7 @@ var col1 = new nspace.Outer.Inner1.Color();
var col2 = nspace.Outer.Inner2.Color.create(); var col2 = nspace.Outer.Inner2.Color.create();
col2.colors(col1, col1, col2, col2, col2); col2.colors(col1, col1, col2, col2, col2);
// TODO: why isn't it scoped in the namespace??? nspace.Outer.Inner1.namespaceFunction(color);
nspace.namespaceFunction(color);
nspace.Outer.Inner1.namespaceVar = 111; nspace.Outer.Inner1.namespaceVar = 111;
if (nspace.Outer.Inner1.namespaceVar !== 111) { if (nspace.Outer.Inner1.namespaceVar !== 111) {
throw new Error("Failed."); throw new Error("Failed.");

14
Source/Modules/javascript.cxx
View File

@ -1344,7 +1344,8 @@ void JSEmitter::emitCleanupCode(Node *n, Wrapper *wrapper, ParmList *params) {
} }
int JSEmitter::switchNamespace(Node *n) { int JSEmitter::switchNamespace(Node *n) {
// HACK: somehow this gets called when member functions are processed...ignoring // HACK: somehow this gets called for member functions.
// We can safely ignore them, as members are not associated to a namespace (only their class)
if (GetFlag(n, "ismember")) { if (GetFlag(n, "ismember")) {
return SWIG_OK; return SWIG_OK;
} }
@ -1358,13 +1359,12 @@ int JSEmitter::switchNamespace(Node *n) {
} }
if (nspace == NULL) { if (nspace == NULL) {
// enums and constants do not have 'sym:nspace' set // It seems that only classes have 'sym:nspace' set.
// so we try to get the namespace from the qualified name // We try to get the namespace from the qualified name (i.e., everything before the last '::')
if (Equal(Getattr(n, "nodeType"), "enumitem")) { nspace = Swig_scopename_prefix(Getattr(n, "name"));
nspace = Swig_scopename_prefix(Getattr(n, "name"));
}
} }
// If there is not even a scopename prefix then it must be global scope
if (nspace == NULL) { if (nspace == NULL) {
current_namespace = Getattr(namespaces, "::"); current_namespace = Getattr(namespaces, "::");
return SWIG_OK; return SWIG_OK;
@ -2097,7 +2097,7 @@ int V8Emitter::exitFunction(Node *n) {
// Note: a global function is treated like a static function // Note: a global function is treated like a static function
// with the parent being a nspace object instead of class object // with the parent being a nspace object instead of class object
Template t_register = getTemplate("jsv8_register_static_function"); Template t_register = getTemplate("jsv8_register_static_function");
t_register.replace("$jsparent", Getattr(current_namespace, NAME)) t_register.replace("$jsparent", Getattr(current_namespace, NAME_MANGLED))
.replace("$jsname", state.function(NAME)) .replace("$jsname", state.function(NAME))
.replace("$jswrapper", state.function(WRAPPER_NAME)) .replace("$jswrapper", state.function(WRAPPER_NAME))
.trim() .trim()