Have console pre-initialize engine to feel faster.

[cycript.git] / Java / Execute.cpp

diff --git a/Java/Execute.cpp b/Java/Execute.cpp
index 302dd3ea52680962c560cadb8760646b0db579ec..688de687ae7c20a1a9be242f248dca21760c0dfa 100644 (file)
--- a/Java/Execute.cpp
+++ b/Java/Execute.cpp
@@ -109,18 +109,14 @@ struct CYJavaRef {
     {
     }
 
     {
     }
 

-    _finline operator bool() const {
-        return value_ != NULL;
+    _finline operator Value_() const {
+        return value_;

     }
 
     }
 

-    _finline operator JNIEnv *() const {
+    _finline JNIEnv *jni() const {

         return jni_;
     }
 
         return jni_;
     }
 

-    _finline operator Value_() const {
-        return value_;
-    }
-

     _finline Value_ get() const {
         return value_;
     }
     _finline Value_ get() const {
         return value_;
     }


@@ -130,6 +126,7 @@ struct CYJavaRef {
         return {jni_, static_cast<Other_>(value_)};
     }
 
         return {jni_, static_cast<Other_>(value_)};
     }
 

+    // XXX: this should be tied into CYJavaFrame

     Value_ leak() {
         Value_ value(value_);
         value_ = NULL;
     Value_ leak() {
         Value_ value(value_);
         value_ = NULL;


@@ -146,9 +143,14 @@ struct CYJavaDelete :
     {
     }
 
     {
     }
 

-    ~CYJavaDelete() {
+    void clear() {

         if (this->value_ != NULL)
             (this->jni_->*Delete_)(this->value_);
         if (this->value_ != NULL)
             (this->jni_->*Delete_)(this->value_);

+        this->value_ = NULL;
+    }
+
+    ~CYJavaDelete() {
+        clear();

     }
 };
 
     }
 };
 


@@ -203,15 +205,24 @@ struct CYJavaLocal :
     {
     }
 
     {
     }
 

-    CYJavaLocal(CYJavaLocal &&value) :
-        CYJavaLocal(value.jni_, value.value_)
+    template <typename Other_>
+    CYJavaLocal(CYJavaRef<Other_> &&other) :
+        CYJavaLocal(other.jni_, other.value_)
+    {
+        other.value_ = NULL;
+    }
+
+    CYJavaLocal(CYJavaLocal &&other) :
+        CYJavaLocal(static_cast<CYJavaRef<Value_> &&>(other))

     {
     {

-        value.value_ = NULL;

     }
 
     }
 

-    CYJavaLocal &operator =(CYJavaLocal<Value_> &&other) {
-        std::swap(this->jni_, other.jni_);
-        std::swap(this->value_, other.value_);
+    template <typename Other_>
+    CYJavaLocal &operator =(CYJavaLocal<Other_> &&other) {
+        this->clear();
+        this->jni_ = other.jni_;
+        this->value_ = other.value_;
+        other.value_ = NULL;

         return *this;
     }
 };
         return *this;
     }
 };


@@ -230,7 +241,7 @@ class CYJavaUTF8String :
         value_(&value)
     {
         _assert(value);
         value_(&value)
     {
         _assert(value);

-        JNIEnv *jni(value);
+        JNIEnv *jni(value.jni());

         size = jni->GetStringUTFLength(value);
         data = jni->GetStringUTFChars(value, NULL);
     }
         size = jni->GetStringUTFLength(value);
         data = jni->GetStringUTFChars(value, NULL);
     }


@@ -242,7 +253,7 @@ class CYJavaUTF8String :
 
     ~CYJavaUTF8String() {
         if (value_ != NULL) {
 
     ~CYJavaUTF8String() {
         if (value_ != NULL) {

-            JNIEnv *jni(*value_);
+            JNIEnv *jni(value_->jni());

             jni->ReleaseStringUTFChars(*value_, data);
         }
     }
             jni->ReleaseStringUTFChars(*value_, data);
         }
     }


@@ -279,9 +290,7 @@ struct CYJavaError :
         return CYPoolCString(pool, CYJavaUTF8String(value_.cast<jobject>()));
     }
 
         return CYPoolCString(pool, CYJavaUTF8String(value_.cast<jobject>()));
     }
 

-    virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const {
-        return CYCastJSValue(context, value_);
-    }
+    virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const;

 };
 // }}}
 
 };
 // }}}
 


@@ -298,6 +307,10 @@ struct CYJavaFrame {
         operator ()(NULL);
     }
 
         operator ()(NULL);
     }
 

+    operator JNIEnv *() const {
+        return jni_;
+    }
+

     jobject operator ()(jobject object) {
         JNIEnv *jni(jni_);
         jni_ = NULL;
     jobject operator ()(jobject object) {
         JNIEnv *jni(jni_);
         jni_ = NULL;


@@ -315,6 +328,12 @@ struct CYJavaEnv {
     {
     }
 
     {
     }
 

+    template <typename Other_>
+    CYJavaEnv(const CYJavaRef<Other_> &value) :
+        jni(value.jni())
+    {
+    }
+

     operator JNIEnv *() const {
         return jni;
     }
     operator JNIEnv *() const {
         return jni;
     }


@@ -434,6 +453,13 @@ struct CYJavaValue :
     CYJavaValue(const CYJavaValue &) = delete;
 };
 
     CYJavaValue(const CYJavaValue &) = delete;
 };
 

+static JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef<jobject> &value);
+
+template <typename Other_>
+static _finline JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef<Other_> &value) {
+    return CYCastJSValue(context, value.template cast<jobject>());
+}
+

 template <typename Type_>
 static _finline JSValueRef CYJavaCastJSValue(JSContextRef context, Type_ value) {
     return CYCastJSValue(context, value);
 template <typename Type_>
 static _finline JSValueRef CYJavaCastJSValue(JSContextRef context, Type_ value) {
     return CYCastJSValue(context, value);


@@ -443,6 +469,10 @@ static _finline JSValueRef CYJavaCastJSValue(JSContextRef context, jboolean valu
     return CYCastJSValue(context, static_cast<bool>(value));
 }
 
     return CYCastJSValue(context, static_cast<bool>(value));
 }
 

+JSValueRef CYJavaError::CastJSValue(JSContextRef context, const char *name) const {
+    return CYCastJSValue(context, value_);
+}
+

 static std::map<std::string, CYJavaPrimitive> Primitives_;
 
 static CYJavaPrimitive CYJavaGetPrimitive(JSContextRef context, const CYJavaRef<jclass> &type, jmethodID Class$get$$Name) {
 static std::map<std::string, CYJavaPrimitive> Primitives_;
 
 static CYJavaPrimitive CYJavaGetPrimitive(JSContextRef context, const CYJavaRef<jclass> &type, jmethodID Class$get$$Name) {


@@ -844,7 +874,9 @@ CYJavaForEachPrimitive
     }
 }
 
     }
 }
 

-static bool CYCastJavaArguments(const CYJavaEnv &jni, const CYJavaShorty &shorty, JSContextRef context, const JSValueRef arguments[], jvalue *array) {
+static bool CYCastJavaArguments(const CYJavaFrame &frame, const CYJavaShorty &shorty, JSContextRef context, const JSValueRef arguments[], jvalue *array) {
+    CYJavaEnv jni(frame);
+

     for (size_t index(0); index != shorty.size(); ++index) {
         JSValueRef argument(arguments[index]);
         JSType type(JSValueGetType(context, argument));
     for (size_t index(0); index != shorty.size(); ++index) {
         JSValueRef argument(arguments[index]);
         JSType type(JSValueGetType(context, argument));


@@ -852,6 +884,7 @@ static bool CYCastJavaArguments(const CYJavaEnv &jni, const CYJavaShorty &shorty
 
         switch (CYJavaPrimitive primitive = shorty[index]) {
             case CYJavaPrimitiveObject:
 
         switch (CYJavaPrimitive primitive = shorty[index]) {
             case CYJavaPrimitiveObject:

+                // XXX: figure out a way to tie this in to the CYJavaFrame

                 value.l = CYCastJavaObject(jni, context, argument).leak();
             break;
 
                 value.l = CYCastJavaObject(jni, context, argument).leak();
             break;
 


@@ -901,9 +934,9 @@ static JSValueRef JavaMethod_callAsFunction(JSContextRef context, JSObjectRef ob
 
     CYJavaSignature bound(count);
     for (auto overload(internal->overload_.lower_bound(bound)), e(internal->overload_.upper_bound(bound)); overload != e; ++overload) {
 
     CYJavaSignature bound(count);
     for (auto overload(internal->overload_.lower_bound(bound)), e(internal->overload_.upper_bound(bound)); overload != e; ++overload) {

-        CYJavaFrame(jni, count + 16);
+        CYJavaFrame frame(jni, count + 16);

         jvalue array[count];
         jvalue array[count];

-        if (!CYCastJavaArguments(jni, overload->shorty_, context, arguments, array))
+        if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array))

             continue;
         jvalue *values(array);
         switch (overload->primitive_) {
             continue;
         jvalue *values(array);
         switch (overload->primitive_) {


@@ -931,9 +964,9 @@ static JSValueRef JavaStaticMethod_callAsFunction(JSContextRef context, JSObject
 
     CYJavaSignature bound(count);
     for (auto overload(internal->overload_.lower_bound(bound)), e(internal->overload_.upper_bound(bound)); overload != e; ++overload) {
 
     CYJavaSignature bound(count);
     for (auto overload(internal->overload_.lower_bound(bound)), e(internal->overload_.upper_bound(bound)); overload != e; ++overload) {

-        CYJavaFrame(jni, count + 16);
+        CYJavaFrame frame(jni, count + 16);

         jvalue array[count];
         jvalue array[count];

-        if (!CYCastJavaArguments(jni, overload->shorty_, context, arguments, array))
+        if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array))

             continue;
         jvalue *values(array);
         switch (overload->primitive_) {
             continue;
         jvalue *values(array);
         switch (overload->primitive_) {


@@ -969,9 +1002,9 @@ static JSObjectRef JavaClass_callAsConstructor(JSContextRef context, JSObjectRef
 
     CYJavaSignature bound(count);
     for (auto overload(table->overload_.lower_bound(bound)), e(table->overload_.upper_bound(bound)); overload != e; ++overload) {
 
     CYJavaSignature bound(count);
     for (auto overload(table->overload_.lower_bound(bound)), e(table->overload_.upper_bound(bound)); overload != e; ++overload) {

-        CYJavaFrame(jni, count + 16);
+        CYJavaFrame frame(jni, count + 16);

         jvalue array[count];
         jvalue array[count];

-        if (!CYCastJavaArguments(jni, overload->shorty_, context, arguments, array))
+        if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array))

             continue;
         jvalue *values(array);
         auto object(jni.NewObjectA(_class, overload->method_, values));
             continue;
         jvalue *values(array);
         auto object(jni.NewObjectA(_class, overload->method_, values));


@@ -1247,11 +1280,10 @@ static jobject Cycript_handle(JNIEnv *env, jclass api, jlong jprotect, jstring p
 
     size_t count(jarguments == NULL ? 0 : jni.GetArrayLength(jarguments));
     JSValueRef arguments[count];
 
     size_t count(jarguments == NULL ? 0 : jni.GetArrayLength(jarguments));
     JSValueRef arguments[count];

-    for (size_t index(0); index != count; ++index) {
+    for (size_t index(0); index != count; ++index)

         arguments[index] = CYCastJSValue(context, jni.GetObjectArrayElement<jobject>(jarguments, index));
         arguments[index] = CYCastJSValue(context, jni.GetObjectArrayElement<jobject>(jarguments, index));

-    }

 
 

-    return CYCastJavaObject(jni, context, CYCallAsFunction(context, CYCastJSObject(context, function), object, count, arguments));
+    return CYCastJavaObject(jni, context, CYCallAsFunction(context, CYCastJSObject(context, function), object, count, arguments)).leak();

 } CYJavaCatch(NULL) }
 
 static JNINativeMethod Cycript_[] = {
 } CYJavaCatch(NULL) }
 
 static JNINativeMethod Cycript_[] = {