return jni.CallObjectMethod<jstring>(value, Object$toString);
}
-template <typename Internal_, typename Value_>
-struct CYJavaValue :
- CYPrivate<Internal_>
-{
- CYJavaGlobal<Value_> value_;
-
- CYJavaValue(const CYJavaRef<Value_> &value) :
- value_(value)
- {
- }
-
- CYJavaValue(const CYJavaValue &) = delete;
-};
-
static JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef<jobject> &value);
template <typename Other_>
{
}
- CYJavaSignature(unsigned count) :
- shorty_(count)
- {
- }
-
+ // XXX: the shorty doesn't store enough information
bool operator <(const CYJavaSignature &rhs) const {
- return shorty_.size() < rhs.shorty_.size();
+ return shorty_ < rhs.shorty_;
}
};
-typedef std::multiset<CYJavaSignature> CYJavaOverload;
+typedef std::set<CYJavaSignature> CYJavaOverload;
+typedef std::map<unsigned, CYJavaOverload> CYJavaOverloads;
struct CYJavaMethod :
- CYPrivate<CYJavaMethod>
+ CYRoot
{
- CYJavaOverload overload_;
+ CYJavaOverloads overloads_;
- CYJavaMethod(const CYJavaOverload &overload) :
- overload_(overload)
+ CYJavaMethod(const CYJavaOverloads &overloads) :
+ overloads_(overloads)
{
}
};
struct CYJavaStaticMethod :
- CYPrivate<CYJavaStaticMethod>
+ CYRoot
{
- CYJavaOverload overload_;
+ CYJavaOverloads overloads_;
- CYJavaStaticMethod(const CYJavaOverload &overload) :
- overload_(overload)
+ CYJavaStaticMethod(const CYJavaOverloads &overloads) :
+ overloads_(overloads)
{
}
};
struct CYJavaClass :
- CYJavaValue<CYJavaClass, jclass>
+ CYRoot
{
+ CYJavaGlobal<jclass> value_;
bool interface_;
CYJavaFieldMap static_;
CYJavaFieldMap instance_;
- CYJavaOverload overload_;
+ CYJavaOverloads overloads_;
CYJavaClass(const CYJavaRef<jclass> &value, bool interface) :
- CYJavaValue(value),
+ value_(value),
interface_(interface)
{
}
static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef<jclass> &_class);
struct CYJavaObject :
- CYJavaValue<CYJavaObject, jobject>
+ CYRoot
{
+ CYJavaGlobal<jobject> value_;
CYJavaClass *table_;
CYJavaObject(const CYJavaRef<jobject> &value, CYJavaClass *table) :
- CYJavaValue(value),
+ value_(value),
table_(table)
{
}
};
struct CYJavaInterior :
- CYJavaValue<CYJavaInterior, jobject>
+ CYRoot
{
+ CYJavaGlobal<jobject> value_;
CYJavaClass *table_;
CYJavaInterior(const CYJavaRef<jobject> &value, CYJavaClass *table) :
- CYJavaValue(value),
+ value_(value),
table_(table)
{
}
};
struct CYJavaStaticInterior :
- CYJavaValue<CYJavaStaticInterior, jclass>
+ CYRoot
{
+ CYJavaGlobal<jclass> value_;
CYJavaClass *table_;
CYJavaStaticInterior(const CYJavaRef<jclass> &value, CYJavaClass *table) :
- CYJavaValue(value),
+ value_(value),
table_(table)
{
}
};
struct CYJavaArray :
- CYJavaValue<CYJavaArray, jarray>
+ CYRoot
{
+ CYJavaGlobal<jarray> value_;
CYJavaPrimitive primitive_;
CYJavaArray(const CYJavaRef<jarray> &value, CYJavaPrimitive primitive) :
- CYJavaValue(value),
+ value_(value),
primitive_(primitive)
{
}
};
struct CYJavaPackage :
- CYPrivate<CYJavaPackage>
+ CYRoot
{
JNIEnv *jni_;
auto Class$getComponentType(jni.GetMethodID(Class$, "getComponentType", "()Ljava/lang/Class;"));
auto component(jni.CallObjectMethod<jclass>(_class, Class$getComponentType));
auto Class$getName(jni.GetMethodID(Class$, "getName", "()Ljava/lang/String;"));
- return CYJavaArray::Make(context, value.cast<jarray>(), CYJavaGetPrimitive(context, component, Class$getName));
+ return CYPrivate<CYJavaArray>::Make(context, value.cast<jarray>(), CYJavaGetPrimitive(context, component, Class$getName));
}
auto Wrapper$(jni.FindClass("Cycript$Wrapper"));
}
CYJavaClass *table(reinterpret_cast<CYJavaClass *>(JSObjectGetPrivate(CYGetJavaClass(context, _class))));
- return CYJavaObject::Make(context, value, table);
+ return CYPrivate<CYJavaObject>::Make(context, value, table);
}
static _finline JSObjectRef CYCastJSObject(JSContextRef context, const CYJavaRef<jobject> &value) {
CYCastJava$(D, Double, jdouble, CYCastDouble)
static CYJavaClass *CYGetJavaTable(JSContextRef context, JSObjectRef object) {
- if (!JSValueIsObjectOfClass(context, object, CYJavaClass::Class_))
+ if (!JSValueIsObjectOfClass(context, object, CYPrivate<CYJavaClass>::Class_))
return NULL;
return reinterpret_cast<CYJavaClass *>(JSObjectGetPrivate(object));
}
static CYJavaObject *CYGetJavaObject(JSContextRef context, JSObjectRef object) {
- if (!JSValueIsObjectOfClass(context, object, CYJavaObject::Class_))
+ if (!JSValueIsObjectOfClass(context, object, CYPrivate<CYJavaObject>::Class_))
return NULL;
return reinterpret_cast<CYJavaObject *>(JSObjectGetPrivate(object));
}
}
}
- constructor = JSObjectMake(context, CYJavaClass::Class_, table);
+ constructor = JSObjectMake(context, CYPrivate<CYJavaClass>::Class_, table);
prototype = JSObjectMake(context, NULL, NULL);
CYSetProperty(context, constructor, prototype_s, prototype, kJSPropertyAttributeDontEnum);
auto parameters(jni.CallObjectMethod<jobjectArray>(constructor, Constructor$getParameterTypes));
CYJavaShorty shorty(CYJavaGetShorty(context, parameters, Class$getName));
auto id(jni.FromReflectedMethod(constructor));
- table->overload_.insert(CYJavaSignature(constructor, id, CYJavaPrimitiveObject, shorty));
+ table->overloads_[shorty.size()].insert(CYJavaSignature(constructor, id, CYJavaPrimitiveObject, shorty));
}
- auto methods(jni.CallObjectMethod<jobjectArray>(value, Class$getDeclaredMethods));
+ std::map<std::pair<bool, std::string>, CYJavaOverloads> entries;
- std::map<std::pair<bool, std::string>, CYJavaOverload> entries;
+ bool base(false);
+ for (CYJavaLocal<jclass> prototype(value); prototype; prototype = jni.GetSuperclass(prototype)) {
+ auto methods(jni.CallObjectMethod<jobjectArray>(prototype, Class$getDeclaredMethods));
- for (jsize i(0), e(jni.GetArrayLength(methods)); i != e; ++i) {
- 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 parameters(jni.CallObjectMethod<jobjectArray>(method, Method$getParameterTypes));
- CYJavaShorty shorty(CYJavaGetShorty(context, parameters, Class$getName));
- auto type(jni.CallObjectMethod<jclass>(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 (jsize i(0), e(jni.GetArrayLength(methods)); i != e; ++i) {
+ 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 parameters(jni.CallObjectMethod<jobjectArray>(method, Method$getParameterTypes));
+ CYJavaShorty shorty(CYJavaGetShorty(context, parameters, Class$getName));
+
+ CYJavaOverload *overload;
+ if (!base)
+ overload = &entries[std::make_pair(instance, std::string(name))][shorty.size()];
+ else {
+ auto entry(entries.find(std::make_pair(instance, std::string(name))));
+ if (entry == entries.end())
+ continue;
+ overload = &entry->second[shorty.size()];
+ }
+
+ auto type(jni.CallObjectMethod<jclass>(method, Method$getReturnType));
+ auto primitive(CYJavaGetPrimitive(context, type, Class$getName));
+ auto id(jni.FromReflectedMethod(method));
+ overload->insert(CYJavaSignature(method, id, primitive, shorty));
+ }
+
+ base = true;
}
for (const auto &entry : entries) {
CYJSString name(entry.first.second);
auto &overload(entry.second);
if (instance)
- CYSetProperty(context, prototype, name, CYJavaMethod::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
+ CYSetProperty(context, prototype, name, CYPrivate<CYJavaMethod>::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
else
- CYSetProperty(context, constructor, name, CYJavaStaticMethod::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
+ CYSetProperty(context, constructor, name, CYPrivate<CYJavaStaticMethod>::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
}
}
}
static JSValueRef JavaMethod_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- auto internal(CYJavaMethod::Get(context, object));
+ auto internal(CYPrivate<CYJavaMethod>::Get(context, object));
CYJavaObject *self(CYGetJavaObject(context, _this));
_assert(self != NULL);
CYJavaEnv jni(self->value_);
- CYJavaSignature bound(count);
- for (auto overload(internal->overload_.lower_bound(bound)), e(internal->overload_.upper_bound(bound)); overload != e; ++overload) {
+ auto overload(internal->overloads_.find(count));
+ if (overload != internal->overloads_.end())
+ for (auto signature(overload->second.begin()); signature != overload->second.end(); ++signature) {
CYJavaFrame frame(jni, count + 16);
jvalue array[count];
- if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array))
+ if (!CYCastJavaArguments(frame, signature->shorty_, context, arguments, array))
continue;
jvalue *values(array);
- switch (overload->primitive_) {
+ switch (signature->primitive_) {
case CYJavaPrimitiveObject:
- return CYCastJSValue(context, jni.CallObjectMethodA<jobject>(self->value_, overload->method_, values));
+ return CYCastJSValue(context, jni.CallObjectMethodA<jobject>(self->value_, signature->method_, values));
case CYJavaPrimitiveVoid:
- jni.CallVoidMethodA(self->value_, overload->method_, values);
+ jni.CallVoidMethodA(self->value_, signature->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));
+ return CYJavaCastJSValue(context, jni.Call ## Typ ## MethodA(self->value_, signature->method_, values));
CYJavaForEachPrimitive
#undef CYJavaForEachPrimitive_
default: _assert(false);
} CYCatch(NULL) }
static JSValueRef JavaStaticMethod_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- auto internal(CYJavaStaticMethod::Get(context, object));
+ auto internal(CYPrivate<CYJavaStaticMethod>::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) {
+ auto overload(internal->overloads_.find(count));
+ if (overload != internal->overloads_.end())
+ for (auto signature(overload->second.begin()); signature != overload->second.end(); ++signature) {
CYJavaFrame frame(jni, count + 16);
jvalue array[count];
- if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array))
+ if (!CYCastJavaArguments(frame, signature->shorty_, context, arguments, array))
continue;
jvalue *values(array);
- switch (overload->primitive_) {
+ switch (signature->primitive_) {
case CYJavaPrimitiveObject:
- return CYCastJSValue(context, jni.CallStaticObjectMethodA<jobject>(table->value_, overload->method_, values));
+ return CYCastJSValue(context, jni.CallStaticObjectMethodA<jobject>(table->value_, signature->method_, values));
case CYJavaPrimitiveVoid:
- jni.CallStaticVoidMethodA(table->value_, overload->method_, values);
+ jni.CallStaticVoidMethodA(table->value_, signature->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));
+ return CYJavaCastJSValue(context, jni.CallStatic ## Typ ## MethodA(table->value_, signature->method_, values));
CYJavaForEachPrimitive
#undef CYJavaForEachPrimitive_
default: _assert(false);
} CYCatch(NULL) }
static JSObjectRef JavaClass_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- auto table(CYJavaClass::Get(context, object));
+ auto table(CYPrivate<CYJavaClass>::Get(context, object));
CYJavaEnv jni(table->value_);
jclass _class(table->value_);
return CYCastJSObject(context, jni.CallObjectMethod<jobject>(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) {
+ auto overload(table->overloads_.find(count));
+ if (overload != table->overloads_.end())
+ for (auto signature(overload->second.begin()); signature != overload->second.end(); ++signature) {
CYJavaFrame frame(jni, count + 16);
jvalue array[count];
- if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array))
+ if (!CYCastJavaArguments(frame, signature->shorty_, context, arguments, array))
continue;
jvalue *values(array);
- auto object(jni.NewObjectA(_class, overload->method_, values));
+ auto object(jni.NewObjectA(_class, signature->method_, values));
return CYCastJSObject(context, object);
}
CYThrow("invalid constructor call");
-} CYCatch(NULL) }
+} CYCatchObject() }
static bool JavaStaticInterior_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
- auto internal(CYJavaStaticInterior::Get(context, object));
+ auto internal(CYPrivate<CYJavaStaticInterior>::Get(context, object));
CYJavaClass *table(internal->table_);
CYPool pool;
auto name(CYPoolUTF8String(pool, context, property));
}
static JSValueRef JavaStaticInterior_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
- auto internal(CYJavaStaticInterior::Get(context, object));
+ auto internal(CYPrivate<CYJavaStaticInterior>::Get(context, object));
CYJavaClass *table(internal->table_);
CYJavaEnv jni(table->value_);
CYPool pool;
} CYCatch(NULL) }
static bool JavaStaticInterior_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
- auto internal(CYJavaStaticInterior::Get(context, object));
+ auto internal(CYPrivate<CYJavaStaticInterior>::Get(context, object));
CYJavaClass *table(internal->table_);
CYJavaEnv jni(table->value_);
CYPool pool;
} CYCatch(false) }
static void JavaStaticInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
- auto internal(CYJavaStaticInterior::Get(context, object));
+ auto internal(CYPrivate<CYJavaStaticInterior>::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 {
- auto table(CYJavaClass::Get(context, object));
+ auto table(CYPrivate<CYJavaClass>::Get(context, object));
return CYCastJSValue(context, table->value_);
} CYCatch(NULL) }
static bool JavaInterior_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
- auto internal(CYJavaInterior::Get(context, object));
+ auto internal(CYPrivate<CYJavaInterior>::Get(context, object));
CYJavaClass *table(internal->table_);
CYPool pool;
auto name(CYPoolUTF8String(pool, context, property));
}
static JSValueRef JavaInterior_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
- auto internal(CYJavaInterior::Get(context, object));
+ auto internal(CYPrivate<CYJavaInterior>::Get(context, object));
CYJavaEnv jni(internal->value_);
CYJavaClass *table(internal->table_);
CYPool pool;
} CYCatch(NULL) }
static bool JavaInterior_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
- auto internal(CYJavaInterior::Get(context, object));
+ auto internal(CYPrivate<CYJavaInterior>::Get(context, object));
CYJavaEnv jni(internal->value_);
CYJavaClass *table(internal->table_);
CYPool pool;
} CYCatch(false) }
static void JavaInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
- auto internal(CYJavaInterior::Get(context, object));
+ auto internal(CYPrivate<CYJavaInterior>::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 {
- auto internal(CYJavaObject::Get(context, object));
+ auto internal(CYPrivate<CYJavaObject>::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(CYJavaClass::Get(context, object));
- return CYJavaStaticInterior::Make(context, internal->value_, internal);
+ auto internal(CYPrivate<CYJavaClass>::Get(context, object));
+ return CYPrivate<CYJavaStaticInterior>::Make(context, internal->value_, internal);
} CYCatch(NULL) }
static JSValueRef JavaObject_getProperty_$cyi(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
- auto internal(CYJavaObject::Get(context, object));
- return CYJavaInterior::Make(context, internal->value_, internal->table_);
+ auto internal(CYPrivate<CYJavaObject>::Get(context, object));
+ return CYPrivate<CYJavaInterior>::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(CYJavaClass::Get(context, _this));
+ auto internal(CYPrivate<CYJavaClass>::Get(context, _this));
CYJavaEnv jni(internal->value_);
auto Class$(jni.FindClass("java/lang/Class"));
auto Class$getCanonicalName(jni.GetMethodID(Class$, "getCanonicalName", "()Ljava/lang/String;"));
} CYCatch(NULL) }
static JSValueRef JavaArray_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
- auto internal(CYJavaArray::Get(context, object));
+ auto internal(CYPrivate<CYJavaArray>::Get(context, object));
CYJavaEnv jni(internal->value_);
if (JSStringIsEqual(property, length_s))
return CYCastJSValue(context, jni.GetArrayLength(internal->value_));
} CYCatch(NULL) }
static bool JavaArray_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
- auto internal(CYJavaArray::Get(context, object));
+ auto internal(CYPrivate<CYJavaArray>::Get(context, object));
CYJavaEnv jni(internal->value_);
CYPool pool;
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(CYJavaPackage::Get(context, _this));
+ auto internal(CYPrivate<CYJavaPackage>::Get(context, _this));
std::ostringstream name;
for (auto &package : internal->package_)
name << package << '.';
}
static JSValueRef CYJavaPackage_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
- auto internal(CYJavaPackage::Get(context, object));
+ auto internal(CYPrivate<CYJavaPackage>::Get(context, object));
CYJavaPackage::Path package(internal->package_);
CYPool pool;
jni->ExceptionClear();
package.push_back(next);
- return CYJavaPackage::Make(context, jni, package);
+ return CYPrivate<CYJavaPackage>::Make(context, jni, package);
} CYCatch(NULL) }
static void Cycript_delete(JNIEnv *env, jclass api, jlong jprotect) { CYJavaTry {
definition.staticFunctions = JavaClass_staticFunctions;
definition.callAsConstructor = &JavaClass_callAsConstructor;
definition.finalize = &CYFinalize;
- CYJavaClass::Class_ = JSClassCreate(&definition);
+ CYPrivate<CYJavaClass>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.setProperty = &JavaInterior_setProperty;
definition.getPropertyNames = &JavaInterior_getPropertyNames;
definition.finalize = &CYFinalize;
- CYJavaInterior::Class_ = JSClassCreate(&definition);
+ CYPrivate<CYJavaInterior>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "JavaMethod";
definition.staticFunctions = JavaMethod_staticFunctions;
definition.callAsFunction = &JavaMethod_callAsFunction;
definition.finalize = &CYFinalize;
- CYJavaMethod::Class_ = JSClassCreate(&definition);
+ CYPrivate<CYJavaMethod>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "JavaStaticMethod";
definition.staticFunctions = JavaStaticMethod_staticFunctions;
definition.callAsFunction = &JavaStaticMethod_callAsFunction;
definition.finalize = &CYFinalize;
- CYJavaStaticMethod::Class_ = JSClassCreate(&definition);
+ CYPrivate<CYJavaStaticMethod>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.className = "JavaObject";
definition.staticValues = JavaObject_staticValues;
definition.finalize = &CYFinalize;
- CYJavaObject::Class_ = JSClassCreate(&definition);
+ CYPrivate<CYJavaObject>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "JavaArray";
definition.getProperty = &JavaArray_getProperty;
definition.setProperty = &JavaArray_setProperty;
definition.finalize = &CYFinalize;
- CYJavaArray::Class_ = JSClassCreate(&definition);
+ CYPrivate<CYJavaArray>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "JavaPackage";
definition.hasProperty = &CYJavaPackage_hasProperty;
definition.getProperty = &CYJavaPackage_getProperty;
definition.finalize = &CYFinalize;
- CYJavaPackage::Class_ = JSClassCreate(&definition);
+ CYPrivate<CYJavaPackage>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.setProperty = &JavaStaticInterior_setProperty;
definition.getPropertyNames = &JavaStaticInterior_getPropertyNames;
definition.finalize = &CYFinalize;
- CYJavaStaticInterior::Class_ = JSClassCreate(&definition);
+ CYPrivate<CYJavaStaticInterior>::Class_ = JSClassCreate(&definition);
}
void CYJava_SetupContext(JSContextRef context) {
CYSetProperty(context, cycript, CYJSString("Java"), Java);
CYSetProperty(context, cy, CYJSString("Java"), Java);
- JSObjectRef Packages(CYJavaPackage::Make(context, nullptr, CYJavaPackage::Path()));
+ JSObjectRef Packages(CYPrivate<CYJavaPackage>::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, CYJavaPackage::Make(context, nullptr, CYJavaPackage::Path(1, name)), kJSPropertyAttributeDontEnum);
+ CYSetProperty(context, all, js, CYPrivate<CYJavaPackage>::Make(context, nullptr, CYJavaPackage::Path(1, name)), kJSPropertyAttributeDontEnum);
}
}
projects / cycript.git / blobdiff