X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/077756a45fcee049b33e31dcb21575573768aef8..79492f212da2fcaa4ce44d00fc08530e1630d05b:/Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index ff45f13..72b2986 100644
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -1,21 +1,21 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2013  Jay Freeman (saurik)
+ * Copyright (C) 2009-2014  Jay Freeman (saurik)
 */
 
-/* GNU General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
 /*
- * 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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 General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
 
@@ -35,7 +35,6 @@
 JSGlobalContextRef CYGetJSContext(JSContextRef context);
 void Structor_(CYPool &pool, sig::Type *&type);
 
-JSObjectRef CYMakeType(JSContextRef context, const char *type);
 JSObjectRef CYMakeType(JSContextRef context, sig::Type *type);
 
 extern JSClassRef Functor_;
@@ -53,8 +52,7 @@ struct Type_privateData :
         sig::Copy(*pool_, *type_, *type);
     }
 
-    Type_privateData(CYPool &pool, const char *type) :
-        CYData(pool),
+    Type_privateData(const char *type) :
         ffi_(NULL)
     {
         sig::Signature signature;
@@ -62,19 +60,21 @@ struct Type_privateData :
         type_ = signature.elements[0].type;
     }
 
-    Type_privateData(const char *type) :
+    Type_privateData(sig::Primitive primitive) :
         ffi_(NULL)
     {
-        sig::Signature signature;
-        sig::Parse(*pool_, &signature, type, &Structor_);
-        type_ = signature.elements[0].type;
+        sig::Type type;
+        memset(&type, 0, sizeof(type));
+        type.primitive = primitive;
+        Set(&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) {
@@ -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;
         }
 
@@ -170,7 +170,7 @@ struct Functor :
     sig::Signature signature_;
     ffi_cif cif_;
 
-    Functor(sig::Signature &signature, void (*value)()) :
+    Functor(const sig::Signature &signature, void (*value)()) :
         CYValue(reinterpret_cast<void *>(value))
     {
         sig::Copy(*pool_, signature_, signature);
@@ -189,6 +189,7 @@ struct Functor :
     }
 
     static JSStaticFunction const * const StaticFunctions;
+    static JSStaticValue const * const StaticValues;
 }; }
 
 struct Closure_privateData :
@@ -197,8 +198,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)
     {
@@ -212,7 +213,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*/