Make Pointer/Struct .type compatible with Functor.

[cycript.git] / JavaScript.hpp

diff --git a/JavaScript.hpp b/JavaScript.hpp
index 9a58ccf1d7c3a80f289191acf190039790d35c50..b501cf2c983242a516947d3e66b35a27d3174cc7 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -103,11 +103,11 @@ JSObjectRef CYCastJSObject(JSContextRef context, JSValueRef value);
 JSValueRef CYJSUndefined(JSContextRef context);
 JSValueRef CYJSNull(JSContextRef context);
 
 JSValueRef CYJSUndefined(JSContextRef context);
 JSValueRef CYJSNull(JSContextRef context);
 

-void *CYCastPointer_(JSContextRef context, JSValueRef value);
+void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess = NULL);

 
 template <typename Type_>
 
 template <typename Type_>

-_finline Type_ CYCastPointer(JSContextRef context, JSValueRef value) {
-    return reinterpret_cast<Type_>(CYCastPointer_(context, value));
+_finline Type_ CYCastPointer(JSContextRef context, JSValueRef value, bool *guess = NULL) {
+    return reinterpret_cast<Type_>(CYCastPointer_(context, value, guess));

 }
 
 void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value);
 }
 
 void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value);


@@ -143,6 +143,7 @@ struct CYRegisterHook {
 
 JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, sig::Type *type, ffi_type *ffi, JSObjectRef owner);
 
 
 JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, sig::Type *type, ffi_type *ffi, JSObjectRef owner);
 

+JSObjectRef CYMakeType(JSContextRef context, sig::Primitive primitive);

 JSObjectRef CYMakeType(JSContextRef context, sig::Type *type);
 JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature);
 
 JSObjectRef CYMakeType(JSContextRef context, sig::Type *type);
 JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature);
 


@@ -150,6 +151,8 @@ void CYFinalize(JSObjectRef object);
 
 size_t CYArrayLength(JSContextRef context, JSObjectRef array);
 JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index);
 
 size_t CYArrayLength(JSContextRef context, JSObjectRef array);
 JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index);

+
+void CYArrayPush(JSContextRef context, JSObjectRef array, size_t length, const JSValueRef arguments[]);

 void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value);
 
 const char *CYPoolCString(CYPool &pool, JSContextRef context, JSValueRef value);
 void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value);
 
 const char *CYPoolCString(CYPool &pool, JSContextRef context, JSValueRef value);


@@ -157,6 +160,7 @@ const char *CYPoolCString(CYPool &pool, JSContextRef context, JSValueRef value);
 JSStringRef CYCopyJSString(const char *value);
 JSStringRef CYCopyJSString(JSStringRef value);
 JSStringRef CYCopyJSString(CYUTF8String value);
 JSStringRef CYCopyJSString(const char *value);
 JSStringRef CYCopyJSString(JSStringRef value);
 JSStringRef CYCopyJSString(CYUTF8String value);

+JSStringRef CYCopyJSString(CYUTF16String value);

 JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value);
 
 void CYGarbageCollect(JSContextRef context);
 JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value);
 
 void CYGarbageCollect(JSContextRef context);