X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/42619b59a10d5aa52f64a2e89fb32fdd6d0e3822..1e8d80477a3e058a30c477955f1e0c56deb6e956:/Java/Execute.cpp diff --git a/Java/Execute.cpp b/Java/Execute.cpp index bdfd3eb..1a227ab 100644 --- a/Java/Execute.cpp +++ b/Java/Execute.cpp @@ -1,5 +1,5 @@ -/* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2015 Jay Freeman (saurik) +/* Cycript - The Truly Universal Scripting Language + * Copyright (C) 2009-2016 Jay Freeman (saurik) */ /* GNU Affero General Public License, Version 3 {{{ */ @@ -23,13 +23,21 @@ #include #include -#ifdef __APPLE__ +#include + +#if defined(__APPLE__) && !defined(__arm__) #include #else #include #endif +#ifdef __ANDROID__ +// XXX: this is deprecated?!?!?!?!?!?! +#include +#endif + #include "cycript.hpp" +#include "Error.hpp" #include "Execute.hpp" #include "Internal.hpp" #include "JavaScript.hpp" @@ -45,7 +53,7 @@ __typeof__(jni->expr) _value(jni->expr); \ if (jthrowable _error = jni->ExceptionOccurred()) { \ jni->ExceptionClear(); \ - CYThrow("_envcall(%s): %p", #expr, _error); \ + throw CYJavaError(CYJavaLocal(jni, _error)); \ } \ _value; }) @@ -53,161 +61,401 @@ _value; }) jni->expr; \ if (jthrowable _error = jni->ExceptionOccurred()) { \ jni->ExceptionClear(); \ - CYThrow("_envcall(%s): %p", #expr, _error); \ + throw CYJavaError(CYJavaLocal(jni, _error)); \ } \ } while (false) -extern "C" { - // Android's jni.h seriously doesn't declare these :/ - jint JNI_CreateJavaVM(JavaVM **, void **, void *); - jint JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *); -} +#define CYJavaTry \ + CYJavaEnv jni(env); \ + auto &protect(*reinterpret_cast(jprotect)); \ + _disused JSContextRef context(protect); \ + _disused JSObjectRef object(protect); \ + try +#define CYJavaCatch(value) \ + catch (const CYException &error) { \ + jni->Throw(CYCastJavaObject(jni, context, error.CastJSValue(context, "Error")).cast()); \ + return value; \ + } -JNIEnv *GetJNI() { - static JavaVM *jvm(NULL); - static JNIEnv *jni(NULL); +#define CYJavaForEachPrimitive \ + CYJavaForEachPrimitive_(Z, z, Boolean, Boolean, boolean) \ + CYJavaForEachPrimitive_(B, b, Byte, Byte, byte) \ + CYJavaForEachPrimitive_(C, c, Char, Character, char) \ + CYJavaForEachPrimitive_(S, s, Short, Short, short) \ + CYJavaForEachPrimitive_(I, i, Int, Integer, int) \ + CYJavaForEachPrimitive_(J, j, Long, Long, long) \ + CYJavaForEachPrimitive_(F, f, Float, Float, float) \ + CYJavaForEachPrimitive_(D, d, Double, Double, double) - if (jni != NULL) - return jni; - jint version(JNI_VERSION_1_4); +enum CYJavaPrimitive : char { + CYJavaPrimitiveObject, + CYJavaPrimitiveVoid, +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ + CYJavaPrimitive ## Type, +CYJavaForEachPrimitive +#undef CYJavaForEachPrimitive_ +}; - jsize capacity(16); - JavaVM *jvms[capacity]; - jsize size; - _jnicall(JNI_GetCreatedJavaVMs(jvms, capacity, &size)); +template +struct IsJavaPrimitive { static const bool value = false; }; - if (size != 0) { - jvm = jvms[0]; - _jnicall(jvm->GetEnv(reinterpret_cast(&jni), version)); - } else { - JavaVMInitArgs args; - memset(&args, 0, sizeof(args)); - args.version = version; - _jnicall(JNI_CreateJavaVM(&jvm, reinterpret_cast(&jni), &args)); +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ + template <> \ + struct IsJavaPrimitive { static const bool value = true; }; +CYJavaForEachPrimitive +#undef CYJavaForEachPrimitive_ + +// Java References {{{ +template +struct CYJavaRef { + JNIEnv *jni_; + Value_ value_; + + _finline CYJavaRef(JNIEnv *jni, Value_ value) : + jni_(jni), + value_(value) + { } - return jni; -} + _finline operator Value_() const { + return value_; + } + + _finline JNIEnv *jni() const { + return jni_; + } + + // XXX: this is only needed to support CYJavaEnv relying on C variadics + _finline Value_ get() const { + return value_; + } + + template + _finline CYJavaRef cast() const { + return {jni_, static_cast(value_)}; + } + + // XXX: this should be tied into CYJavaFrame + Value_ leak() { + Value_ value(value_); + value_ = NULL; + return value; + } +}; + +template +struct CYJavaDelete : + CYJavaRef +{ + _finline CYJavaDelete(JNIEnv *jni, Value_ value) : + CYJavaRef(jni, value) + { + } + + void clear() { + if (this->value_ != NULL) + (this->jni_->*Delete_)(this->value_); + this->value_ = NULL; + } + + ~CYJavaDelete() { + clear(); + } +}; + +template +struct CYJavaGlobal : + CYJavaDelete +{ + typedef CYJavaDelete CYJavaBase; + + CYJavaGlobal() : + CYJavaBase(NULL, NULL) + { + } + + template + CYJavaGlobal(const CYJavaRef &other) : + CYJavaBase(other.jni_, static_cast(other.jni_->NewGlobalRef(other.value_))) + { + } + + CYJavaGlobal(const CYJavaGlobal &other) : + CYJavaGlobal(static_cast &>(other)) + { + } + + CYJavaGlobal(CYJavaGlobal &&value) : + CYJavaBase(value.jni_, value.value_) + { + value.value_ = NULL; + } +}; + +template +struct CYJavaLocal : + CYJavaDelete +{ + typedef CYJavaDelete CYJavaBase; + + CYJavaLocal() : + CYJavaBase(NULL, NULL) + { + } + + CYJavaLocal(JNIEnv *jni, Value_ value) : + CYJavaBase(jni, value) + { + } + + template + CYJavaLocal(const CYJavaRef &other) : + CYJavaLocal(other.jni_, static_cast(other.jni_->NewLocalRef(other.value_))) + { + } + + template + CYJavaLocal(CYJavaRef &&other) : + CYJavaLocal(other.jni_, other.value_) + { + other.value_ = NULL; + } + + CYJavaLocal(CYJavaLocal &&other) : + CYJavaLocal(static_cast &&>(other)) + { + } + + template + CYJavaLocal &operator =(CYJavaLocal &&other) { + this->clear(); + this->jni_ = other.jni_; + this->value_ = other.value_; + other.value_ = NULL; + return *this; + } +}; +// }}} +// Java Strings {{{ +static CYJavaLocal CYCastJavaString(const CYJavaRef &value); class CYJavaUTF8String : public CYUTF8String { private: - JNIEnv *jni_; - jstring value_; + const CYJavaRef *value_; public: - CYJavaUTF8String(JNIEnv *jni, jstring value) : - jni_(jni), - value_(value) + CYJavaUTF8String(const CYJavaRef &value) : + value_(&value) + { + _assert(value); + JNIEnv *jni(value.jni()); + size = jni->GetStringUTFLength(value); + data = jni->GetStringUTFChars(value, NULL); + } + + CYJavaUTF8String(const CYJavaRef &value) : + CYJavaUTF8String(CYCastJavaString(value)) { - size = jni_->GetStringUTFLength(value_); - data = jni_->GetStringUTFChars(value_, NULL); } ~CYJavaUTF8String() { - if (value_ != NULL) - jni_->ReleaseStringUTFChars(value_, data); + if (value_ != NULL) { + JNIEnv *jni(value_->jni()); + jni->ReleaseStringUTFChars(*value_, data); + } } CYJavaUTF8String(const CYJavaUTF8String &) = delete; CYJavaUTF8String(CYJavaUTF8String &&rhs) : - jni_(rhs.jni_), value_(rhs.value_) { rhs.value_ = NULL; } }; -CYJavaUTF8String CYCastUTF8String(JNIEnv *jni, jstring value) { - return CYJavaUTF8String(jni, value); +CYJavaUTF8String CYCastUTF8String(const CYJavaRef &value) { + return CYJavaUTF8String(value); } -JSStringRef CYCopyJSString(JNIEnv *jni, jstring value) { - return CYCopyJSString(CYCastUTF8String(jni, value)); +JSStringRef CYCopyJSString(const CYJavaRef &value) { + return CYCopyJSString(CYCastUTF8String(value)); } +// }}} +// Java Error {{{ +struct CYJavaError : + CYException +{ + CYJavaGlobal value_; -template -struct CYJavaGlobal { + CYJavaError(const CYJavaRef &value) : + value_(value) + { + } + + virtual const char *PoolCString(CYPool &pool) const { + return CYPoolCString(pool, CYJavaUTF8String(value_.cast())); + } + + virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const; +}; +// }}} + +struct CYJavaFrame { JNIEnv *jni_; - Value_ value_; - CYJavaGlobal() : - jni_(NULL), - value_(NULL) + CYJavaFrame(JNIEnv *jni, jint capacity) : + jni_(jni) { + _assert(jni->PushLocalFrame(capacity) == 0); } - CYJavaGlobal(JNIEnv *jni, Value_ value) : - jni_(jni), - value_(static_cast(_envcall(jni_, NewGlobalRef(value)))) - { + ~CYJavaFrame() { + operator ()(NULL); + } + + operator JNIEnv *() const { + return jni_; } - CYJavaGlobal(const CYJavaGlobal &value) : - CYJavaGlobal(value.jni_, value.value_) + jobject operator ()(jobject object) { + JNIEnv *jni(jni_); + jni_ = NULL; + return jni->PopLocalFrame(object); + } +}; + +struct CYJavaEnv { + private: + JNIEnv *jni; + + public: + CYJavaEnv(JNIEnv *jni) : + jni(jni) { } - CYJavaGlobal(CYJavaGlobal &&value) : - jni_(value.jni_), - value_(value.value_) + template + CYJavaEnv(const CYJavaRef &value) : + jni(value.jni()) { - value.value_ = NULL; } - ~CYJavaGlobal() { - if (value_ != NULL) - _envcallv(jni_, DeleteGlobalRef(value_)); + operator JNIEnv *() const { + return jni; } - operator bool() const { - return value_ != NULL; + JNIEnv *operator ->() const { + return jni; } - operator JNIEnv *() const { - return jni_; + CYJavaLocal FindClass(const char *name) const { + return {jni, _envcall(jni, FindClass(name))}; } - operator Value_() const { - return value_; + CYJavaLocal GetObjectClass(jobject object) const { + return {jni, _envcall(jni, GetObjectClass(object))}; } -}; -template -struct CYJavaValue : - CYPrivate -{ - CYJavaGlobal value_; + CYJavaLocal GetSuperclass(jclass _class) const { + return {jni, _envcall(jni, GetSuperclass(_class))}; + } - CYJavaValue(JNIEnv *jni, Value_ value) : - value_(jni, value) - { + CYJavaLocal NewObject(jclass _class, jmethodID method, ...) const { + va_list args; + va_start(args, method); + jobject object(_envcall(jni, NewObjectV(_class, method, args))); + va_end(args); + return {jni, object}; } - CYJavaValue(const CYJavaValue &) = delete; -}; + CYJavaLocal NewObjectA(jclass _class, jmethodID method, jvalue *args) const { + return {jni, _envcall(jni, NewObjectA(_class, method, args))}; + } -#define CYJavaForEachPrimitive \ - CYJavaForEachPrimitive_(Z, Boolean, Boolean, boolean) \ - CYJavaForEachPrimitive_(B, Byte, Byte, byte) \ - CYJavaForEachPrimitive_(C, Char, Character, char) \ - CYJavaForEachPrimitive_(S, Short, Short, short) \ - CYJavaForEachPrimitive_(I, Int, Integer, int) \ - CYJavaForEachPrimitive_(J, Long, Long, long) \ - CYJavaForEachPrimitive_(F, Float, Float, float) \ - CYJavaForEachPrimitive_(D, Double, Double, double) + CYJavaLocal NewString(const jchar *data, jsize size) const { + return {jni, _envcall(jni, NewString(data, size))}; + } -enum CYJavaPrimitive : char { - CYJavaPrimitiveObject, - CYJavaPrimitiveVoid, -#define CYJavaForEachPrimitive_(T, Typ, Type, type) \ - CYJavaPrimitive ## Type, +#define CYJavaEnv_(Code) \ + template \ + void Code(Args_ &&... args) const { \ + _envcallv(jni, Code(cy::Forward(args)...)); \ + } + +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ + CYJavaEnv_(Get ## Typ ## ArrayRegion) \ + CYJavaEnv_(Set ## Typ ## Field) \ + CYJavaEnv_(SetStatic ## Typ ## Field) +CYJavaForEachPrimitive +#undef CYJavaForEachPrimitive_ + + CYJavaEnv_(CallVoidMethod) + CYJavaEnv_(CallStaticVoidMethod) + CYJavaEnv_(CallVoidMethodA) + CYJavaEnv_(CallStaticVoidMethodA) + CYJavaEnv_(SetObjectArrayElement) + CYJavaEnv_(SetObjectField) + CYJavaEnv_(SetStaticObjectField) +#undef CYJavaEnv_ + +#define CYJavaEnv_(Code) \ + template \ + auto Code(Args_ &&... args) const -> decltype(jni->Code(cy::Forward(args)...)) { \ + return _envcall(jni, Code(cy::Forward(args)...)); \ + } + +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ + CYJavaEnv_(Call ## Typ ## Method) \ + CYJavaEnv_(CallStatic ## Typ ## Method) \ + CYJavaEnv_(Call ## Typ ## MethodA) \ + CYJavaEnv_(CallStatic ## Typ ## MethodA) \ + CYJavaEnv_(Get ## Typ ## Field) \ + CYJavaEnv_(GetStatic ## Typ ## Field) CYJavaForEachPrimitive #undef CYJavaForEachPrimitive_ + + CYJavaEnv_(FromReflectedField) + CYJavaEnv_(FromReflectedMethod) + CYJavaEnv_(GetArrayLength) + CYJavaEnv_(GetMethodID) + CYJavaEnv_(GetStaticMethodID) + CYJavaEnv_(IsSameObject) + CYJavaEnv_(RegisterNatives) +#undef CYJavaEnv_ + +#define CYJavaEnv_(Code) \ + template \ + auto Code(Args_ &&... args) const -> CYJavaLocal { \ + return {jni, static_cast(_envcall(jni, Code(cy::Forward(args)...)))}; \ + } + + CYJavaEnv_(CallObjectMethod) + CYJavaEnv_(CallStaticObjectMethod) + CYJavaEnv_(CallObjectMethodA) + CYJavaEnv_(CallStaticObjectMethodA) + CYJavaEnv_(GetObjectArrayElement) + CYJavaEnv_(GetObjectField) + CYJavaEnv_(GetStaticObjectField) +#undef CYJavaEnv_ }; +static CYJavaLocal CYCastJavaString(const CYJavaRef &value) { + CYJavaEnv jni(value); + auto Object$(jni.FindClass("java/lang/Object")); + auto Object$toString(jni.GetMethodID(Object$, "toString", "()Ljava/lang/String;")); + return jni.CallObjectMethod(value, Object$toString); +} + +static JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef &value); + +template +static _finline JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef &value) { + return CYCastJSValue(context, value.template cast()); +} + template static _finline JSValueRef CYJavaCastJSValue(JSContextRef context, Type_ value) { return CYCastJSValue(context, value); @@ -217,21 +465,30 @@ static _finline JSValueRef CYJavaCastJSValue(JSContextRef context, jboolean valu return CYCastJSValue(context, static_cast(value)); } +JSValueRef CYJavaError::CastJSValue(JSContextRef context, const char *name) const { + return CYCastJSValue(context, value_); +} + static std::map Primitives_; -static CYJavaPrimitive CYJavaGetPrimitive(JNIEnv *jni, jobject type, jmethodID Class$get$$Name) { - CYJavaUTF8String name(jni, static_cast(_envcall(jni, CallObjectMethod(type, Class$get$$Name)))); +static CYJavaPrimitive CYJavaGetPrimitive(JSContextRef context, const CYJavaRef &type, jmethodID Class$get$$Name) { + CYJavaEnv jni(type); + auto string(jni.CallObjectMethod(type, Class$get$$Name)); + _assert(string); + + CYJavaUTF8String name(string); auto primitive(Primitives_.find(name)); return primitive != Primitives_.end() ? primitive->second : CYJavaPrimitiveObject; } typedef std::vector CYJavaShorty; -static CYJavaShorty CYJavaGetShorty(JNIEnv *jni, jobjectArray types, jmethodID Class$get$$Name) { - size_t count(_envcall(jni, GetArrayLength(types))); +static CYJavaShorty CYJavaGetShorty(JSContextRef context, const CYJavaRef &types, jmethodID Class$get$$Name) { + CYJavaEnv jni(types); + size_t count(jni.GetArrayLength(types)); CYJavaShorty shorty(count); for (size_t index(0); index != count; ++index) - shorty[index] = CYJavaGetPrimitive(jni, _envcall(jni, GetObjectArrayElement(types, index)), Class$get$$Name); + shorty[index] = CYJavaGetPrimitive(context, jni.GetObjectArrayElement(types, index), Class$get$$Name); return shorty; } @@ -243,66 +500,81 @@ struct CYJavaField { typedef std::map CYJavaFieldMap; struct CYJavaSignature { - CYJavaGlobal method; - CYJavaPrimitive primitive; - CYJavaShorty shorty; - - CYJavaSignature(JNIEnv *jni, jobject method, CYJavaPrimitive primitive, const CYJavaShorty &shorty) : - method(jni, method), - primitive(primitive), - shorty(shorty) + CYJavaGlobal reflected_; + jmethodID method_; + CYJavaPrimitive primitive_; + CYJavaShorty shorty_; + + CYJavaSignature(const CYJavaRef &reflected, jmethodID method, CYJavaPrimitive primitive, const CYJavaShorty &shorty) : + reflected_(reflected), + method_(method), + primitive_(primitive), + shorty_(shorty) { } CYJavaSignature(unsigned count) : - shorty(count) + shorty_(count) { } bool operator <(const CYJavaSignature &rhs) const { - return shorty.size() < rhs.shorty.size(); + return shorty_.size() < rhs.shorty_.size(); } }; typedef std::multiset CYJavaOverload; struct CYJavaMethod : - CYPrivate + CYRoot { - JNIEnv *jni_; CYJavaOverload overload_; - // XXX: figure out move constructors on Apple's crappy toolchain - CYJavaMethod(JNIEnv *jni, const CYJavaOverload &overload) : - jni_(jni), + CYJavaMethod(const CYJavaOverload &overload) : + overload_(overload) + { + } +}; + +struct CYJavaStaticMethod : + CYRoot +{ + CYJavaOverload overload_; + + CYJavaStaticMethod(const CYJavaOverload &overload) : overload_(overload) { } }; struct CYJavaClass : - CYJavaValue + CYRoot { + CYJavaGlobal value_; + bool interface_; + CYJavaFieldMap static_; CYJavaFieldMap instance_; CYJavaOverload overload_; - CYJavaClass(JNIEnv *jni, jclass value) : - CYJavaValue(jni, value) + CYJavaClass(const CYJavaRef &value, bool interface) : + value_(value), + interface_(interface) { } }; -static JSObjectRef CYGetJavaClass(JSContextRef context, JNIEnv *jni, jclass _class); +static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef &_class); struct CYJavaObject : - CYJavaValue + CYRoot { + CYJavaGlobal value_; CYJavaClass *table_; - CYJavaObject(JNIEnv *jni, jobject value, JSContextRef context) : - CYJavaValue(jni, value), - table_(reinterpret_cast(JSObjectGetPrivate(CYGetJavaClass(context, jni, _envcall(jni, GetObjectClass(value)))))) + CYJavaObject(const CYJavaRef &value, CYJavaClass *table) : + value_(value), + table_(table) { } @@ -310,53 +582,116 @@ struct CYJavaObject : }; struct CYJavaInterior : - CYJavaValue + CYRoot { + CYJavaGlobal value_; CYJavaClass *table_; - CYJavaInterior(JNIEnv *jni, jobject value, CYJavaClass *table) : - CYJavaValue(jni, value), + CYJavaInterior(const CYJavaRef &value, CYJavaClass *table) : + value_(value), table_(table) { } }; +struct CYJavaStaticInterior : + CYRoot +{ + CYJavaGlobal value_; + CYJavaClass *table_; + + CYJavaStaticInterior(const CYJavaRef &value, CYJavaClass *table) : + value_(value), + table_(table) + { + } +}; + +struct CYJavaArray : + CYRoot +{ + CYJavaGlobal value_; + CYJavaPrimitive primitive_; + + CYJavaArray(const CYJavaRef &value, CYJavaPrimitive primitive) : + value_(value), + primitive_(primitive) + { + } + + JSValueRef GetPrototype(JSContextRef context) const; +}; + struct CYJavaPackage : - CYPrivate + CYRoot { + JNIEnv *jni_; + typedef std::vector Path; Path package_; - _finline CYJavaPackage(const Path &package) : + _finline CYJavaPackage(JNIEnv *jni, const Path &package) : + jni_(jni), package_(package) { } }; JSValueRef CYJavaObject::GetPrototype(JSContextRef context) const { - JNIEnv *jni(value_); - return CYGetProperty(context, CYGetJavaClass(context, jni, _envcall(jni, GetObjectClass(value_))), prototype_s); + CYJavaEnv jni(value_); + return CYGetProperty(context, CYGetJavaClass(context, jni.GetObjectClass(value_)), prototype_s); +} + +JSValueRef CYJavaArray::GetPrototype(JSContextRef context) const { + return CYGetCachedObject(context, CYJSString("Array_prototype")); } -static JSValueRef CYCastJSValue(JSContextRef context, JNIEnv *jni, jobject value) { - if (value == NULL) +static JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef &value) { + if (!value) return CYJSNull(context); - return CYJavaObject::Make(context, jni, value, context); + CYJavaEnv jni(value); + + auto _class(jni.GetObjectClass(value)); + if (jni.IsSameObject(_class, jni.FindClass("java/lang/String"))) + return CYCastJSValue(context, CYJSString(value.cast())); + + auto Class$(jni.FindClass("java/lang/Class")); + auto Class$isArray(jni.GetMethodID(Class$, "isArray", "()Z")); + if (jni.CallBooleanMethod(_class, Class$isArray)) { + auto Class$getComponentType(jni.GetMethodID(Class$, "getComponentType", "()Ljava/lang/Class;")); + auto component(jni.CallObjectMethod(_class, Class$getComponentType)); + auto Class$getName(jni.GetMethodID(Class$, "getName", "()Ljava/lang/String;")); + return CYPrivate::Make(context, value.cast(), CYJavaGetPrimitive(context, component, Class$getName)); + } + + auto Wrapper$(jni.FindClass("Cycript$Wrapper")); + if (jni.IsSameObject(_class, Wrapper$)) { + auto Wrapper$getProtect(jni.GetMethodID(Wrapper$, "getProtect", "()J")); + auto &protect(*reinterpret_cast(jni.CallLongMethod(value, Wrapper$getProtect))); + return protect; + } + + CYJavaClass *table(reinterpret_cast(JSObjectGetPrivate(CYGetJavaClass(context, _class)))); + return CYPrivate::Make(context, value, table); +} + +static _finline JSObjectRef CYCastJSObject(JSContextRef context, const CYJavaRef &value) { + return CYCastJSObject(context, CYCastJSValue(context, value)); } -static jstring CYCastJavaString(JNIEnv *jni, CYUTF16String value) { - return _envcall(jni, NewString(value.data, value.size)); +static CYJavaLocal CYCastJavaString(const CYJavaEnv &jni, JSContextRef context, CYUTF16String value) { + return jni.NewString(value.data, value.size); } -static jstring CYCastJavaString(JNIEnv *jni, JSStringRef value) { - return CYCastJavaString(jni, CYCastUTF16String(value)); +static CYJavaLocal CYCastJavaString(const CYJavaEnv &jni, JSContextRef context, JSStringRef value) { + return CYCastJavaString(jni, context, CYCastUTF16String(value)); } #define CYCastJava$(T, Type, jtype, Cast) \ -_disused static jobject CYCastJava ## Type(JNIEnv *jni, JSContextRef context, JSValueRef value) { \ - jclass Type$(_envcall(jni, FindClass("java/lang/" #Type))); \ - jmethodID Type$init$(_envcall(jni, GetMethodID(Type$, "", "(" #T ")V"))); \ - return _envcall(jni, NewObject(Type$, Type$init$, static_cast(Cast(context, value)))); \ +_disused static CYJavaLocal CYCastJava ## Type(const CYJavaEnv &jni, JSContextRef context, JSValueRef value) { \ + auto Type$(jni.FindClass("java/lang/" #Type)); \ + auto Type$init$(jni.GetMethodID(Type$, "", "(" #T ")V")); \ + return jni.NewObject(Type$, Type$init$, static_cast(Cast(context, value))); \ } CYCastJava$(Z, Boolean, jboolean, CYCastBool) @@ -368,133 +703,161 @@ CYCastJava$(J, Long, jlong, CYCastDouble) CYCastJava$(F, Float, jfloat, CYCastDouble) CYCastJava$(D, Double, jdouble, CYCastDouble) -static jobject CYCastJavaObject(JNIEnv *jni, JSContextRef context, JSObjectRef value) { - JSObjectRef object(CYCastJSObject(context, value)); - if (JSValueIsObjectOfClass(context, value, CYJavaObject::Class_)) { - CYJavaObject *internal(reinterpret_cast(JSObjectGetPrivate(object))); +static CYJavaClass *CYGetJavaTable(JSContextRef context, JSObjectRef object) { + if (!JSValueIsObjectOfClass(context, object, CYPrivate::Class_)) + return NULL; + return reinterpret_cast(JSObjectGetPrivate(object)); +} + +static CYJavaObject *CYGetJavaObject(JSContextRef context, JSObjectRef object) { + if (!JSValueIsObjectOfClass(context, object, CYPrivate::Class_)) + return NULL; + return reinterpret_cast(JSObjectGetPrivate(object)); +} + +static CYJavaLocal CYCastJavaObject(const CYJavaEnv &jni, JSContextRef context, JSObjectRef value) { + if (CYJavaObject *internal = CYGetJavaObject(context, value)) return internal->value_; - } - _assert(false); + auto Wrapper$(jni.FindClass("Cycript$Wrapper")); + auto Wrapper$$init$(jni.GetMethodID(Wrapper$, "", "(J)V")); + CYProtect *protect(new CYProtect(context, value)); + return jni.NewObject(Wrapper$, Wrapper$$init$, reinterpret_cast(protect)); } -static jobject CYCastJavaObject(JNIEnv *jni, JSContextRef context, JSValueRef value) { +static CYJavaLocal CYCastJavaObject(const CYJavaEnv &jni, JSContextRef context, JSValueRef value) { switch (JSValueGetType(context, value)) { case kJSTypeNull: - return NULL; + return {jni, NULL}; case kJSTypeBoolean: return CYCastJavaBoolean(jni, context, value); case kJSTypeNumber: return CYCastJavaDouble(jni, context, value); case kJSTypeString: - return CYCastJavaString(jni, CYJSString(context, value)); + return CYCastJavaString(jni, context, CYJSString(context, value)); case kJSTypeObject: return CYCastJavaObject(jni, context, CYCastJSObject(context, value)); case kJSTypeUndefined: + // XXX: I am currently relying on this for dynamic proxy of void method + return {jni, NULL}; default: _assert(false); } } -static JSObjectRef CYGetJavaClass(JSContextRef context, JNIEnv *jni, jclass value) { +static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef &value) { + CYJavaEnv jni(value); + CYJavaFrame frame(jni, 64); + JSObjectRef global(CYGetGlobalObject(context)); JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s))); - jclass Class$(_envcall(jni, FindClass("java/lang/Class"))); - jmethodID Class$getCanonicalName(_envcall(jni, GetMethodID(Class$, "getCanonicalName", "()Ljava/lang/String;"))); + auto Class$(jni.FindClass("java/lang/Class")); + auto Class$getName(jni.GetMethodID(Class$, "getName", "()Ljava/lang/String;")); - CYJSString name(jni, static_cast(_envcall(jni, CallObjectMethod(value, Class$getCanonicalName)))); + CYJSString name(jni.CallObjectMethod(value, Class$getName)); JSValueRef cached(CYGetProperty(context, cy, name)); if (!JSValueIsUndefined(context, cached)) return CYCastJSObject(context, cached); - jmethodID Class$getDeclaredConstructors(_envcall(jni, GetMethodID(Class$, "getDeclaredConstructors", "()[Ljava/lang/reflect/Constructor;"))); - jmethodID Class$getDeclaredFields(_envcall(jni, GetMethodID(Class$, "getDeclaredFields", "()[Ljava/lang/reflect/Field;"))); - jmethodID Class$getDeclaredMethods(_envcall(jni, GetMethodID(Class$, "getDeclaredMethods", "()[Ljava/lang/reflect/Method;"))); + JSObjectRef constructor; + JSObjectRef prototype; - jclass Constructor$(_envcall(jni, FindClass("java/lang/reflect/Constructor"))); - //jmethodID Constructor$getModifiers(_envcall(jni, GetMethodID(Constructor$, "getModifiers", "()I"))); - jmethodID Constructor$getParameterTypes(_envcall(jni, GetMethodID(Constructor$, "getParameterTypes", "()[Ljava/lang/Class;"))); + { + + auto Class$isInterface(jni.GetMethodID(Class$, "isInterface", "()Z")); + + auto Class$getDeclaredConstructors(jni.GetMethodID(Class$, "getDeclaredConstructors", "()[Ljava/lang/reflect/Constructor;")); + auto Class$getDeclaredFields(jni.GetMethodID(Class$, "getDeclaredFields", "()[Ljava/lang/reflect/Field;")); + auto Class$getDeclaredMethods(jni.GetMethodID(Class$, "getDeclaredMethods", "()[Ljava/lang/reflect/Method;")); - jclass Field$(_envcall(jni, FindClass("java/lang/reflect/Field"))); - jmethodID Field$getModifiers(_envcall(jni, GetMethodID(Field$, "getModifiers", "()I"))); - jmethodID Field$getName(_envcall(jni, GetMethodID(Field$, "getName", "()Ljava/lang/String;"))); - jmethodID Field$getType(_envcall(jni, GetMethodID(Field$, "getType", "()Ljava/lang/Class;"))); + auto Constructor$(jni.FindClass("java/lang/reflect/Constructor")); + //auto Constructor$getModifiers(jni.GetMethodID(Constructor$, "getModifiers", "()I")); + auto Constructor$getParameterTypes(jni.GetMethodID(Constructor$, "getParameterTypes", "()[Ljava/lang/Class;")); - jclass Method$(_envcall(jni, FindClass("java/lang/reflect/Method"))); - jmethodID Method$getModifiers(_envcall(jni, GetMethodID(Method$, "getModifiers", "()I"))); - jmethodID Method$getName(_envcall(jni, GetMethodID(Method$, "getName", "()Ljava/lang/String;"))); - jmethodID Method$getParameterTypes(_envcall(jni, GetMethodID(Method$, "getParameterTypes", "()[Ljava/lang/Class;"))); - jmethodID Method$getReturnType(_envcall(jni, GetMethodID(Method$, "getReturnType", "()Ljava/lang/Class;"))); + auto Field$(jni.FindClass("java/lang/reflect/Field")); + auto Field$getModifiers(jni.GetMethodID(Field$, "getModifiers", "()I")); + auto Field$getName(jni.GetMethodID(Field$, "getName", "()Ljava/lang/String;")); + auto Field$getType(jni.GetMethodID(Field$, "getType", "()Ljava/lang/Class;")); - jclass Modifier$(_envcall(jni, FindClass("java/lang/reflect/Modifier"))); - jmethodID Modifier$isStatic(_envcall(jni, GetStaticMethodID(Modifier$, "isStatic", "(I)Z"))); + auto Method$(jni.FindClass("java/lang/reflect/Method")); + auto Method$getModifiers(jni.GetMethodID(Method$, "getModifiers", "()I")); + auto Method$getName(jni.GetMethodID(Method$, "getName", "()Ljava/lang/String;")); + auto Method$getParameterTypes(jni.GetMethodID(Method$, "getParameterTypes", "()[Ljava/lang/Class;")); + auto Method$getReturnType(jni.GetMethodID(Method$, "getReturnType", "()Ljava/lang/Class;")); - CYJavaClass *table(new CYJavaClass(jni, value)); + auto Modifier$(jni.FindClass("java/lang/reflect/Modifier")); + auto Modifier$isStatic(jni.GetStaticMethodID(Modifier$, "isStatic", "(I)Z")); - for (jclass prototype(value); prototype != NULL; prototype = _envcall(jni, GetSuperclass(prototype))) { - jobjectArray fields(static_cast(_envcall(jni, CallObjectMethod(prototype, Class$getDeclaredFields)))); + auto interface(jni.CallBooleanMethod(value, Class$isInterface)); + auto table(new CYJavaClass(value, interface)); - for (jsize i(0), e(_envcall(jni, GetArrayLength(fields))); i != e; ++i) { - jobject field(_envcall(jni, GetObjectArrayElement(fields, e - i - 1))); - jint modifiers(_envcall(jni, CallIntMethod(field, Field$getModifiers))); - bool instance(!_envcall(jni, CallStaticBooleanMethod(Modifier$, Modifier$isStatic, modifiers))); + for (CYJavaLocal prototype(value); prototype; prototype = jni.GetSuperclass(prototype)) { + auto fields(jni.CallObjectMethod(prototype, Class$getDeclaredFields)); + + for (jsize i(0), e(jni.GetArrayLength(fields)); i != e; ++i) { + auto field(jni.GetObjectArrayElement(fields, e - i - 1)); + auto modifiers(jni.CallIntMethod(field, Field$getModifiers)); + auto instance(!jni.CallStaticBooleanMethod(Modifier$, Modifier$isStatic, modifiers)); auto &map(instance ? table->instance_ : table->static_); - CYJavaUTF8String name(jni, static_cast(_envcall(jni, CallObjectMethod(field, Field$getName)))); - jfieldID id(_envcall(jni, FromReflectedField(field))); - jobject type(_envcall(jni, CallObjectMethod(field, Field$getType))); - map.insert(std::make_pair(std::string(name), CYJavaField{id, CYJavaGetPrimitive(jni, type, Class$getCanonicalName)})); + CYJavaUTF8String name(jni.CallObjectMethod(field, Field$getName)); + auto id(jni.FromReflectedField(field)); + auto type(jni.CallObjectMethod(field, Field$getType)); + map.insert(std::make_pair(std::string(name), CYJavaField{id, CYJavaGetPrimitive(context, type, Class$getName)})); } } - JSObjectRef constructor(JSObjectMake(context, CYJavaClass::Class_, table)); - JSObjectRef indirect(JSObjectMake(context, NULL, NULL)); - CYSetPrototype(context, constructor, indirect); + constructor = JSObjectMake(context, CYPrivate::Class_, table); - JSObjectRef prototype(JSObjectMake(context, NULL, NULL)); + prototype = JSObjectMake(context, NULL, NULL); CYSetProperty(context, constructor, prototype_s, prototype, kJSPropertyAttributeDontEnum); - jobjectArray constructors(static_cast(_envcall(jni, CallObjectMethod(value, Class$getDeclaredConstructors)))); + auto constructors(jni.CallObjectMethod(value, Class$getDeclaredConstructors)); - for (jsize i(0), e(_envcall(jni, GetArrayLength(constructors))); i != e; ++i) { - jobject constructor(_envcall(jni, GetObjectArrayElement(constructors, i))); - jobjectArray parameters(static_cast(_envcall(jni, CallObjectMethod(constructor, Constructor$getParameterTypes)))); - CYJavaShorty shorty(CYJavaGetShorty(jni, parameters, Class$getCanonicalName)); - table->overload_.insert(CYJavaSignature(jni, constructor, CYJavaPrimitiveObject, shorty)); + for (jsize i(0), e(jni.GetArrayLength(constructors)); i != e; ++i) { + auto constructor(jni.GetObjectArrayElement(constructors, i)); + auto parameters(jni.CallObjectMethod(constructor, Constructor$getParameterTypes)); + CYJavaShorty shorty(CYJavaGetShorty(context, parameters, Class$getName)); + auto id(jni.FromReflectedMethod(constructor)); + table->overload_.insert(CYJavaSignature(constructor, id, CYJavaPrimitiveObject, shorty)); } - jobjectArray methods(static_cast(_envcall(jni, CallObjectMethod(value, Class$getDeclaredMethods)))); + auto methods(jni.CallObjectMethod(value, Class$getDeclaredMethods)); std::map, CYJavaOverload> entries; - for (jsize i(0), e(_envcall(jni, GetArrayLength(methods))); i != e; ++i) { - jobject method(_envcall(jni, GetObjectArrayElement(methods, i))); - jint modifiers(_envcall(jni, CallIntMethod(method, Method$getModifiers))); - bool instance(!_envcall(jni, CallStaticBooleanMethod(Modifier$, Modifier$isStatic, modifiers))); - CYJavaUTF8String name(jni, static_cast(_envcall(jni, CallObjectMethod(method, Method$getName)))); - jobjectArray parameters(static_cast(_envcall(jni, CallObjectMethod(method, Method$getParameterTypes)))); - CYJavaShorty shorty(CYJavaGetShorty(jni, parameters, Class$getCanonicalName)); - jobject type(_envcall(jni, CallObjectMethod(method, Method$getReturnType))); - auto primitive(CYJavaGetPrimitive(jni, type, Class$getCanonicalName)); - entries[std::make_pair(instance, std::string(name))].insert(CYJavaSignature(jni, method, primitive, shorty)); + for (jsize i(0), e(jni.GetArrayLength(methods)); i != e; ++i) { + auto method(jni.GetObjectArrayElement(methods, i)); + auto modifiers(jni.CallIntMethod(method, Method$getModifiers)); + auto instance(!jni.CallStaticBooleanMethod(Modifier$, Modifier$isStatic, modifiers)); + CYJavaUTF8String name(jni.CallObjectMethod(method, Method$getName)); + auto parameters(jni.CallObjectMethod(method, Method$getParameterTypes)); + CYJavaShorty shorty(CYJavaGetShorty(context, parameters, Class$getName)); + auto type(jni.CallObjectMethod(method, Method$getReturnType)); + auto primitive(CYJavaGetPrimitive(context, type, Class$getName)); + auto id(jni.FromReflectedMethod(method)); + entries[std::make_pair(instance, std::string(name))].insert(CYJavaSignature(method, id, primitive, shorty)); } for (const auto &entry : entries) { bool instance(entry.first.first); CYJSString name(entry.first.second); auto &overload(entry.second); - auto target(instance ? prototype : indirect); - JSValueRef wrapper(CYJavaMethod::Make(context, jni, overload)); - CYSetProperty(context, target, name, wrapper, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete); + if (instance) + CYSetProperty(context, prototype, name, CYPrivate::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete); + else + CYSetProperty(context, constructor, name, CYPrivate::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete); + } + } // XXX: for some reason kJSPropertyAttributeDontEnum doesn't work if there's already a property with the same name // by not linking the prototypes until after we set the properties, we hide the parent property from this issue :( - if (jclass super = _envcall(jni, GetSuperclass(value))) { - JSObjectRef parent(CYGetJavaClass(context, jni, super)); - CYSetPrototype(context, indirect, CYGetPrototype(context, parent)); + if (auto super = jni.GetSuperclass(value)) { + JSObjectRef parent(CYGetJavaClass(context, super)); + CYSetPrototype(context, constructor, parent); CYSetPrototype(context, prototype, CYGetProperty(context, parent, prototype_s)); } @@ -502,71 +865,161 @@ static JSObjectRef CYGetJavaClass(JSContextRef context, JNIEnv *jni, jclass valu return constructor; } -static jobjectArray CYCastJavaArguments(JNIEnv *jni, const CYJavaShorty &shorty, JSContextRef context, const JSValueRef arguments[], jclass Object$) { - jobjectArray array(_envcall(jni, NewObjectArray(shorty.size(), Object$, NULL))); - for (size_t index(0); index != shorty.size(); ++index) { - jobject argument; - switch (shorty[index]) { - case CYJavaPrimitiveObject: - argument = CYCastJavaObject(jni, context, arguments[index]); - break; -#define CYJavaForEachPrimitive_(T, Typ, Type, type) \ - case CYJavaPrimitive ## Type: \ - argument = CYCastJava ## Type(jni, context, arguments[index]); \ - break; +static void CYCastJavaNumeric(jvalue &value, CYJavaPrimitive primitive, JSContextRef context, JSValueRef argument) { + switch (primitive) { +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ + case CYJavaPrimitive ## Type: \ + value.t = static_cast(CYCastDouble(context, argument)); \ + break; CYJavaForEachPrimitive #undef CYJavaForEachPrimitive_ + default: + _assert(false); + } +} + +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)); + jvalue &value(array[index]); + + 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; + + case CYJavaPrimitiveBoolean: + if (type != kJSTypeBoolean) + return false; + value.z = CYCastBool(context, argument); + break; + + case CYJavaPrimitiveCharacter: + if (type == kJSTypeNumber) + CYCastJavaNumeric(value, primitive, context, argument); + else if (type != kJSTypeString) + return false; + else { + CYJSString string(context, argument); + if (JSStringGetLength(string) != 1) + return false; + else + value.c = JSStringGetCharactersPtr(string)[0]; + } + break; + + case CYJavaPrimitiveByte: + case CYJavaPrimitiveShort: + case CYJavaPrimitiveInteger: + case CYJavaPrimitiveLong: + case CYJavaPrimitiveFloat: + case CYJavaPrimitiveDouble: + if (type != kJSTypeNumber) + return false; + CYCastJavaNumeric(value, primitive, context, argument); + break; + default: _assert(false); } - _envcallv(jni, SetObjectArrayElement(array, index, argument)); } - return array; + return true; } static JSValueRef JavaMethod_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - CYJavaMethod *internal(reinterpret_cast(JSObjectGetPrivate(object))); - JNIEnv *jni(internal->jni_); + auto internal(CYPrivate::Get(context, object)); + CYJavaObject *self(CYGetJavaObject(context, _this)); + _assert(self != NULL); + CYJavaEnv jni(self->value_); - jclass Object$(_envcall(jni, FindClass("java/lang/Object"))); + CYJavaSignature bound(count); + for (auto overload(internal->overload_.lower_bound(bound)), e(internal->overload_.upper_bound(bound)); overload != e; ++overload) { + CYJavaFrame frame(jni, count + 16); + jvalue array[count]; + if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array)) + continue; + jvalue *values(array); + switch (overload->primitive_) { + case CYJavaPrimitiveObject: + return CYCastJSValue(context, jni.CallObjectMethodA(self->value_, overload->method_, values)); + case CYJavaPrimitiveVoid: + jni.CallVoidMethodA(self->value_, overload->method_, values); + return CYJSUndefined(context); +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ + case CYJavaPrimitive ## Type: \ + return CYJavaCastJSValue(context, jni.Call ## Typ ## MethodA(self->value_, overload->method_, values)); +CYJavaForEachPrimitive +#undef CYJavaForEachPrimitive_ + default: _assert(false); + } + } - jclass Method$(_envcall(jni, FindClass("java/lang/reflect/Method"))); - jmethodID Method$invoke(_envcall(jni, GetMethodID(Method$, "invoke", "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"))); + CYThrow("invalid method call"); +} CYCatch(NULL) } - jobject self(CYCastJavaObject(jni, context, _this)); +static JSValueRef JavaStaticMethod_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + CYJavaClass *table(CYGetJavaTable(context, _this)); + CYJavaEnv jni(table->value_); CYJavaSignature bound(count); for (auto overload(internal->overload_.lower_bound(bound)), e(internal->overload_.upper_bound(bound)); overload != e; ++overload) { - jobjectArray array(CYCastJavaArguments(jni, overload->shorty, context, arguments, Object$)); - jobject object(_envcall(jni, CallObjectMethod(overload->method, Method$invoke, self, array))); - return CYCastJSValue(context, jni, object); + CYJavaFrame frame(jni, count + 16); + jvalue array[count]; + if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array)) + continue; + jvalue *values(array); + switch (overload->primitive_) { + case CYJavaPrimitiveObject: + return CYCastJSValue(context, jni.CallStaticObjectMethodA(table->value_, overload->method_, values)); + case CYJavaPrimitiveVoid: + jni.CallStaticVoidMethodA(table->value_, overload->method_, values); + return CYJSUndefined(context); +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ + case CYJavaPrimitive ## Type: \ + return CYJavaCastJSValue(context, jni.CallStatic ## Typ ## MethodA(table->value_, overload->method_, values)); +CYJavaForEachPrimitive +#undef CYJavaForEachPrimitive_ + default: _assert(false); + } } CYThrow("invalid method call"); } CYCatch(NULL) } static JSObjectRef JavaClass_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - CYJavaClass *table(reinterpret_cast(JSObjectGetPrivate(object))); - JNIEnv *jni(table->value_); - - jclass Object$(_envcall(jni, FindClass("java/lang/Object"))); - - jclass Constructor$(_envcall(jni, FindClass("java/lang/reflect/Constructor"))); - jmethodID Constructor$newInstance(_envcall(jni, GetMethodID(Constructor$, "newInstance", "([Ljava/lang/Object;)Ljava/lang/Object;"))); + auto table(CYPrivate::Get(context, object)); + CYJavaEnv jni(table->value_); + jclass _class(table->value_); + + if (table->interface_ && count == 1) { + auto Cycript$(jni.FindClass("Cycript")); + auto Cycript$Make(jni.GetStaticMethodID(Cycript$, "proxy", "(Ljava/lang/Class;LCycript$Wrapper;)Ljava/lang/Object;")); + return CYCastJSObject(context, jni.CallObjectMethod(Cycript$, Cycript$Make, _class, CYCastJavaObject(jni, context, CYCastJSObject(context, arguments[0])).get())); + } CYJavaSignature bound(count); for (auto overload(table->overload_.lower_bound(bound)), e(table->overload_.upper_bound(bound)); overload != e; ++overload) { - jobjectArray array(CYCastJavaArguments(jni, overload->shorty, context, arguments, Object$)); - jobject object(_envcall(jni, CallObjectMethod(overload->method, Constructor$newInstance, array))); - return CYCastJSObject(context, CYCastJSValue(context, jni, object)); + CYJavaFrame frame(jni, count + 16); + jvalue array[count]; + if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array)) + continue; + jvalue *values(array); + auto object(jni.NewObjectA(_class, overload->method_, values)); + return CYCastJSObject(context, object); } CYThrow("invalid constructor call"); -} CYCatch(NULL) } +} CYCatchObject() } -static bool JavaClass_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { - CYJavaClass *table(reinterpret_cast(JSObjectGetPrivate(object))); +static bool JavaStaticInterior_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { + auto internal(CYPrivate::Get(context, object)); + CYJavaClass *table(internal->table_); CYPool pool; auto name(CYPoolUTF8String(pool, context, property)); auto field(table->static_.find(name)); @@ -575,9 +1028,10 @@ static bool JavaClass_hasProperty(JSContextRef context, JSObjectRef object, JSSt return true; } -static JSValueRef JavaClass_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - CYJavaClass *table(reinterpret_cast(JSObjectGetPrivate(object))); - JNIEnv *jni(table->value_); +static JSValueRef JavaStaticInterior_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + CYJavaClass *table(internal->table_); + CYJavaEnv jni(table->value_); CYPool pool; auto name(CYPoolUTF8String(pool, context, property)); auto field(table->static_.find(name)); @@ -586,19 +1040,20 @@ static JSValueRef JavaClass_getProperty(JSContextRef context, JSObjectRef object switch (field->second.primitive_) { case CYJavaPrimitiveObject: - return CYCastJSValue(context, jni, _envcall(jni, GetStaticObjectField(table->value_, field->second.field_))); -#define CYJavaForEachPrimitive_(T, Typ, Type, type) \ + return CYCastJSValue(context, jni.GetStaticObjectField(table->value_, field->second.field_)); +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ case CYJavaPrimitive ## Type: \ - return CYJavaCastJSValue(context, _envcall(jni, GetStatic ## Typ ## Field(table->value_, field->second.field_))); + return CYJavaCastJSValue(context, jni.GetStatic ## Typ ## Field(table->value_, field->second.field_)); CYJavaForEachPrimitive #undef CYJavaForEachPrimitive_ default: _assert(false); } } CYCatch(NULL) } -static bool JavaClass_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { - CYJavaClass *table(reinterpret_cast(JSObjectGetPrivate(object))); - JNIEnv *jni(table->value_); +static bool JavaStaticInterior_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + CYJavaClass *table(internal->table_); + CYJavaEnv jni(table->value_); CYPool pool; auto name(CYPoolUTF8String(pool, context, property)); auto field(table->static_.find(name)); @@ -607,10 +1062,10 @@ static bool JavaClass_setProperty(JSContextRef context, JSObjectRef object, JSSt switch (field->second.primitive_) { case CYJavaPrimitiveObject: - _envcallv(jni, SetStaticObjectField(table->value_, field->second.field_, CYCastJavaObject(jni, context, value))); -#define CYJavaForEachPrimitive_(T, Typ, Type, type) \ + jni.SetStaticObjectField(table->value_, field->second.field_, CYCastJavaObject(jni, context, value)); +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ case CYJavaPrimitive ## Type: \ - _envcallv(jni, SetStatic ## Typ ## Field(table->value_, field->second.field_, CYCastDouble(context, value))); \ + jni.SetStatic ## Typ ## Field(table->value_, field->second.field_, CYCastDouble(context, value)); \ break; CYJavaForEachPrimitive #undef CYJavaForEachPrimitive_ @@ -620,19 +1075,20 @@ CYJavaForEachPrimitive return true; } CYCatch(false) } -static void JavaClass_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { - CYJavaClass *table(reinterpret_cast(JSObjectGetPrivate(object))); +static void JavaStaticInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { + auto internal(CYPrivate::Get(context, object)); + CYJavaClass *table(internal->table_); for (const auto &field : table->static_) JSPropertyNameAccumulatorAddName(names, CYJSString(field.first)); } static JSValueRef JavaClass_getProperty_class(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - CYJavaClass *table(reinterpret_cast(JSObjectGetPrivate(object))); - return CYCastJSValue(context, table->value_, table->value_); + auto table(CYPrivate::Get(context, object)); + return CYCastJSValue(context, table->value_); } CYCatch(NULL) } static bool JavaInterior_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { - CYJavaInterior *internal(reinterpret_cast(JSObjectGetPrivate(object))); + auto internal(CYPrivate::Get(context, object)); CYJavaClass *table(internal->table_); CYPool pool; auto name(CYPoolUTF8String(pool, context, property)); @@ -643,8 +1099,8 @@ static bool JavaInterior_hasProperty(JSContextRef context, JSObjectRef object, J } static JSValueRef JavaInterior_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - CYJavaInterior *internal(reinterpret_cast(JSObjectGetPrivate(object))); - JNIEnv *jni(internal->value_); + auto internal(CYPrivate::Get(context, object)); + CYJavaEnv jni(internal->value_); CYJavaClass *table(internal->table_); CYPool pool; auto name(CYPoolUTF8String(pool, context, property)); @@ -654,10 +1110,10 @@ static JSValueRef JavaInterior_getProperty(JSContextRef context, JSObjectRef obj switch (field->second.primitive_) { case CYJavaPrimitiveObject: - return CYCastJSValue(context, jni, _envcall(jni, GetObjectField(internal->value_, field->second.field_))); -#define CYJavaForEachPrimitive_(T, Typ, Type, type) \ + return CYCastJSValue(context, jni.GetObjectField(internal->value_, field->second.field_)); +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ case CYJavaPrimitive ## Type: \ - return CYJavaCastJSValue(context, _envcall(jni, Get ## Typ ## Field(internal->value_, field->second.field_))); + return CYJavaCastJSValue(context, jni.Get ## Typ ## Field(internal->value_, field->second.field_)); CYJavaForEachPrimitive #undef CYJavaForEachPrimitive_ default: _assert(false); @@ -665,8 +1121,8 @@ CYJavaForEachPrimitive } CYCatch(NULL) } static bool JavaInterior_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { - CYJavaInterior *internal(reinterpret_cast(JSObjectGetPrivate(object))); - JNIEnv *jni(internal->value_); + auto internal(CYPrivate::Get(context, object)); + CYJavaEnv jni(internal->value_); CYJavaClass *table(internal->table_); CYPool pool; auto name(CYPoolUTF8String(pool, context, property)); @@ -676,10 +1132,10 @@ static bool JavaInterior_setProperty(JSContextRef context, JSObjectRef object, J switch (field->second.primitive_) { case CYJavaPrimitiveObject: - _envcallv(jni, SetObjectField(table->value_, field->second.field_, CYCastJavaObject(jni, context, value))); -#define CYJavaForEachPrimitive_(T, Typ, Type, type) \ + jni.SetObjectField(table->value_, field->second.field_, CYCastJavaObject(jni, context, value)); +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ case CYJavaPrimitive ## Type: \ - _envcallv(jni, Set ## Typ ## Field(table->value_, field->second.field_, CYCastDouble(context, value))); \ + jni.Set ## Typ ## Field(table->value_, field->second.field_, CYCastDouble(context, value)); \ break; CYJavaForEachPrimitive #undef CYJavaForEachPrimitive_ @@ -690,22 +1146,107 @@ CYJavaForEachPrimitive } CYCatch(false) } static void JavaInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { - CYJavaInterior *internal(reinterpret_cast(JSObjectGetPrivate(object))); + auto internal(CYPrivate::Get(context, object)); CYJavaClass *table(internal->table_); for (const auto &field : table->instance_) JSPropertyNameAccumulatorAddName(names, CYJSString(field.first)); } static JSValueRef JavaObject_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - CYJavaObject *internal(reinterpret_cast(JSObjectGetPrivate(object))); - JNIEnv *jni(internal->value_); - return CYGetJavaClass(context, jni, _envcall(jni, GetObjectClass(internal->value_))); + auto internal(CYPrivate::Get(context, object)); + CYJavaEnv jni(internal->value_); + return CYGetJavaClass(context, jni.GetObjectClass(internal->value_)); +} CYCatch(NULL) } + +static JSValueRef JavaClass_getProperty_$cyi(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + return CYPrivate::Make(context, internal->value_, internal); } CYCatch(NULL) } static JSValueRef JavaObject_getProperty_$cyi(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - CYJavaObject *internal(reinterpret_cast(JSObjectGetPrivate(object))); - JNIEnv *jni(internal->value_); - return CYJavaInterior::Make(context, jni, internal->value_, internal->table_); + auto internal(CYPrivate::Get(context, object)); + return CYPrivate::Make(context, internal->value_, internal->table_); +} CYCatch(NULL) } + +static JSValueRef JavaClass_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, _this)); + CYJavaEnv jni(internal->value_); + auto Class$(jni.FindClass("java/lang/Class")); + auto Class$getCanonicalName(jni.GetMethodID(Class$, "getCanonicalName", "()Ljava/lang/String;")); + return CYCastJSValue(context, CYJSString(jni.CallObjectMethod(internal->value_, Class$getCanonicalName))); +} CYCatch(NULL) } + +static JSValueRef JavaMethod_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + std::ostringstream cyon; + return CYCastJSValue(context, CYJSString(cyon.str())); +} CYCatch(NULL) } + +static JSValueRef JavaStaticMethod_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + std::ostringstream cyon; + return CYCastJSValue(context, CYJSString(cyon.str())); +} CYCatch(NULL) } + +static JSValueRef JavaArray_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + CYJavaEnv jni(internal->value_); + if (JSStringIsEqual(property, length_s)) + return CYCastJSValue(context, jni.GetArrayLength(internal->value_)); + + CYPool pool; + ssize_t offset; + if (!CYGetOffset(pool, context, property, offset)) + return NULL; + + if (internal->primitive_ == CYJavaPrimitiveObject) + return CYCastJSValue(context, jni.GetObjectArrayElement(static_cast(internal->value_.value_), offset)); + else switch (internal->primitive_) { +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ + case CYJavaPrimitive ## Type: { \ + j ## type element; \ + jni.Get ## Typ ## ArrayRegion(static_cast(internal->value_.value_), offset, 1, &element); \ + return CYJavaCastJSValue(context, element); \ + } break; +CYJavaForEachPrimitive +#undef CYJavaForEachPrimitive_ + default: _assert(false); + } +} CYCatch(NULL) } + +static bool JavaArray_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + CYJavaEnv jni(internal->value_); + + CYPool pool; + ssize_t offset; + if (!CYGetOffset(pool, context, property, offset)) + return false; + + if (internal->primitive_ == CYJavaPrimitiveObject) + jni.SetObjectArrayElement(static_cast(internal->value_.value_), offset, CYCastJavaObject(jni, context, value)); + else switch (internal->primitive_) { +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ + case CYJavaPrimitive ## Type: { \ + j ## type element; \ + jni.Get ## Typ ## ArrayRegion(static_cast(internal->value_.value_), offset, 1, &element); \ + return CYJavaCastJSValue(context, element); \ + } break; +CYJavaForEachPrimitive +#undef CYJavaForEachPrimitive_ + default: _assert(false); + } + + return true; +} CYCatch(false) } + +static JNIEnv *GetJNI(JSContextRef context, JNIEnv *&env); + +static JSValueRef JavaPackage_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, _this)); + std::ostringstream name; + for (auto &package : internal->package_) + name << package << '.'; + name << '*'; + return CYCastJSValue(context, CYJSString(name.str())); } CYCatch(NULL) } static bool CYJavaPackage_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { @@ -713,7 +1254,7 @@ static bool CYJavaPackage_hasProperty(JSContextRef context, JSObjectRef object, } static JSValueRef CYJavaPackage_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - CYJavaPackage *internal(reinterpret_cast(JSObjectGetPrivate(object))); + auto internal(CYPrivate::Get(context, object)); CYJavaPackage::Path package(internal->package_); CYPool pool; @@ -724,33 +1265,259 @@ static JSValueRef CYJavaPackage_getProperty(JSContextRef context, JSObjectRef ob name << package << '/'; name << next; - JNIEnv *jni(GetJNI()); - if (jclass _class = jni->FindClass(name.str().c_str())) - return CYGetJavaClass(context, jni, _class); + if (internal->jni_ == NULL) + GetJNI(context, internal->jni_); + JNIEnv *jni(internal->jni_); + + if (auto _class = jni->FindClass(name.str().c_str())) + return CYGetJavaClass(context, CYJavaLocal(jni, _class)); jni->ExceptionClear(); package.push_back(next); - return CYJavaPackage::Make(context, package); + return CYPrivate::Make(context, jni, package); } CYCatch(NULL) } -static JSStaticValue JavaClass_staticValues[2] = { +static void Cycript_delete(JNIEnv *env, jclass api, jlong jprotect) { CYJavaTry { + delete &protect; +} CYJavaCatch() } + +static jobject Cycript_handle(JNIEnv *env, jclass api, jlong jprotect, jstring property, jobjectArray jarguments) { CYJavaTry { + JSValueRef function(CYGetProperty(context, object, CYJSString(CYJavaRef(jni, property)))); + if (JSValueIsUndefined(context, function)) + return NULL; + + size_t count(jarguments == NULL ? 0 : jni.GetArrayLength(jarguments)); + JSValueRef arguments[count]; + for (size_t index(0); index != count; ++index) + arguments[index] = CYCastJSValue(context, jni.GetObjectArrayElement(jarguments, index)); + + return CYCastJavaObject(jni, context, CYCallAsFunction(context, CYCastJSObject(context, function), object, count, arguments)).leak(); +} CYJavaCatch(NULL) } + +static JNINativeMethod Cycript_[] = { + {(char *) "delete", (char *) "(J)V", (void *) &Cycript_delete}, + {(char *) "handle", (char *) "(JLjava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;", (void *) &Cycript_handle}, +}; + +template +static _finline void dlset(Type_ &function, const char *name, void *handle) { + function = reinterpret_cast(dlsym(handle, name)); +} + +jint CYJavaVersion(JNI_VERSION_1_4); + +static JavaVM *CYGetJavaVM(jint (*$JNI_GetCreatedJavaVMs)(JavaVM **, jsize, jsize *)) { + jsize capacity(16); + JavaVM *jvms[capacity]; + jsize size; + _jnicall($JNI_GetCreatedJavaVMs(jvms, capacity, &size)); + if (size == 0) + return NULL; + return jvms[0]; +} + +static JavaVM *CYGetJavaVM(JSContextRef context) { + CYPool pool; + void *handle(RTLD_DEFAULT); + std::string library; + + jint (*$JNI_GetCreatedJavaVMs)(JavaVM **jvms, jsize capacity, jsize *size); + dlset($JNI_GetCreatedJavaVMs, "JNI_GetCreatedJavaVMs", handle); + + if ($JNI_GetCreatedJavaVMs != NULL) { + if (JavaVM *jvm = CYGetJavaVM($JNI_GetCreatedJavaVMs)) + return jvm; + } else { + std::vector guesses; + +#ifdef __ANDROID__ + char android[PROP_VALUE_MAX]; + if (__system_property_get("persist.sys.dalvik.vm.lib", android) != 0) + guesses.push_back(android); +#endif + + guesses.push_back("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/lib/jli/libjli.dylib"); + //guesses.push_back("/System/Library/Frameworks/JavaVM.framework/JavaVM"); + guesses.push_back("libjvm.dylib"); + + guesses.push_back("libart.so"); + guesses.push_back("libdvm.so"); + guesses.push_back("libjvm.so"); + + for (const char *guess : guesses) { + handle = dlopen(guess, RTLD_LAZY | RTLD_GLOBAL); + if (handle != NULL) { + library = guess; + break; + } + } + + if (library.size() == 0) + return NULL; + + dlset($JNI_GetCreatedJavaVMs, "JNI_GetCreatedJavaVMs", handle); + if (JavaVM *jvm = CYGetJavaVM($JNI_GetCreatedJavaVMs)) + return jvm; + } + + std::vector options; + + { + std::ostringstream option; + option << "-Djava.class.path="; + option << CYPoolLibraryPath(pool) << "/libcycript.jar"; + if (const char *classpath = getenv("CLASSPATH")) + option << ':' << classpath; + options.push_back(JavaVMOption{pool.strdup(option.str().c_str()), NULL}); + } + + // To use libnativehelper to access JNI_GetCreatedJavaVMs, you need JniInvocation. + // ...but there can only be one JniInvocation, and assuradely the other VM has it. + // Essentially, this API makes no sense. We need it for AndroidRuntime, though :/. + + if (void *libnativehelper = dlopen("libnativehelper.so", RTLD_LAZY | RTLD_GLOBAL)) { + class JniInvocation$; + JniInvocation$ *(*JniInvocation$$init$)(JniInvocation$ *self)(NULL); + bool (*JniInvocation$Init)(JniInvocation$ *self, const char *library)(NULL); + JniInvocation$ *(*JniInvocation$finalize)(JniInvocation$ *self)(NULL); + + dlset(JniInvocation$$init$, "_ZN13JniInvocationC1Ev", libnativehelper); + dlset(JniInvocation$Init, "_ZN13JniInvocation4InitEPKc", libnativehelper); + dlset(JniInvocation$finalize, "_ZN13JniInvocationD1Ev", libnativehelper); + + if (JniInvocation$$init$ == NULL) + dlclose(libnativehelper); + else { + // XXX: we should attach a pool to the VM itself and deallocate this there + //auto invocation(pool.calloc(1, 1024)); + //_assert(JniInvocation$finalize != NULL); + //pool.atexit(reinterpret_cast(JniInvocation$finalize), invocation); + + auto invocation(static_cast(calloc(1, 1024))); + JniInvocation$$init$(invocation); + + _assert(JniInvocation$Init != NULL); + JniInvocation$Init(invocation, NULL); + + dlset($JNI_GetCreatedJavaVMs, "JNI_GetCreatedJavaVMs", libnativehelper); + if (JavaVM *jvm = CYGetJavaVM($JNI_GetCreatedJavaVMs)) + return jvm; + } + } + + JavaVM *jvm; + JNIEnv *env; + + if (void *libandroid_runtime = dlopen("libandroid_runtime.so", RTLD_LAZY | RTLD_GLOBAL)) { + class AndroidRuntime$; + AndroidRuntime$ *(*AndroidRuntime$$init$)(AndroidRuntime$ *self, char *args, unsigned int size)(NULL); + int (*AndroidRuntime$startVm)(AndroidRuntime$ *self, JavaVM **jvm, JNIEnv **env)(NULL); + int (*AndroidRuntime$startReg)(JNIEnv *env)(NULL); + int (*AndroidRuntime$addOption)(AndroidRuntime$ *self, const char *option, void *extra)(NULL); + int (*AndroidRuntime$addVmArguments)(AndroidRuntime$ *self, int, const char *const argv[])(NULL); + AndroidRuntime$ *(*AndroidRuntime$finalize)(AndroidRuntime$ *self)(NULL); + + dlset(AndroidRuntime$$init$, "_ZN7android14AndroidRuntimeC1EPcj", libandroid_runtime); + dlset(AndroidRuntime$startVm, "_ZN7android14AndroidRuntime7startVmEPP7_JavaVMPP7_JNIEnv", libandroid_runtime); + dlset(AndroidRuntime$startReg, "_ZN7android14AndroidRuntime8startRegEP7_JNIEnv", libandroid_runtime); + dlset(AndroidRuntime$addOption, "_ZN7android14AndroidRuntime9addOptionEPKcPv", libandroid_runtime); + dlset(AndroidRuntime$addVmArguments, "_ZN7android14AndroidRuntime14addVmArgumentsEiPKPKc", libandroid_runtime); + dlset(AndroidRuntime$finalize, "_ZN7android14AndroidRuntimeD1Ev", libandroid_runtime); + + // XXX: it would also be interesting to attach this to a global pool + AndroidRuntime$ *runtime(pool.calloc(1, 1024)); + + _assert(AndroidRuntime$$init$ != NULL); + AndroidRuntime$$init$(runtime, NULL, 0); + + if (AndroidRuntime$addOption == NULL) { + _assert(AndroidRuntime$addVmArguments != NULL); + std::vector arguments; + for (const auto &option : options) + arguments.push_back(option.optionString); + AndroidRuntime$addVmArguments(runtime, arguments.size(), arguments.data()); + } else for (const auto &option : options) + AndroidRuntime$addOption(runtime, option.optionString, option.extraInfo); + + int failure; + + _assert(AndroidRuntime$startVm != NULL); + failure = AndroidRuntime$startVm(runtime, &jvm, &env); + _assert(failure == 0); + + _assert(AndroidRuntime$startReg != NULL); + failure = AndroidRuntime$startReg(env); + _assert(failure == 0); + + return jvm; + } + + jint (*$JNI_CreateJavaVM)(JavaVM **jvm, void **, void *); + dlset($JNI_CreateJavaVM, "JNI_CreateJavaVM", handle); + + JavaVMInitArgs args; + memset(&args, 0, sizeof(args)); + args.version = CYJavaVersion; + args.nOptions = options.size(); + args.options = options.data(); + _jnicall($JNI_CreateJavaVM(&jvm, reinterpret_cast(&env), &args)); + return jvm; +} + +static JNIEnv *GetJNI(JSContextRef context, JNIEnv *&env) { + auto jvm(CYGetJavaVM(context)); + _assert(jvm != NULL); + _jnicall(jvm->GetEnv(reinterpret_cast(&env), CYJavaVersion)); + CYJavaEnv jni(env); + + // XXX: this happens once per stub :/ + + auto Cycript$(jni.FindClass("Cycript")); + jni.RegisterNatives(Cycript$, Cycript_, sizeof(Cycript_) / sizeof(Cycript_[0])); + + JSObjectRef java(CYGetCachedObject(context, CYJSString("Java"))); + JSValueRef arguments[1]; + arguments[0] = CYCastJSValue(context, CYJSString("setup")); + CYCallAsFunction(context, CYCastJSObject(context, CYGetProperty(context, java, CYJSString("emit"))), java, 1, arguments); + + return env; +} + +static JSStaticValue JavaClass_staticValues[3] = { {"class", &JavaClass_getProperty_class, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"$cyi", &JavaClass_getProperty_$cyi, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, NULL, 0} }; +static JSStaticFunction JavaClass_staticFunctions[2] = { + {"toCYON", &JavaClass_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + static JSStaticValue JavaObject_staticValues[3] = { {"constructor", &JavaObject_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"$cyi", &JavaObject_getProperty_$cyi, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, NULL, 0} }; -static JSStaticFunction JavaPackage_staticFunctions[1] = { +static JSStaticFunction JavaMethod_staticFunctions[2] = { + {"toCYON", &JavaMethod_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + +static JSStaticFunction JavaStaticMethod_staticFunctions[2] = { + {"toCYON", &JavaStaticMethod_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + +static JSStaticFunction JavaPackage_staticFunctions[2] = { + {"toCYON", &JavaPackage_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; void CYJava_Initialize() { Primitives_.insert(std::make_pair("void", CYJavaPrimitiveVoid)); -#define CYJavaForEachPrimitive_(T, Typ, Type, type) \ +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ Primitives_.insert(std::make_pair(#type, CYJavaPrimitive ## Type)); CYJavaForEachPrimitive #undef CYJavaForEachPrimitive_ @@ -760,13 +1527,10 @@ CYJavaForEachPrimitive definition = kJSClassDefinitionEmpty; definition.className = "JavaClass"; definition.staticValues = JavaClass_staticValues; - definition.hasProperty = &JavaClass_hasProperty; - definition.getProperty = &JavaClass_getProperty; - definition.setProperty = &JavaClass_setProperty; - definition.getPropertyNames = &JavaClass_getPropertyNames; + definition.staticFunctions = JavaClass_staticFunctions; definition.callAsConstructor = &JavaClass_callAsConstructor; definition.finalize = &CYFinalize; - CYJavaClass::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.attributes = kJSClassAttributeNoAutomaticPrototype; @@ -776,20 +1540,35 @@ CYJavaForEachPrimitive definition.setProperty = &JavaInterior_setProperty; definition.getPropertyNames = &JavaInterior_getPropertyNames; definition.finalize = &CYFinalize; - CYJavaInterior::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "JavaMethod"; + definition.staticFunctions = JavaMethod_staticFunctions; definition.callAsFunction = &JavaMethod_callAsFunction; definition.finalize = &CYFinalize; - CYJavaMethod::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); + + definition = kJSClassDefinitionEmpty; + definition.className = "JavaStaticMethod"; + definition.staticFunctions = JavaStaticMethod_staticFunctions; + definition.callAsFunction = &JavaStaticMethod_callAsFunction; + definition.finalize = &CYFinalize; + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.attributes = kJSClassAttributeNoAutomaticPrototype; definition.className = "JavaObject"; definition.staticValues = JavaObject_staticValues; definition.finalize = &CYFinalize; - CYJavaObject::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); + + definition = kJSClassDefinitionEmpty; + definition.className = "JavaArray"; + definition.getProperty = &JavaArray_getProperty; + definition.setProperty = &JavaArray_setProperty; + definition.finalize = &CYFinalize; + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "JavaPackage"; @@ -797,25 +1576,36 @@ CYJavaForEachPrimitive definition.hasProperty = &CYJavaPackage_hasProperty; definition.getProperty = &CYJavaPackage_getProperty; definition.finalize = &CYFinalize; - CYJavaPackage::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); + + definition = kJSClassDefinitionEmpty; + definition.attributes = kJSClassAttributeNoAutomaticPrototype; + definition.className = "JavaStaticInterior"; + definition.hasProperty = &JavaStaticInterior_hasProperty; + definition.getProperty = &JavaStaticInterior_getProperty; + definition.setProperty = &JavaStaticInterior_setProperty; + definition.getPropertyNames = &JavaStaticInterior_getPropertyNames; + definition.finalize = &CYFinalize; + CYPrivate::Class_ = JSClassCreate(&definition); } void CYJava_SetupContext(JSContextRef context) { JSObjectRef global(CYGetGlobalObject(context)); - //JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s))); + JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s))); JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript")))); JSObjectRef all(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("all")))); //JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls")))); JSObjectRef Java(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, cycript, CYJSString("Java"), Java); + CYSetProperty(context, cy, CYJSString("Java"), Java); - JSObjectRef Packages(CYJavaPackage::Make(context, CYJavaPackage::Path())); - CYSetProperty(context, all, CYJSString("Packages"), Packages); + JSObjectRef Packages(CYPrivate::Make(context, nullptr, CYJavaPackage::Path())); + CYSetProperty(context, all, CYJSString("Packages"), Packages, kJSPropertyAttributeDontEnum); for (auto name : (const char *[]) {"java", "javax", "android", "com", "net", "org"}) { CYJSString js(name); - CYSetProperty(context, all, js, CYGetProperty(context, Packages, js)); + CYSetProperty(context, all, js, CYPrivate::Make(context, nullptr, CYJavaPackage::Path(1, name)), kJSPropertyAttributeDontEnum); } }