Add an initial (inefficient) version of ?: syntax.

[cycript.git] / Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index f7ad60ddb112c32008e029e22ec407e9dbd0801b..abb48eda52198f30a74e394ed674bc599063c341 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -85,8 +85,6 @@ struct Type_privateData :
 
     ffi_type *GetFFI() {
         if (ffi_ == NULL) {
-            ffi_ = new(*pool_) ffi_type;
-
             sig::Element element;
             element.name = NULL;
             element.type = type_;
@@ -98,6 +96,8 @@ struct Type_privateData :
 
             ffi_cif cif;
             sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature, &cif);
+
+            ffi_ = new(*pool_) ffi_type;
             *ffi_ = *cif.rtype;
         }
 
@@ -161,14 +161,27 @@ namespace cy {
 struct Functor :
     CYValue
 {
+  private:
+    void set() {
+        sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature_, &cif_);
+    }
+
+  public:
     sig::Signature signature_;
     ffi_cif cif_;
 
-    Functor(const char *type, void (*value)()) :
+    Functor(const sig::Signature &signature, 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)() {
@@ -184,8 +197,8 @@ struct Closure_privateData :
     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)
     {
@@ -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*/