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

Added #if defined guard for V8_3_14 to allow users from the original SWIG v8 implementation to continue using the new changes. It works similarly to the BUILDING_NODE_EXTENSION in all but two places. This define must be explicitly set by users because there is no way to auto detect. (Perhaps a command line switch can be added to generate this on request?)

Browse source
This commit is contained in:
Eric Wing 2013-08-07 15:11:49 -07:00 • committed by Oliver Buchtala
commit d5df0bb721
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,14 +112,14 @@ fail:
%fragment ("js_dtor", "templates")
%{
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
void $jswrapper(v8::Persistent< v8::Value > object, void *parameter)
#else
void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object > * object, SWIGV8_Proxy *proxy)
#endif
{
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
#endif
@ -132,7 +132,7 @@ void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object > * object, SWI
delete proxy;
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
object.Clear();
object.Dispose();
#else
@ -281,7 +281,7 @@ fail:
%fragment("jsv8_define_class_template", "templates")
%{
v8::Handle<v8::FunctionTemplate> $jsmangledname_class = SWIGV8_CreateClassTemplate("$jsmangledname");
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
$jsmangledname_clientData.class_templ = v8::Persistent<v8::FunctionTemplate>::New($jsmangledname_class);
#else
$jsmangledname_clientData.class_templ.Reset(v8::Isolate::GetCurrent(), $jsmangledname_class);
@ -300,7 +300,7 @@ fail:
%{
if (SWIGTYPE_p$jsbaseclass->clientdata && !(static_cast<SWIGV8_ClientData *>(SWIGTYPE_p$jsbaseclass->clientdata)->class_templ.IsEmpty()))
{
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
$jsmangledname_class->Inherit(static_cast<SWIGV8_ClientData *>(SWIGTYPE_p$jsbaseclass->clientdata)->class_templ);
#else
$jsmangledname_class->Inherit(
@ -431,7 +431,7 @@ fail:
%{
extern "C" {
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION)
void $jsname_initialize(v8::Handle<v8::Object> global_obj, v8::Handle<v8::Object> /*module*/)
#else
void $jsname_initialize(v8::Handle<v8::Object> global_obj)
@ -443,7 +443,7 @@ void $jsname_initialize(v8::Handle<v8::Object> global_obj)
// a class template for creating proxies of undefined types
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
SWIGV8_SWIGTYPE_Proxy_class_templ = v8::Persistent<v8::FunctionTemplate>::New(SWIGV8_CreateClassTemplate("SwigProxy"));
#else
SWIGV8_SWIGTYPE_Proxy_class_templ.Reset(v8::Isolate::GetCurrent(), SWIGV8_CreateClassTemplate("SwigProxy"));
@ -475,7 +475,7 @@ void $jsname_initialize(v8::Handle<v8::Object> global_obj)
$jsv8registernspaces
}
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION)
NODE_MODULE($jsname, $jsname_initialize);
#endif

18
Lib/javascript/v8/javascriptruntime.swg
View file

@ -74,7 +74,7 @@ public:
};
~SWIGV8_Proxy() {
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
handle.ClearWeak();
#else
handle.ClearWeak(v8::Isolate::GetCurrent());
@ -82,7 +82,7 @@ public:
//handle->SetInternalField(0, v8::Undefined());
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
handle.Dispose();
#else
handle.Dispose(v8::Isolate::GetCurrent());
@ -101,7 +101,7 @@ class SWIGV8_ClientData {
public:
v8::Persistent<v8::FunctionTemplate> class_templ;
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
void (*dtor) (v8::Persistent< v8::Value> object, void *parameter);
#else
void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy);
@ -115,7 +115,7 @@ int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void** ptr, swig_t
if(objRef->InternalFieldCount() < 1) return SWIG_ERROR;
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
v8::Handle<v8::Value> cdataRef = objRef->GetInternalField(0);
SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(v8::External::Unwrap(cdataRef));
#else
@ -142,13 +142,13 @@ int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void** ptr, swig_t
return SWIG_OK;
}
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
void SWIGV8_Proxy_DefaultDtor(v8::Persistent< v8::Value > object, void *parameter)
#else
void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy)
#endif
{
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
#endif
@ -161,7 +161,7 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info
cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0;
cdata->info = info;
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
obj->SetPointerInInternalField(0, cdata);
cdata->handle = v8::Persistent<v8::Object>::New(obj);
#else
@ -169,7 +169,7 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info
cdata->handle.Reset(v8::Isolate::GetCurrent(), obj);
#endif
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
// clientdata must be set for owned data as we need to register the dtor
if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
cdata->handle.MakeWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
@ -202,7 +202,7 @@ v8::Handle<v8::Object> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, in
v8::Handle<v8::FunctionTemplate> class_templ;
#ifdef BUILDING_NODE_EXTENSION
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
if(info->clientdata != 0) {
class_templ = ((SWIGV8_ClientData*) info->clientdata)->class_templ;
} else {