X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/01d0f64d1f396362fa532d04926bd90d3aa231c3..c22e009d49bb891a560f8a6219fe3499859eff4b:/Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index 032f216..cf35708 100644
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
 */
 
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
 /*
- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
  *
- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
@@ -22,18 +22,18 @@
 #ifndef CYCRIPT_INTERNAL_HPP
 #define CYCRIPT_INTERNAL_HPP
 
-#include "Pooling.hpp"
+#include <sig/parse.hpp>
+#include <sig/ffi_type.hpp>
 
 #include <JavaScriptCore/JSBase.h>
 #include <JavaScriptCore/JSContextRef.h>
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 
-#include <sig/parse.hpp>
-#include <sig/ffi_type.hpp>
+#include "Pooling.hpp"
 
 JSGlobalContextRef CYGetJSContext(JSContextRef context);
-void Structor_(apr_pool_t *pool, sig::Type *&type);
+void Structor_(CYPool &pool, sig::Type *&type);
 
 JSObjectRef CYMakeType(JSContextRef context, const char *type);
 JSObjectRef CYMakeType(JSContextRef context, sig::Type *type);
@@ -49,17 +49,16 @@ struct Type_privateData :
     sig::Type *type_;
 
     void Set(sig::Type *type) {
-        type_ = new(pool_) sig::Type;
-        sig::Copy(pool_, *type_, *type);
+        type_ = new(*pool_) sig::Type;
+        sig::Copy(*pool_, *type_, *type);
     }
 
-    Type_privateData(apr_pool_t *pool, const char *type) :
+    Type_privateData(CYPool &pool, const char *type) :
+        CYData(pool),
         ffi_(NULL)
     {
-        _assert(pool != NULL);
-        pool_ = pool;
         sig::Signature signature;
-        sig::Parse(pool_, &signature, type, &Structor_);
+        sig::Parse(*pool_, &signature, type, &Structor_);
         type_ = signature.elements[0].type;
     }
 
@@ -67,27 +66,26 @@ struct Type_privateData :
         ffi_(NULL)
     {
         sig::Signature signature;
-        sig::Parse(pool_, &signature, type, &Structor_);
+        sig::Parse(*pool_, &signature, type, &Structor_);
         type_ = signature.elements[0].type;
     }
 
     Type_privateData(sig::Type *type) :
         ffi_(NULL)
     {
-        if (type != NULL)
-            Set(type);
+        // XXX: just in case I messed up migrating
+        _assert(type != NULL);
+        Set(type);
     }
 
     Type_privateData(sig::Type *type, ffi_type *ffi) {
-        ffi_ = new(pool_) ffi_type;
-        sig::Copy(pool_, *ffi_, *ffi);
+        ffi_ = new(*pool_) ffi_type;
+        sig::Copy(*pool_, *ffi_, *ffi);
         Set(type);
     }
 
     ffi_type *GetFFI() {
         if (ffi_ == NULL) {
-            ffi_ = new(pool_) ffi_type;
-
             sig::Element element;
             element.name = NULL;
             element.type = type_;
@@ -98,7 +96,9 @@ struct Type_privateData :
             signature.count = 1;
 
             ffi_cif cif;
-            sig::sig_ffi_cif(pool_, &sig::ObjectiveC, &signature, &cif);
+            sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature, &cif);
+
+            ffi_ = new(*pool_) ffi_type;
             *ffi_ = *cif.rtype;
         }
 
@@ -162,14 +162,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::Copy(*pool_, signature_, signature);
+        set();
+    }
+
+    Functor(const char *encoding, void (*value)()) :
         CYValue(reinterpret_cast<void *>(value))
     {
-        sig::Parse(pool_, &signature_, type, &Structor_);
-        sig::sig_ffi_cif(pool_, &sig::ObjectiveC, &signature_, &cif_);
+        sig::Parse(*pool_, &signature_, encoding, &Structor_);
+        set();
     }
 
     void (*GetValue() const)() {
@@ -177,6 +190,7 @@ struct Functor :
     }
 
     static JSStaticFunction const * const StaticFunctions;
+    static JSStaticValue const * const StaticValues;
 }; }
 
 struct Closure_privateData :
@@ -185,8 +199,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)
     {
@@ -200,7 +214,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*/