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

Fix regression in Javascript generator for enums.

Browse source
This commit is contained in:
Oliver Buchtala 2014-04-23 03:46:46 +02:00
commit fe3f00837c
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/Modules/javascript.cxx
View file

@ -48,6 +48,7 @@ bool js_template_enable_debug = false;
#define STATIC_FUNCTIONS "static_functions" #define STATIC_FUNCTIONS "static_functions"
#define STATIC_VARIABLES "static_variables" #define STATIC_VARIABLES "static_variables"
#define HAS_TEMPLATES "has_templates" #define HAS_TEMPLATES "has_templates"
#define FORCE_CPP "force_cpp"
#define RESET true #define RESET true
@ -1110,19 +1111,11 @@ int JSEmitter::emitConstant(Node *n) {
String *iname = Getattr(n, "sym:name"); String *iname = Getattr(n, "sym:name");
String *wname = Swig_name_wrapper(name); String *wname = Swig_name_wrapper(name);
String *rawval = Getattr(n, "rawval"); String *rawval = Getattr(n, "rawval");
String *value; String *value = rawval ? rawval : Getattr(n, "value");
// HACK: there are several cases. // HACK: forcing usage of cppvalue for v8 (which turned out to fix typdef_struct.i, et. al)
// - rawval is set for numerical constants as if (State::IsSet(state.global (FORCE_CPP)) && Getattr(n, "cppvalue") != NULL) {
// #define MS_NOOVERRIDE -1111
// - value is set for
// - cppvalue needs to be used for c++
if (rawval) {
value = rawval;
} else if (Getattr(n, "cppvalue")) {
value = Getattr(n, "cppvalue"); value = Getattr(n, "cppvalue");
} else {
value = Getattr(n, "value");
} }
Template t_getter(getTemplate("js_getter")); Template t_getter(getTemplate("js_getter"));
@ -1919,6 +1912,8 @@ int V8Emitter::initialize(Node *n) {
Swig_register_filebyname("init", f_init); Swig_register_filebyname("init", f_init);
Swig_register_filebyname("post-init", f_post_init); Swig_register_filebyname("post-init", f_post_init);
state.global(FORCE_CPP, NewString("1"));
return SWIG_OK; return SWIG_OK;
} }