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

Fix issue with strange constants under OSX.

Browse source 
Receiving strange constant nodes before the real tree
under OSX 10.8. Not so under Ubuntu 12.04.
This commit is contained in:
Oliver Buchtala 2014-02-25 20:16:15 +01:00
commit 15550dab45
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/Modules/javascript.cxx
View file

@ -33,6 +33,7 @@ bool js_template_enable_debug = false;
#define MEMBER_FUNCTIONS "member_functions" #define MEMBER_FUNCTIONS "member_functions"
#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 RESET true #define RESET true
@ -600,6 +601,9 @@ JSEmitter::~JSEmitter() {
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
int JSEmitter::registerTemplate(const String *name, const String *code) { int JSEmitter::registerTemplate(const String *name, const String *code) {
if (!State::IsSet(state.global(HAS_TEMPLATES))) {
SetFlag(state.global(), HAS_TEMPLATES);
}
return Setattr(templates, name, code); return Setattr(templates, name, code);
} }
@ -1067,6 +1071,13 @@ int JSEmitter::emitSetter(Node *n, bool is_member, bool is_static) {
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
int JSEmitter::emitConstant(Node *n) { int JSEmitter::emitConstant(Node *n) {
// HACK: somehow it happened under OSX that before everything started
// a lot of SWIG internal constants were emitted
// This didn't happen on Ubuntu Precise...
// so we
if (!State::IsSet(state.global(HAS_TEMPLATES))) {
return SWIG_ERROR;
}
Wrapper *wrapper = NewWrapper(); Wrapper *wrapper = NewWrapper();
SwigType *type = Getattr(n, "type"); SwigType *type = Getattr(n, "type");