Fix Objective-C dictionary/array literal lowering.

[cycript.git] / Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index b4dd4a1b09502e70ed2edb55b3e7d41a19de086b..0851dea225467b3a65ab0954d831cd6d2fb5a9cd 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -1,21 +1,21 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2013  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  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
  * 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/>.

 **/
 /* }}} */
 
 **/
 /* }}} */
 


@@ -33,10 +33,7 @@
 #include "Pooling.hpp"
 
 JSGlobalContextRef CYGetJSContext(JSContextRef context);
 #include "Pooling.hpp"
 
 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);
+sig::Type *Structor_(CYPool &pool, sig::Aggregate *aggregate);

 
 extern JSClassRef Functor_;
 
 
 extern JSClassRef Functor_;
 


@@ -48,20 +45,6 @@ struct Type_privateData :
     ffi_type *ffi_;
     sig::Type *type_;
 
     ffi_type *ffi_;
     sig::Type *type_;
 

-    void Set(sig::Type *type) {
-        type_ = new(*pool_) sig::Type;
-        sig::Copy(*pool_, *type_, *type);
-    }
-
-    Type_privateData(CYPool &pool, const char *type) :
-        CYData(pool),
-        ffi_(NULL)
-    {
-        sig::Signature signature;
-        sig::Parse(*pool_, &signature, type, &Structor_);
-        type_ = signature.elements[0].type;
-    }
-

     Type_privateData(const char *type) :
         ffi_(NULL)
     {
     Type_privateData(const char *type) :
         ffi_(NULL)
     {


@@ -70,23 +53,20 @@ struct Type_privateData :
         type_ = signature.elements[0].type;
     }
 
         type_ = signature.elements[0].type;
     }
 

-    Type_privateData(sig::Type *type) :
-        ffi_(NULL)
+    Type_privateData(const sig::Type &type, ffi_type *ffi = NULL) :
+        type_(type.Copy(*pool_))

     {
     {

-        if (type != NULL)
-            Set(type);
-    }

 
 

-    Type_privateData(sig::Type *type, ffi_type *ffi) {
-        ffi_ = new(*pool_) ffi_type;
-        sig::Copy(*pool_, *ffi_, *ffi);
-        Set(type);
+        if (ffi == NULL)
+            ffi_ = NULL;
+        else {
+            ffi_ = new(*pool_) ffi_type;
+            sig::Copy(*pool_, *ffi_, *ffi);
+        }

     }
 
     ffi_type *GetFFI() {
         if (ffi_ == NULL) {
     }
 
     ffi_type *GetFFI() {
         if (ffi_ == NULL) {

-            ffi_ = new(*pool_) ffi_type;
-

             sig::Element element;
             element.name = NULL;
             element.type = type_;
             sig::Element element;
             element.name = NULL;
             element.type = type_;


@@ -97,7 +77,9 @@ struct Type_privateData :
             signature.count = 1;
 
             ffi_cif cif;
             signature.count = 1;
 
             ffi_cif cif;

-            sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature, &cif);
+            sig::sig_ffi_cif(*pool_, &signature, &cif);
+
+            ffi_ = new(*pool_) ffi_type;

             *ffi_ = *cif.rtype;
         }
 
             *ffi_ = *cif.rtype;
         }
 


@@ -163,7 +145,7 @@ struct Functor :
 {
   private:
     void set() {
 {
   private:
     void set() {

-        sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature_, &cif_);
+        sig::sig_ffi_cif(*pool_, &signature_, &cif_);

     }
 
   public:
     }
 
   public:


@@ -189,6 +171,7 @@ struct Functor :
     }
 
     static JSStaticFunction const * const StaticFunctions;
     }
 
     static JSStaticFunction const * const StaticFunctions;

+    static JSStaticValue const * const StaticValues;

 }; }
 
 struct Closure_privateData :
 }; }
 
 struct Closure_privateData :


@@ -196,11 +179,13 @@ struct Closure_privateData :
 {
     JSGlobalContextRef context_;
     JSObjectRef function_;
 {
     JSGlobalContextRef context_;
     JSObjectRef function_;

+    JSValueRef (*adapter_)(JSContextRef, size_t, JSValueRef[], JSObjectRef);

 
 

-    Closure_privateData(JSContextRef context, JSObjectRef function, const sig::Signature &signature) :
+    Closure_privateData(JSContextRef context, JSObjectRef function, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef), const sig::Signature &signature) :

         cy::Functor(signature, NULL),
         context_(CYGetJSContext(context)),
         cy::Functor(signature, NULL),
         context_(CYGetJSContext(context)),

-        function_(function)
+        function_(function),
+        adapter_(adapter)

     {
         //XXX:JSGlobalContextRetain(context_);
         JSValueProtect(context_, function_);
     {
         //XXX:JSGlobalContextRetain(context_);
         JSValueProtect(context_, function_);


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

-Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, void (*callback)(ffi_cif *, void *, void **, void *));
+Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef));

 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*/