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

Fixes for v8 3.19.2 (0x031902)

Browse source
This commit is contained in:
Richard 2014-08-22 23:42:31 -05:00
commit 6fee208010
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/javascript/v8/javascriptrun.swg
View file

@ -338,9 +338,12 @@ v8::Handle<v8::Value> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, int
v8::Handle<v8::FunctionTemplate> class_templ;
if (ptr == NULL) {
// SWIGV8_ESCAPE(SWIGV8_NULL());
#if (SWIG_V8_VERSION < 0x031903)
SWIGV8_ESCAPE(SWIGV8_NULL());
#else
v8::Local<v8::Primitive> result = SWIGV8_NULL();
SWIGV8_ESCAPE(result);
#endif
}
#if (SWIG_V8_VERSION < 0x031903)
@ -583,15 +586,22 @@ v8::Handle<v8::Value> SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf
* ---------------------------------------------------------------------------*/
SWIGRUNTIME
//v8::Handle<v8::Value> SWIGV8_AppendOutput(v8::Handle<v8::Value> result, v8::Handle<v8::Value> obj) {
#if (SWIG_V8_VERSION < 0x031903)
v8::Handle<v8::Value> SWIGV8_AppendOutput(v8::Handle<v8::Value> result, v8::Handle<v8::Value> obj) {
#else
v8::Handle<v8::Value> SWIGV8_AppendOutput(v8::Local<v8::Value> result, v8::Handle<v8::Value> obj) {
#endif
SWIGV8_HANDLESCOPE_ESC();
if (result->IsUndefined()) {
result = SWIGV8_ARRAY_NEW();
}
//v8::Handle<v8::Array> arr = v8::Handle<v8::Array>::Cast(result);
#if (SWIG_V8_VERSION < 0x031903)
v8::Handle<v8::Array> arr = v8::Handle<v8::Array>::Cast(result);
#else
v8::Local<v8::Array> arr = v8::Local<v8::Array>::Cast(result);
#endif
arr->Set(arr->Length(), obj);
SWIGV8_ESCAPE(arr);

7
Tools/javascript/v8_shell.cxx
View file

@ -282,11 +282,11 @@ v8::Handle<v8::Value> V8Shell::Import(const std::string& module_path)
}
SwigV8ReturnValue V8Shell::Print(const SwigV8Arguments& args) {
SWIGV8_HANDLESCOPE();
bool first = true;
for (int i = 0; i < args.Length(); i++) {
SWIGV8_HANDLESCOPE();
if (first) {
first = false;
} else {
@ -325,6 +325,8 @@ SwigV8ReturnValue V8Shell::Require(const SwigV8Arguments& args) {
}
SwigV8ReturnValue V8Shell::Quit(const SwigV8Arguments& args) {
SWIGV8_HANDLESCOPE();
int exit_code = args[0]->Int32Value();
fflush(stdout);
fflush(stderr);
@ -334,6 +336,7 @@ SwigV8ReturnValue V8Shell::Quit(const SwigV8Arguments& args) {
}
SwigV8ReturnValue V8Shell::Version(const SwigV8Arguments& args) {
SWIGV8_HANDLESCOPE();
SWIGV8_RETURN(SWIGV8_STRING_NEW(v8::V8::GetVersion()));
}