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

Merge branch 'devel' of git://github.com/oliver----/swig-v8 into devel

Browse source 
Conflicts:
	Lib/javascript/v8/javascriptcode.swg
This commit is contained in:
Oliver Buchtala 2013-08-31 03:47:08 +02:00
commit 306b265af9
13 changed files with 235 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/Modules/javascript.cxx
View file

@ -553,11 +553,13 @@ void JAVASCRIPT::main(int argc, char *argv[]) {
case JSEmitter::V8:
{
emitter = swig_javascript_create_V8Emitter();
Preprocessor_define("SWIG_JAVASCRIPT_V8 1", 0);
break;
}
case JSEmitter::JavascriptCore:
{
emitter = swig_javascript_create_JSCEmitter();
Preprocessor_define("SWIG_JAVASCRIPT_JSC 1", 0);
break;
}
case JSEmitter::QtScript:
@ -667,7 +669,6 @@ int JSEmitter::initialize(Node *n) {
namespaces = NewHash();
Hash *global_namespace;
if(State::IsSet(state.global(FLAG_NO_MODULE_OBJECT))) {
Printf(stdout, "AAAAAAAAAAAAAAAAAAAAAAAAAAA");
global_namespace = createNamespaceEntry("global", 0);
} else {
global_namespace = createNamespaceEntry(Char(Getattr(n, "name")), "global");