Merge replayed as done by c778d16abed35829b103d607a53c8f88e3b2d595

Lib/javascript/v8/javascriptcode.swg

@@ -111,14 +111,28 @@ fail:
  * ----------------------------------------------------------------------------- */
 %fragment ("js_dtor", "templates")
 %{
-void $jswrapper(v8::Isolate *iso, v8::Persistent< v8::Object > * object, SWIGV8_Proxy *proxy) {
+
+#ifdef BUILDING_NODE_EXTENSION
+void $jswrapper(v8::Persistent< v8::Value > object, void *parameter) 
+#else
+void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object > * object, SWIGV8_Proxy *proxy) 
+#endif
+{
   if(proxy->swigCMemOwn && proxy->swigCObject) {
+#ifdef SWIGRUNTIME_DEBUG
+    printf("Deleting wrapped instance: %s\n", proxy->info->name);
+#endif
     $jsfree proxy->swigCObject;
   }
   delete proxy;
 
-  object->Dispose();
   object->Clear();
+
+#ifdef BUILDING_NODE_EXTENSION
+  object->Dispose();
+#else
+  object->Dispose(isolate);
+#endif
 }
 %}
 
@@ -266,6 +280,7 @@ fail:
   SWIGTYPE$jsmangledtype->clientdata = &$jsmangledname_clientData;
 %}
 
+
 /* -----------------------------------------------------------------------------
  * jsv8_inherit:  template for an class inherit statement.
  *   - $jsmangledname:  mangled class name
@@ -273,7 +288,17 @@ fail:
  * ----------------------------------------------------------------------------- */
 %fragment("jsv8_inherit", "templates") 
 %{
-  $jsmangledname_class->Inherit($jsbaseclass_class);
+  if (SWIGTYPE_p$jsbaseclass->clientdata && !(static_cast<SWIGV8_ClientData *>(SWIGTYPE_p$jsbaseclass->clientdata)->class_templ.IsEmpty()))
+  {
+    $jsmangledname_class->Inherit(static_cast<SWIGV8_ClientData *>(SWIGTYPE_p$jsbaseclass->clientdata)->class_templ);
+#ifdef SWIGRUNTIME_DEBUG
+    printf("Inheritance successful $jsmangledname $jsbaseclass\n");
+#endif
+  } else {
+#ifdef SWIGRUNTIME_DEBUG
+    printf("Unable to inherit baseclass, it didn't exist $jsmangledname $jsbaseclass\n");
+#endif
+  }
 %}
 
 /* -----------------------------------------------------------------------------
@@ -387,9 +412,13 @@ fail:
 %{
 extern "C" {
 
+#ifdef 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)
+#endif
 {
-  SWIG_InitializeModule(0);
+  SWIG_InitializeModule(static_cast<void *>(&global_obj));
 
   v8::HandleScope scope;
 
@@ -419,8 +448,13 @@ void $jsname_initialize(v8::Handle<v8::Object> global_obj)
   
   /* create and register namespace objects */
   $jsv8registernspaces
-
 }
 
+#ifdef BUILDING_NODE_EXTENSION
+NODE_MODULE($jsname, $jsname_initialize);
+#endif
+
+
+
 } // extern "C"
 %}

Lib/javascript/v8/javascriptinit.swg

@@ -1,14 +1,42 @@
 %insert(init) %{
-SWIGRUNTIME void
-SWIG_V8_SetModule(swig_module_info *swig_module) {}
 
-SWIGRUNTIME swig_module_info *
-SWIG_V8_GetModule(void) {
-  return 0;
+
+SWIGRUNTIME void
+SWIG_V8_SetModule(void *, swig_module_info *swig_module) {
+  v8::Local<v8::Object> global_obj = v8::Context::GetCurrent()->Global();
+  v8::Local<v8::External> mod = v8::External::New(swig_module);
+  assert(!mod.IsEmpty());
+  global_obj->SetHiddenValue(v8::String::New("swig_module_info_data"), mod);
 }
 
-#define SWIG_GetModule(clientdata)                SWIG_V8_GetModule()
-#define SWIG_SetModule(clientdata, pointer)       SWIG_V8_SetModule(pointer)
+SWIGRUNTIME swig_module_info *
+SWIG_V8_GetModule(void *) {
+  v8::Local<v8::Object> global_obj = v8::Context::GetCurrent()->Global();
+  v8::Local<v8::Value> moduleinfo = global_obj->GetHiddenValue(v8::String::New("swig_module_info_data"));
+
+  if (moduleinfo.IsEmpty())
+  {
+    // It's not yet loaded
+    return 0;
+  }
+
+  v8::Local<v8::External> moduleinfo_extern = v8::Local<v8::External>::Cast(moduleinfo);
+ 
+  if (moduleinfo_extern.IsEmpty())
+  {
+    // Something's not right
+    return 0;
+  }
+
+  void *ptr = moduleinfo_extern->Value();
+  assert(ptr);
+  swig_module_info *retptr = static_cast<swig_module_info *>(ptr);
+  assert(retptr);
+  return retptr;
+}
+
+#define SWIG_GetModule(clientdata)                SWIG_V8_GetModule(clientdata)
+#define SWIG_SetModule(clientdata, pointer)       SWIG_V8_SetModule(clientdata, pointer)
 
 %}
 

Lib/javascript/v8/javascriptruntime.swg

@@ -5,7 +5,9 @@
  * ----------------------------------------------------------------------------- */
 
 %insert(runtime) %{
+
 #include <v8.h>
+
 #include <errno.h>
 #include <limits.h>
 %}
@@ -60,7 +62,7 @@ public:
 
 %insert(runtime) %{
 
-// Note: to trigger the c8 gc more often one can tell v8 about the memory consumption
+// Note: to trigger the v8 gc more often one can tell v8 about the memory consumption
 // TODO: we could add a v8 specific parameter to control this value
 #define SWIGV8_AVG_OBJ_SIZE 1000
 
@@ -71,9 +73,19 @@ public:
   };
   
   ~SWIGV8_Proxy() { 
+#ifdef BUILDING_NODE_EXTENSION
     handle.ClearWeak();
+#else
+    handle.ClearWeak(v8::Isolate::GetCurrent());
+#endif
+
     //handle->SetInternalField(0, v8::Undefined());
+
+#ifdef BUILDING_NODE_EXTENSION
     handle.Dispose();
+#else
+    handle.Dispose(v8::Isolate::GetCurrent());
+#endif
     handle.Clear();
     v8::V8::AdjustAmountOfExternalAllocatedMemory(-SWIGV8_AVG_OBJ_SIZE);
   }
@@ -87,7 +99,12 @@ public:
 class SWIGV8_ClientData {
 public:
   v8::Persistent<v8::FunctionTemplate> class_templ;
-  void (*dtor) (v8::Isolate *iso, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *parameter);
+
+#ifdef BUILDING_NODE_EXTENSION
+  void (*dtor) (v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy);
+#else
+  void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy);
+#endif
 };
 
 v8::Persistent<v8::FunctionTemplate> SWIGV8_SWIGTYPE_Proxy_class_templ;
@@ -101,15 +118,11 @@ int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void** ptr, swig_t
     return SWIG_ERROR;
   }
   if(cdata->info != info) {
-    bool type_valid = false;
-    swig_cast_info *t = info->cast; 
-    while(t != NULL) {
-      if(t->type == cdata->info) {
-        type_valid = true;
-        break;
-      }
-      t = t->next;
+    swig_cast_info *tc = SWIG_TypeCheckStruct(cdata->info, info);
+    if (!tc && cdata->info->name) {
+      tc = SWIG_TypeCheck(cdata->info->name, info);
     }
+    bool type_valid = tc != 0;
     if(!type_valid) {
       return SWIG_TypeError;
     }
@@ -121,8 +134,13 @@ int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void** ptr, swig_t
   return SWIG_OK;
 }
 
-void SWIGV8_Proxy_DefaultDtor(v8::Isolate* isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) {
-  delete proxy;
+#ifdef BUILDING_NODE_EXTENSION
+void SWIGV8_Proxy_DefaultDtor(v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy)
+#else
+void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy)
+#endif
+{
+    delete proxy;
 }
 
 void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info *info, int flags) {
@@ -132,8 +150,13 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info
   cdata->info = info;
   obj->SetAlignedPointerInInternalField(0, cdata);
 
+#ifdef BUILDING_NODE_EXTENSION
+	#warning port me
+#else
   cdata->handle.Reset(v8::Isolate::GetCurrent(), obj);
+#endif
 
+#ifdef BUILDING_NODE_EXTENSION
   // clientdata must be set for owned data as we need to register the dtor
   if(cdata->swigCMemOwn) {
     cdata->handle.MakeWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
@@ -141,6 +164,14 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info
     cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor);
   }
   cdata->handle.MarkIndependent();
+#else
+  if(cdata->swigCMemOwn) {
+    cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
+  } else {
+    cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, SWIGV8_Proxy_DefaultDtor);
+  }
+  cdata->handle.MarkIndependent(v8::Isolate::GetCurrent());
+#endif
 }
 
 int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void** ptr, swig_type_info *info, int flags) {
@@ -175,4 +206,8 @@ v8::Handle<v8::Object> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, in
 #define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_V8_ConvertInstancePtr(obj, pptr, type, flags)
 #define SWIG_NewInstanceObj(thisvalue, type, flags)     SWIG_V8_NewPointerObj(thisvalue, type, flags)
 
+#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_V8_ConvertPtr(obj, pptr, type, 0)
+#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_V8_NewPointerObj(ptr, type, 0)
+
 %}
+

Lib/javascript/v8/node.i

@@ -1,15 +1,12 @@
-%insert("init") %{
+%insert("begin") %{
 #ifndef BUILDING_NODE_EXTENSION
 #define BUILDING_NODE_EXTENSION
 #endif
-
-#include <node.h>
 %}
 
-%define %node(moduleName)
-%insert("post-init") %{
-extern "C" {
-    NODE_MODULE(moduleName, moduleName ## _initialize)
-}
+%insert("runtime") %{
+// we are including relative to the src folder because of issues
+// with other files which might be named "node.h"
+#include <src/node.h>
 %}
-%enddef
+

Lib/javascript/v8/std_pair.i

@@ -5,7 +5,6 @@
  * ----------------------------------------------------------------------------- */
 
 %include <std_common.i>
-%include <exception.i>
 
 // ------------------------------------------------------------------------
 // std::pair

Lib/javascript/v8/std_string.i

@@ -73,7 +73,7 @@ namespace std {
 
   %typemap(out, fragment="SWIGV8_stringToValue") const string &
   %{
-     $result = SWIGV8_stringToValue($1);
+     $result = SWIGV8_stringToValue(*$1);
   %}
 
 }