Relax (broken) restriction of void typedef/return.

[cycript.git] / Java / Execute.cpp

diff --git a/Java/Execute.cpp b/Java/Execute.cpp
index ad0ee9387139291c25231da923fdb45e79ca086b..98bf1038e15f134cc27408db308b07ae3d781c33 100644 (file)
--- a/Java/Execute.cpp
+++ b/Java/Execute.cpp
@@ -243,11 +243,11 @@ class CYJavaUTF8String :
     public CYUTF8String
 {
   private:
-    const CYJavaRef<jstring> *value_;
+    const CYJavaRef<jstring> &value_;
 
   public:
     CYJavaUTF8String(const CYJavaRef<jstring> &value) :
-        value_(&value)
+        value_(value)
     {
         _assert(value);
         JNIEnv *jni(value.jni());
@@ -255,29 +255,18 @@ class CYJavaUTF8String :
         data = jni->GetStringUTFChars(value, NULL);
     }
 
-    CYJavaUTF8String(const CYJavaRef<jobject> &value) :
-        CYJavaUTF8String(CYCastJavaString(value))
-    {
-    }
+    CYJavaUTF8String(CYJavaRef<jstring> &&) = delete;
 
     ~CYJavaUTF8String() {
-        if (value_ != NULL) {
-            JNIEnv *jni(value_->jni());
-            jni->ReleaseStringUTFChars(*value_, data);
-        }
+        JNIEnv *jni(value_.jni());
+        jni->ReleaseStringUTFChars(value_, data);
     }
 
     CYJavaUTF8String(const CYJavaUTF8String &) = delete;
-
-    CYJavaUTF8String(CYJavaUTF8String &&rhs) :
-        value_(rhs.value_)
-    {
-        rhs.value_ = NULL;
-    }
 };
 
 CYJavaUTF8String CYCastUTF8String(const CYJavaRef<jstring> &value) {
-    return CYJavaUTF8String(value);
+    return {value};
 }
 
 JSStringRef CYCopyJSString(const CYJavaRef<jstring> &value) {
@@ -296,7 +285,8 @@ struct CYJavaError :
     }
 
     virtual const char *PoolCString(CYPool &pool) const {
-        return CYPoolCString(pool, CYJavaUTF8String(value_.cast<jobject>()));
+        auto string(CYCastJavaString(value_.cast<jobject>()));
+        return CYPoolCString(pool, CYJavaUTF8String(string));
     }
 
     virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const;
@@ -525,23 +515,28 @@ typedef std::map<unsigned, CYJavaOverload> CYJavaOverloads;
 struct CYJavaMethod :
     CYRoot
 {
+    CYUTF8String type_;
+    CYUTF8String name_;
     CYJavaOverloads overloads_;
 
-    CYJavaMethod(const CYJavaOverloads &overloads) :
+    CYJavaMethod(CYUTF8String type, CYUTF8String name, const CYJavaOverloads &overloads) :
+        type_(CYPoolUTF8String(*pool_, type)),
+        name_(CYPoolUTF8String(*pool_, name)),
         overloads_(overloads)
     {
     }
 };
 
-struct CYJavaStaticMethod :
-    CYRoot
+struct CYJavaInstanceMethod :
+    CYJavaMethod
 {
-    CYJavaOverloads overloads_;
+    using CYJavaMethod::CYJavaMethod;
+};
 
-    CYJavaStaticMethod(const CYJavaOverloads &overloads) :
-        overloads_(overloads)
-    {
-    }
+struct CYJavaStaticMethod :
+    CYJavaMethod
+{
+    using CYJavaMethod::CYJavaMethod;
 };
 
 struct CYJavaClass :
@@ -753,7 +748,10 @@ static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef<jclass>
     auto Class$(jni.FindClass("java/lang/Class"));
     auto Class$getName(jni.GetMethodID(Class$, "getName", "()Ljava/lang/String;"));
 
-    CYJSString name(jni.CallObjectMethod<jstring>(value, Class$getName));
+    auto string(jni.CallObjectMethod<jstring>(value, Class$getName));
+    CYJavaUTF8String utf8(string);
+    CYJSString name(utf8);
+
     JSValueRef cached(CYGetProperty(context, cy, name));
     if (!JSValueIsUndefined(context, cached))
         return CYCastJSObject(context, cached);
@@ -798,7 +796,8 @@ static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef<jclass>
             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.CallObjectMethod<jstring>(field, Field$getName));
+            auto string(jni.CallObjectMethod<jstring>(field, Field$getName));
+            CYJavaUTF8String name(string);
             auto id(jni.FromReflectedField(field));
             auto type(jni.CallObjectMethod<jclass>(field, Field$getType));
             map.insert(std::make_pair(std::string(name), CYJavaField{id, CYJavaGetPrimitive(context, type, Class$getName)}));
@@ -830,7 +829,8 @@ static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef<jclass>
             auto method(jni.GetObjectArrayElement<jobject>(methods, i));
             auto modifiers(jni.CallIntMethod(method, Method$getModifiers));
             auto instance(!jni.CallStaticBooleanMethod(Modifier$, Modifier$isStatic, modifiers));
-            CYJavaUTF8String name(jni.CallObjectMethod<jstring>(method, Method$getName));
+            auto string(jni.CallObjectMethod<jstring>(method, Method$getName));
+            CYJavaUTF8String name(string);
 
             auto parameters(jni.CallObjectMethod<jobjectArray>(method, Method$getParameterTypes));
             CYJavaShorty shorty(CYJavaGetShorty(context, parameters, Class$getName));
@@ -856,12 +856,12 @@ static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef<jclass>
 
     for (const auto &entry : entries) {
         bool instance(entry.first.first);
-        CYJSString name(entry.first.second);
+        CYJSString method(entry.first.second);
         auto &overload(entry.second);
         if (instance)
-            CYSetProperty(context, prototype, name, CYPrivate<CYJavaMethod>::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
+            CYSetProperty(context, prototype, method, CYPrivate<CYJavaInstanceMethod>::Make(context, utf8, entry.first.second.c_str(), overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
         else
-            CYSetProperty(context, constructor, name, CYPrivate<CYJavaStaticMethod>::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
+            CYSetProperty(context, constructor, method, CYPrivate<CYJavaStaticMethod>::Make(context, utf8, entry.first.second.c_str(), overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
     }
 
     }
@@ -945,8 +945,8 @@ static bool CYCastJavaArguments(const CYJavaFrame &frame, const CYJavaShorty &sh
     return true;
 }
 
-static JSValueRef JavaMethod_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    auto internal(CYPrivate<CYJavaMethod>::Get(context, object));
+static JSValueRef JavaInstanceMethod_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    auto internal(CYPrivate<CYJavaInstanceMethod>::Get(context, object));
     CYJavaObject *self(CYGetJavaObject(context, _this));
     _assert(self != NULL);
     CYJavaEnv jni(self->value_);
@@ -1194,12 +1194,22 @@ static JSValueRef JavaClass_callAsFunction_toCYON(JSContextRef context, JSObject
 } CYCatch(NULL) }
 
 static JSValueRef JavaMethod_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    auto internal(CYPrivate<CYJavaMethod>::Get(context, _this));
     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;
+    if (false)
+        cyon << internal->type_ << "." << internal->name_;
+    else {
+        bool comma(false);
+        for (auto overload(internal->overloads_.begin()); overload != internal->overloads_.end(); ++overload)
+            for (auto signature(overload->second.begin()); signature != overload->second.end(); ++signature) {
+                if (comma)
+                    cyon << std::endl;
+                else
+                    comma = true;
+                auto string(CYCastJavaString(signature->reflected_));
+                cyon << CYJavaUTF8String(string);
+            }
+    }
     return CYCastJSValue(context, CYJSString(cyon.str()));
 } CYCatch(NULL) }
 
@@ -1517,13 +1527,13 @@ static JSStaticValue JavaObject_staticValues[3] = {
     {NULL, NULL, NULL, 0}
 };
 
-static JSStaticFunction JavaMethod_staticFunctions[2] = {
+static JSStaticFunction JavaInstanceMethod_staticFunctions[2] = {
     {"toCYON", &JavaMethod_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
 
 static JSStaticFunction JavaStaticMethod_staticFunctions[2] = {
-    {"toCYON", &JavaStaticMethod_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"toCYON", &JavaMethod_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
 
@@ -1561,16 +1571,21 @@ CYJavaForEachPrimitive
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "JavaMethod";
-    definition.staticFunctions = JavaMethod_staticFunctions;
-    definition.callAsFunction = &JavaMethod_callAsFunction;
     definition.finalize = &CYFinalize;
     CYPrivate<CYJavaMethod>::Class_ = JSClassCreate(&definition);
 
+    definition = kJSClassDefinitionEmpty;
+    definition.className = "JavaInstanceMethod";
+    definition.parentClass = CYPrivate<CYJavaMethod>::Class_;
+    definition.staticFunctions = JavaInstanceMethod_staticFunctions;
+    definition.callAsFunction = &JavaInstanceMethod_callAsFunction;
+    CYPrivate<CYJavaInstanceMethod>::Class_ = JSClassCreate(&definition);
+
     definition = kJSClassDefinitionEmpty;
     definition.className = "JavaStaticMethod";
+    definition.parentClass = CYPrivate<CYJavaMethod>::Class_;
     definition.staticFunctions = JavaStaticMethod_staticFunctions;
     definition.callAsFunction = &JavaStaticMethod_callAsFunction;
-    definition.finalize = &CYFinalize;
     CYPrivate<CYJavaStaticMethod>::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;