Merge adapter into callback, removing indirection.

[cycript.git] / JavaScript.hpp

diff --git a/JavaScript.hpp b/JavaScript.hpp
index 9408c78d89e301dd0dc58e092ce0617b6f6d3cb8..b658a51d2d4aebe3e51760e992a0a2fe1c611364 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -53,6 +53,7 @@ extern JSStringRef toCYON_s;
 extern JSStringRef toJSON_s;
 extern JSStringRef toPointer_s;
 extern JSStringRef toString_s;
 extern JSStringRef toJSON_s;
 extern JSStringRef toPointer_s;
 extern JSStringRef toString_s;

+extern JSStringRef weak_s;

 
 void CYInitializeDynamic();
 JSGlobalContextRef CYGetJSContext();
 
 void CYInitializeDynamic();
 JSGlobalContextRef CYGetJSContext();


@@ -66,6 +67,9 @@ void CYSetArgs(int argc, const char *argv[]);
 bool CYCastBool(JSContextRef context, JSValueRef value);
 double CYCastDouble(JSContextRef context, JSValueRef value);
 
 bool CYCastBool(JSContextRef context, JSValueRef value);
 double CYCastDouble(JSContextRef context, JSValueRef value);
 

+bool CYIsEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs);
+bool CYIsStrictEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs);
+

 CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, JSStringRef value);
 const char *CYPoolCString(CYPool &pool, JSContextRef context, JSStringRef value);
 
 CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, JSStringRef value);
 const char *CYPoolCString(CYPool &pool, JSContextRef context, JSStringRef value);
 


@@ -79,6 +83,7 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, J
 
 void CYSetPrototype(JSContextRef context, JSObjectRef object, JSValueRef prototype);
 
 
 void CYSetPrototype(JSContextRef context, JSObjectRef object, JSValueRef prototype);
 

+JSValueRef CYGetCachedValue(JSContextRef context, JSStringRef name);

 JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name);
 
 JSValueRef CYCastJSValue(JSContextRef context, bool value);
 JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name);
 
 JSValueRef CYCastJSValue(JSContextRef context, bool value);


@@ -107,6 +112,7 @@ _finline Type_ CYCastPointer(JSContextRef context, JSValueRef value) {
 void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value);
 JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize = false, JSObjectRef owner = NULL);
 
 void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value);
 JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize = false, JSObjectRef owner = NULL);
 

+void CYCallFunction(CYPool &pool, JSContextRef context, ffi_cif *cif, void (*function)(), void *value, void **values);

 JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, sig::Signature *signature, ffi_cif *cif, void (*function)());
 
 bool CYIsCallable(JSContextRef context, JSValueRef value);
 JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, sig::Signature *signature, ffi_cif *cif, void (*function)());
 
 bool CYIsCallable(JSContextRef context, JSValueRef value);


@@ -119,13 +125,15 @@ struct CYHook {
     void *(*ExecuteStart)(JSContextRef);
     void (*ExecuteEnd)(JSContextRef, void *);
 
     void *(*ExecuteStart)(JSContextRef);
     void (*ExecuteEnd)(JSContextRef, void *);
 

-    void (*CallFunction)(JSContextRef, ffi_cif *, void (*)(), uint8_t *, void **);
+    void (*CallFunction)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **);

 
     void (*Initialize)();
     void (*SetupContext)(JSContextRef);
 
     bool (*PoolFFI)(CYPool *, JSContextRef, sig::Type *, ffi_type *, void *, JSValueRef);
     JSValueRef (*FromFFI)(JSContextRef, sig::Type *, ffi_type *, void *, bool, JSObjectRef);
 
     void (*Initialize)();
     void (*SetupContext)(JSContextRef);
 
     bool (*PoolFFI)(CYPool *, JSContextRef, sig::Type *, ffi_type *, void *, JSValueRef);
     JSValueRef (*FromFFI)(JSContextRef, sig::Type *, ffi_type *, void *, bool, JSObjectRef);

+
+    void *(*CastSymbol)(const char *);

 };
 
 struct CYRegisterHook {
 };
 
 struct CYRegisterHook {


@@ -200,4 +208,15 @@ class CYJSString {
     }
 };
 
     }
 };
 

+#ifdef __APPLE__
+typedef struct OpaqueJSWeakObjectMap *JSWeakObjectMapRef;
+typedef void (*JSWeakMapDestroyedCallback)(JSWeakObjectMapRef map, void *data);
+
+extern "C" JSWeakObjectMapRef JSWeakObjectMapCreate(JSContextRef ctx, void *data, JSWeakMapDestroyedCallback destructor) __attribute__((__weak_import__));
+extern "C" void JSWeakObjectMapSet(JSContextRef ctx, JSWeakObjectMapRef map, void *key, JSObjectRef) __attribute__((__weak_import__));
+extern "C" JSObjectRef JSWeakObjectMapGet(JSContextRef ctx, JSWeakObjectMapRef map, void *key) __attribute__((__weak_import__));
+extern "C" bool JSWeakObjectMapClear(JSContextRef ctx, JSWeakObjectMapRef map, void *key, JSObjectRef object) __attribute__((__weak_import__));
+extern "C" void JSWeakObjectMapRemove(JSContextRef ctx, JSWeakObjectMapRef map, void* key) __attribute__((__weak_import__));
+#endif
+

 #endif/*CYCRIPT_JAVASCRIPT_HPP*/
 #endif/*CYCRIPT_JAVASCRIPT_HPP*/