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

Conflicts:
	Lib/javascript/v8/javascriptcode.swg

Lib/javascript/v8/javascriptcode.swg

@@ -57,7 +57,7 @@ v8::Handle<v8::Value> $jswrapper(const v8::Arguments& args) {
   SWIG_exception_fail(SWIG_ERROR, "Illegal arguments for contruction of $jsmangledname");
   
 fail:
-  scope.Close(v8::Undefined());
+  return scope.Close(v8::Undefined());
 }
 %}
 
@@ -114,10 +114,12 @@ fail:
 void $jswrapper(v8::Persistent< v8::Value > object, void *parameter) {
   SWIGV8_Proxy* proxy = (SWIGV8_Proxy*) parameter;
   if(proxy->swigCMemOwn && proxy->swigCObject) {
-//    std::cout << "Deleting wrapped instance: " << proxy->info->name << std::endl;
     $jsfree proxy->swigCObject;
   }
   delete proxy;
+
+  object.Clear();
+  object.Dispose();
 }
 %}
 
@@ -132,11 +134,13 @@ void $jswrapper(v8::Persistent< v8::Value > object, void *parameter) {
 void $jswrapper(v8::Persistent< v8::Value > object, void *parameter) {
   SWIGV8_Proxy* proxy = (SWIGV8_Proxy*) parameter;
   if(proxy->swigCMemOwn && proxy->swigCObject) {
-//    std::cout << "Deleting wrapped instance: " << proxy->info->name << std::endl;
     $jstype arg1 = ($jstype)proxy->swigCObject;
     ${destructor_action}
   }
   delete proxy;
+
+  object.Clear();
+  object.Dispose();
 }
 %}
 

Lib/javascript/v8/javascriptruntime.swg

@@ -8,7 +8,6 @@
 #include <v8.h>
 #include <errno.h>
 #include <limits.h>
-#include <iostream>
 %}
 
 %insert(runtime) "swigrun.swg";         /* SWIG API */
@@ -72,12 +71,17 @@ public:
   };
   
   ~SWIGV8_Proxy() { 
+    handle.ClearWeak();
+    handle->SetInternalField(0, v8::Undefined());
+    handle.Dispose();
+    handle.Clear();
     v8::V8::AdjustAmountOfExternalAllocatedMemory(-SWIGV8_AVG_OBJ_SIZE);
   }
   
   bool swigCMemOwn;
   void *swigCObject;
   swig_type_info *info;
+  v8::Persistent<v8::Object> handle;
 };
 
 class SWIGV8_ClientData {
@@ -131,14 +135,16 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info
   cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0;
   cdata->info = info;
   obj->SetPointerInInternalField(0, cdata);
-  
-  v8::Persistent<v8::Object> weakptr = v8::Persistent<v8::Object>::New(obj);
-  // clientdata must be set for owned data as we need to register the dtor  
+
+  cdata->handle = v8::Persistent<v8::Object>::New(obj);
+
+  // clientdata must be set for owned data as we need to register the dtor
   if(cdata->swigCMemOwn) {
-    weakptr.MakeWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
+    cdata->handle.MakeWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
   } else {
-    weakptr.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor);
+    cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor);
   }
+  cdata->handle.MarkIndependent();
 }
 
 int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void** ptr, swig_type_info *info, int flags) {

Lib/javascript/v8/node.i

@@ -1,7 +1,15 @@
+%insert("init") %{
+#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)
-}    
+}
 %}
-%enddef
+%enddef

Lib/javascript/v8/std_string.i

@@ -14,19 +14,22 @@
 
 %fragment("SWIGV8_valueToString", "header", fragment="SWIG_AsCharPtrAndSize") {
 std::string* SWIGV8_valueToStringPtr(v8::Handle<v8::Value> val) {
+
+  if (!val->IsString()) return 0;
+
   int alloc;
   size_t size;
   char* chars;
   int res = SWIG_AsCharPtrAndSize(val, &chars, &size, &alloc);
-  
+
   if(res != SWIG_OK) {
     v8::ThrowException(v8::Exception::TypeError(v8::String::New("Could not convert to string.")));
     return 0;
   }
-  
+
   // copies the data (again)
   std::string *str = new std::string(chars);
-  
+
   if (alloc) delete[] chars;
 
   return str;
@@ -45,20 +48,22 @@ namespace std {
   class string;
 
   %typemap(in, fragment="SWIGV8_valueToString") string (std::string* tmp)
-  %{ 
+  %{
      tmp = SWIGV8_valueToStringPtr($input);
      $1 = *tmp;
-     delete tmp;
+     if (tmp == 0) { v8::ThrowException(v8::Exception::TypeError(v8::String::New("Null pointer."))); goto fail; }
+     if (tmp) delete tmp;
   %}
 
-  %typemap(in, fragment="SWIGV8_valueToString") const string & 
-  %{ 
+  %typemap(in, fragment="SWIGV8_valueToString") const string &
+  %{
      $1 = SWIGV8_valueToStringPtr($input);
+     if ($1 == 0) { v8::ThrowException(v8::Exception::TypeError(v8::String::New("Null pointer."))); goto fail; }
   %}
-  
-  %typemap(freearg) const string & 
-  %{ 
-     delete $1;
+
+  %typemap(freearg) const string &
+  %{
+     if ($1) delete $1;
   %}
 
   %typemap(out, fragment="SWIGV8_stringToValue") string