Replace sig::Primitive with full object hierarchy.

[cycript.git] / JavaScript.hpp

diff --git a/JavaScript.hpp b/JavaScript.hpp
index b501cf2c983242a516947d3e66b35a27d3174cc7..43c6be020ec6c196b8209e2ba8786a83ade6b149 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -110,9 +110,6 @@ _finline Type_ CYCastPointer(JSContextRef context, JSValueRef value, bool *guess
     return reinterpret_cast<Type_>(CYCastPointer_(context, value, guess));
 }
 
     return reinterpret_cast<Type_>(CYCastPointer_(context, value, guess));
 }
 

-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)());
 
 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)());
 


@@ -131,9 +128,6 @@ struct CYHook {
     void (*Initialize)();
     void (*SetupContext)(JSContextRef);
 
     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 *);
 };
 
     void *(*CastSymbol)(const char *);
 };
 


@@ -141,10 +135,9 @@ struct CYRegisterHook {
     CYRegisterHook(CYHook *hook);
 };
 
     CYRegisterHook(CYHook *hook);
 };
 

-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, const 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, const sig::Type &type);

 JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature);
 
 void CYFinalize(JSObjectRef object);
 JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature);
 
 void CYFinalize(JSObjectRef object);