Hide all symbols of embedded developer framework.

[cycript.git] / Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index f7ad60ddb112c32008e029e22ec407e9dbd0801b..b4dd4a1b09502e70ed2edb55b3e7d41a19de086b 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -161,14 +161,27 @@ namespace cy {
 struct Functor :
     CYValue
 {
 struct Functor :
     CYValue
 {

+  private:
+    void set() {
+        sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature_, &cif_);
+    }
+
+  public:

     sig::Signature signature_;
     ffi_cif cif_;
 
     sig::Signature signature_;
     ffi_cif cif_;
 

-    Functor(const char *type, void (*value)()) :
+    Functor(const sig::Signature &signature, void (*value)()) :

         CYValue(reinterpret_cast<void *>(value))
     {
         CYValue(reinterpret_cast<void *>(value))
     {

-        sig::Parse(*pool_, &signature_, type, &Structor_);
-        sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature_, &cif_);
+        sig::Copy(*pool_, signature_, signature);
+        set();
+    }
+
+    Functor(const char *encoding, void (*value)()) :
+        CYValue(reinterpret_cast<void *>(value))
+    {
+        sig::Parse(*pool_, &signature_, encoding, &Structor_);
+        set();

     }
 
     void (*GetValue() const)() {
     }
 
     void (*GetValue() const)() {


@@ -184,8 +197,8 @@ struct Closure_privateData :
     JSGlobalContextRef context_;
     JSObjectRef function_;
 
     JSGlobalContextRef context_;
     JSObjectRef function_;
 

-    Closure_privateData(JSContextRef context, JSObjectRef function, const char *type) :
-        cy::Functor(type, NULL),
+    Closure_privateData(JSContextRef context, JSObjectRef function, const sig::Signature &signature) :
+        cy::Functor(signature, NULL),

         context_(CYGetJSContext(context)),
         function_(function)
     {
         context_(CYGetJSContext(context)),
         function_(function)
     {


@@ -199,7 +212,7 @@ struct Closure_privateData :
     }
 };
 
     }
 };
 

-Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *));
+Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, void (*callback)(ffi_cif *, void *, void **, void *));

 void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef));
 
 #endif/*CYCRIPT_INTERNAL_HPP*/
 void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef));
 
 #endif/*CYCRIPT_INTERNAL_HPP*/