compiles with nan

joeferner · jsdevel · commit 3b1a768eaa97 · 2014-07-14T22:59:05.000-07:00
diff --git a/src/javaObject.cpp b/src/javaObject.cpp
@@ -6,7 +6,7 @@
 #include <sstream>
 #include <algorithm>
 
-/*static*/ std::map<std::string, v8::Persistent<v8::FunctionTemplate> > JavaObject::sFunctionTemplates;
+/*static*/ std::map<std::string, v8::Persistent<v8::FunctionTemplate>*> JavaObject::sFunctionTemplates;
 
 /*static*/ void JavaObject::Init(v8::Handle<v8::Object> target) {
 }
@@ -28,14 +28,14 @@
   std::replace(className.begin(), className.end(), '[', 'a');
   className = "nodeJava_" + className;
 
-  v8::Persistent<v8::FunctionTemplate> persistentFuncTemplate;
+  v8::Local<v8::FunctionTemplate> funcTemplate;
   if(sFunctionTemplates.find(className) != sFunctionTemplates.end()) {
     //printf("existing className: %s\n", className.c_str());
-    persistentFuncTemplate = sFunctionTemplates[className];
+    funcTemplate = NanPersistentToLocal(*sFunctionTemplates[className]);
   } else {
     //printf("create className: %s\n", className.c_str());
 
-    v8::Local<v8::FunctionTemplate> funcTemplate = v8::FunctionTemplate::New();
+    funcTemplate = v8::FunctionTemplate::New();
     funcTemplate->InstanceTemplate()->SetInternalFieldCount(1);
     funcTemplate->SetClassName(v8::String::NewSymbol(className.c_str()));
 
@@ -70,16 +70,18 @@
       funcTemplate->InstanceTemplate()->SetAccessor(fieldName, fieldGetter, fieldSetter);
     }
 
-    sFunctionTemplates[className] = persistentFuncTemplate = v8::Persistent<v8::FunctionTemplate>::New(funcTemplate);
+    v8::Persistent<v8::FunctionTemplate>* persistentFuncTemplate = new v8::Persistent<v8::FunctionTemplate>();
+    NanAssignPersistent(v8::FunctionTemplate, (*persistentFuncTemplate), funcTemplate);
+    sFunctionTemplates[className] = persistentFuncTemplate;
   }
 
-  v8::Local<v8::Function> ctor = persistentFuncTemplate->GetFunction();
+  v8::Local<v8::Function> ctor = funcTemplate->GetFunction();
   v8::Local<v8::Object> javaObjectObj = ctor->NewInstance();
   javaObjectObj->SetHiddenValue(v8::String::New(V8_HIDDEN_MARKER_JAVA_OBJECT), v8::Boolean::New(true));
   JavaObject *self = new JavaObject(java, obj);
   self->Wrap(javaObjectObj);
 
-  NanReturnValue(javaObjectObj);
+  return javaObjectObj;
 }
 
 JavaObject::JavaObject(Java *java, jobject obj) {
@@ -132,7 +134,7 @@ NAN_METHOD(JavaObject::methodCall) {
   if(method == NULL) {
     std::string msg = methodNotFoundToString(env, self->m_class, methodNameStr, false, args, argsStart, argsEnd);
     EXCEPTION_CALL_CALLBACK(self->m_java, msg);
-    return v8::Undefined();
+    NanReturnUndefined();
   }
 
   // run
@@ -160,7 +162,7 @@ NAN_METHOD(JavaObject::methodCallSync) {
   if(method == NULL) {
     std::string msg = methodNotFoundToString(env, self->m_class, methodNameStr, false, args, argsStart, argsEnd);
     v8::Handle<v8::Value> ex = javaExceptionToV8(self->m_java, env, msg);
-    return ThrowException(ex);
+    return NanThrowError(ex);
   }
 
   // run
@@ -170,15 +172,15 @@ NAN_METHOD(JavaObject::methodCallSync) {
   delete baton;
 
   if(result->IsNativeError()) {
-    return ThrowException(result);
+    return NanThrowError(result);
   }
 
   NanReturnValue(result);
 }
 
 NAN_GETTER(JavaObject::fieldGetter) {
   NanScope();
-  JavaObject* self = node::ObjectWrap::Unwrap<JavaObject>(info.This());
+  JavaObject* self = node::ObjectWrap::Unwrap<JavaObject>(args.This());
   JNIEnv *env = self->m_java->getJavaEnv();
   JavaScope javaScope(env);
 
@@ -189,7 +191,7 @@ NAN_GETTER(JavaObject::fieldGetter) {
     std::ostringstream errStr;
     errStr << "Could not find field " << propertyStr;
     v8::Handle<v8::Value> ex = javaExceptionToV8(self->m_java, env, errStr.str());
-    return ThrowException(ex);
+    return NanThrowError(ex);
   }
 
   jclass fieldClazz = env->FindClass("java/lang/reflect/Field");
@@ -201,7 +203,7 @@ NAN_GETTER(JavaObject::fieldGetter) {
     std::ostringstream errStr;
     errStr << "Could not get field " << propertyStr;
     v8::Handle<v8::Value> ex = javaExceptionToV8(self->m_java, env, errStr.str());
-    return ThrowException(ex);
+    return NanThrowError(ex);
   }
 
   v8::Handle<v8::Value> result = javaToV8(self->m_java, env, val);
@@ -211,7 +213,7 @@ NAN_GETTER(JavaObject::fieldGetter) {
 
 NAN_SETTER(JavaObject::fieldSetter) {
   NanScope();
-  JavaObject* self = node::ObjectWrap::Unwrap<JavaObject>(info.This());
+  JavaObject* self = node::ObjectWrap::Unwrap<JavaObject>(args.This());
   JNIEnv *env = self->m_java->getJavaEnv();
   JavaScope javaScope(env);
 
diff --git a/src/javaObject.h b/src/javaObject.h
@@ -30,7 +30,7 @@ class JavaObject : public node::ObjectWrap {
   static NAN_GETTER(fieldGetter);
   static NAN_SETTER(fieldSetter);
 
-  static std::map<std::string, v8::Persistent<v8::FunctionTemplate> > sFunctionTemplates;
+  static std::map<std::string, v8::Persistent<v8::FunctionTemplate>*> sFunctionTemplates;
   Java* m_java;
   jobject m_obj;
   jclass m_class;
diff --git a/src/methodCallBaton.cpp b/src/methodCallBaton.cpp
@@ -9,7 +9,7 @@ MethodCallBaton::MethodCallBaton(Java* java, jobject method, jarray args, v8::Ha
 
   m_java = java;
   m_args = (jarray)env->NewGlobalRef(args);
-  m_callback = v8::Persistent<v8::Value>::New(callback);
+  NanAssignPersistent(v8::Value, m_callback, callback);
   m_method = env->NewGlobalRef(method);
   m_error = NULL;
   m_result = NULL;
@@ -62,10 +62,11 @@ v8::Handle<v8::Value> MethodCallBaton::runSync() {
 }
 
 void MethodCallBaton::after(JNIEnv *env) {
-  v8::HandleScope scope;
+  NanScope();
 
-  if(m_callback->IsFunction()) {
-    v8::Local<v8::Function> callback = v8::Function::Cast(*m_callback);
+  v8::Local<v8::Value> callback = NanPersistentToLocal(m_callback);
+  if(callback->IsFunction()) {
+    v8::Local<v8::Function> callback = v8::Local<v8::Function>::Cast(callback);
     v8::Handle<v8::Value> result = resultsToV8(env);
     v8::Handle<v8::Value> argv[2];
     if(result->IsNativeError()) {
@@ -80,7 +81,7 @@ void MethodCallBaton::after(JNIEnv *env) {
 }
 
 v8::Handle<v8::Value> MethodCallBaton::resultsToV8(JNIEnv *env) {
-  v8::HandleScope scope;
+  NanScope();
 
   if(m_error) {
     jthrowable cause = m_error;
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -251,7 +251,7 @@ jobject v8ToJava(JNIEnv* env, v8::Local<v8::Value> arg) {
   }
 
   if(arg->IsArray()) {
-    v8::Local<v8::Array> array = v8::Array::Cast(*arg);
+    v8::Local<v8::Array> array = v8::Local<v8::Array>::Cast(arg);
     uint32_t arraySize = array->Length();
     jclass objectClazz = env->FindClass("java/lang/Object");
     jobjectArray result = env->NewObjectArray(arraySize, objectClazz, NULL);
@@ -289,7 +289,7 @@ jobject v8ToJava(JNIEnv* env, v8::Local<v8::Value> arg) {
   }
 
   if(arg->IsObject()) {
-    v8::Local<v8::Object> obj = v8::Object::Cast(*arg);
+    v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(arg);
 
     v8::Local<v8::Value> isJavaObject = obj->GetHiddenValue(v8::String::New(V8_HIDDEN_MARKER_JAVA_OBJECT));
     if(!isJavaObject.IsEmpty() && isJavaObject->IsBoolean()) {
@@ -382,7 +382,7 @@ jobject v8ToJava_javaLong(JNIEnv* env, v8::Local<v8::Object> obj) {
   return jobj;
 }
 
-jobjectArray v8ToJava(JNIEnv* env, const v8::Arguments& args, int start, int end) {
+jobjectArray v8ToJava(JNIEnv* env, _NAN_METHOD_ARGS_TYPE args, int start, int end) {
   jclass clazz = env->FindClass("java/lang/Object");
   jobjectArray results = env->NewObjectArray(end-start, clazz, NULL);
 
@@ -415,7 +415,7 @@ std::string javaExceptionToString(JNIEnv* env, jthrowable ex) {
 }
 
 v8::Handle<v8::Value> javaExceptionToV8(Java* java, JNIEnv* env, jthrowable ex, const std::string& alternateMessage) {
-  v8::HandleScope scope;
+  NanScope();
 
   std::ostringstream msg;
   msg << alternateMessage;
@@ -432,7 +432,7 @@ v8::Handle<v8::Value> javaExceptionToV8(Java* java, JNIEnv* env, jthrowable ex,
 }
 
 v8::Handle<v8::Value> javaExceptionToV8(Java* java, JNIEnv* env, const std::string& alternateMessage) {
-  v8::HandleScope scope;
+  NanScope();
   jthrowable ex = env->ExceptionOccurred();
   env->ExceptionClear();
   return scope.Close(javaExceptionToV8(java, env, ex, alternateMessage));
@@ -455,7 +455,7 @@ jvalueType javaGetArrayComponentType(JNIEnv *env, jobjectArray array) {
 }
 
 v8::Handle<v8::Value> javaArrayToV8(Java* java, JNIEnv* env, jobjectArray objArray) {
-  v8::HandleScope scope;
+  NanScope();
 
   if(objArray == NULL) {
     return v8::Null();
@@ -553,7 +553,7 @@ v8::Handle<v8::Value> javaArrayToV8(Java* java, JNIEnv* env, jobjectArray objArr
 }
 
 v8::Handle<v8::Value> javaToV8(Java* java, JNIEnv* env, jobject obj) {
-  v8::HandleScope scope;
+  NanScope();
 
   if(obj == NULL) {
     return v8::Null();
@@ -698,7 +698,7 @@ int dynamicProxyDataVerify(DynamicProxyData* data) {
   return 0;
 }
 
-std::string methodNotFoundToString(JNIEnv *env, jclass clazz, std::string methodName, bool constructor, const v8::Arguments& args, int argStart, int argEnd) {
+std::string methodNotFoundToString(JNIEnv *env, jclass clazz, std::string methodName, bool constructor, _NAN_METHOD_ARGS_TYPE args, int argStart, int argEnd) {
   std::ostringstream startOfMessage;
   std::ostringstream msg;
 
