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

Bugfix for Javascript generator.

Browse source
This commit is contained in:
Oliver Buchtala 2013-09-16 11:46:00 +02:00
commit 0528fd3ac3
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/javascript/v8/javascriptcode.swg
View file

@ -337,7 +337,9 @@ fail:
$jsmangledname_clientData.class_templ.Reset(v8::Isolate::GetCurrent(), $jsmangledname_class); $jsmangledname_clientData.class_templ.Reset(v8::Isolate::GetCurrent(), $jsmangledname_class);
#endif #endif
$jsmangledname_clientData.dtor = $jsdtor; $jsmangledname_clientData.dtor = $jsdtor;
if (SWIGTYPE_$jsmangledtype->clientdata == 0) {
SWIGTYPE_$jsmangledtype->clientdata = &$jsmangledname_clientData; SWIGTYPE_$jsmangledtype->clientdata = &$jsmangledname_clientData;
}
%} %}

11
Source/Modules/javascript.cxx
View file

@ -416,6 +416,10 @@ int JAVASCRIPT::constantWrapper(Node *n) {
if (Equal(Getattr(n, "kind"), "function")) { if (Equal(Getattr(n, "kind"), "function")) {
return SWIG_OK; return SWIG_OK;
} }
// TODO: the emitter for constants must be implemented in a cleaner way
// currently we treat it like a read-only variable
// however, there is a remaining bug with function pointer constants
// which could be fixed with a cleaner approach
emitter->emitConstant(n); emitter->emitConstant(n);
return SWIG_OK; return SWIG_OK;
@ -706,7 +710,8 @@ int JSEmitter::enterClass(Node *n) {
state.clazz(true); state.clazz(true);
state.clazz(NAME, Getattr(n, "sym:name")); state.clazz(NAME, Getattr(n, "sym:name"));
state.clazz(NAME_MANGLED, SwigType_manglestr(Getattr(n, "name"))); //state.clazz(NAME_MANGLED, SwigType_manglestr(Getattr(n, "name")));
state.clazz(NAME_MANGLED, Getattr(n, "sym:name"));
state.clazz(TYPE, NewString(Getattr(n, "classtype"))); state.clazz(TYPE, NewString(Getattr(n, "classtype")));
String *type = SwigType_manglestr(Getattr(n, "classtypeobj")); String *type = SwigType_manglestr(Getattr(n, "classtypeobj"));
@ -1921,7 +1926,9 @@ int V8Emitter::exitClass(Node *n)
/* Note: this makes sure that there is a swig_type added for this class */ /* Note: this makes sure that there is a swig_type added for this class */
String *clientData = NewString(""); String *clientData = NewString("");
Printf(clientData, "&%s_clientData", state.clazz(NAME_MANGLED)); Printf(clientData, "&%s_clientData", state.clazz(NAME_MANGLED));
SwigType_remember_clientdata(state.clazz(TYPE_MANGLED), clientData);
/* Note: this makes sure that there is a swig_type added for this class */
SwigType_remember_clientdata(state.clazz(TYPE_MANGLED), NewString("0"));
// emit definition of v8 class template // emit definition of v8 class template
Template t_def_class = getTemplate("jsv8_define_class_template"); Template t_def_class = getTemplate("jsv8_define_class_template");