Remove all non-%union fields from semantic values.

[cycript.git] / Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index 8b77fd5284edb29f961d09d5218cd55eb5f6dd27..87ff05557593bda675f8ffe27dd5c9ceb51cac38 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -1,16 +1,43 @@
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
+*/
+
+/* GNU Affero General Public License, Version 3 {{{ */
+/*
+ * 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 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/>.
+**/
+/* }}} */
+

 #ifndef CYCRIPT_INTERNAL_HPP
 #define CYCRIPT_INTERNAL_HPP
 
 #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/JSBase.h>

+#include <JavaScriptCore/JSContextRef.h>

 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 

-#include <sig/parse.hpp>
-#include <sig/ffi_type.hpp>
+#include "Pooling.hpp"

 
 

-void Structor_(apr_pool_t *pool, const char *name, const char *types, sig::Type *&type);
+JSGlobalContextRef CYGetJSContext(JSContextRef context);
+void Structor_(CYPool &pool, sig::Type *&type);
+
+JSObjectRef CYMakeType(JSContextRef context, sig::Type *type);
+
+extern JSClassRef Functor_;

 
 struct Type_privateData :
     CYData
 
 struct Type_privateData :
     CYData


@@ -21,38 +48,43 @@ struct Type_privateData :
     sig::Type *type_;
 
     void Set(sig::Type *type) {
     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(const char *type) :

         ffi_(NULL)
     {
         ffi_(NULL)
     {

-        if (pool != NULL)
-            pool_ = pool;
-

         sig::Signature signature;
         sig::Signature signature;

-        sig::Parse(pool_, &signature, type, &Structor_);
+        sig::Parse(*pool_, &signature, type, &Structor_);

         type_ = signature.elements[0].type;
     }
 
         type_ = signature.elements[0].type;
     }
 

+    Type_privateData(sig::Primitive primitive) :
+        ffi_(NULL)
+    {
+        sig::Type type;
+        memset(&type, 0, sizeof(type));
+        type.primitive = primitive;
+        Set(&type);
+    }
+

     Type_privateData(sig::Type *type) :
         ffi_(NULL)
     {
     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) {
     }
 
     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) {
         Set(type);
     }
 
     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_;


@@ -63,7 +95,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_, &sig::ObjectiveC, &signature, &cif);
+
+            ffi_ = new(*pool_) ffi_type;

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


@@ -98,15 +132,16 @@ struct CYOwned :
     CYValue
 {
   private:
     CYValue
 {
   private:

-    JSContextRef context_;
+    JSGlobalContextRef context_;

     JSObjectRef owner_;
 
   public:
     CYOwned(void *value, JSContextRef context, JSObjectRef owner) :
         CYValue(value),
     JSObjectRef owner_;
 
   public:
     CYOwned(void *value, JSContextRef context, JSObjectRef owner) :
         CYValue(value),

-        context_(context),
+        context_(CYGetJSContext(context)),

         owner_(owner)
     {
         owner_(owner)
     {

+        //XXX:JSGlobalContextRetain(context_);

         if (owner_ != NULL)
             JSValueProtect(context_, owner_);
     }
         if (owner_ != NULL)
             JSValueProtect(context_, owner_);
     }


@@ -114,6 +149,7 @@ struct CYOwned :
     virtual ~CYOwned() {
         if (owner_ != NULL)
             JSValueUnprotect(context_, owner_);
     virtual ~CYOwned() {
         if (owner_ != NULL)
             JSValueUnprotect(context_, owner_);

+        //XXX:JSGlobalContextRelease(context_);

     }
 
     JSObjectRef GetOwner() const {
     }
 
     JSObjectRef GetOwner() const {


@@ -125,42 +161,61 @@ 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))
+    {
+        sig::Copy(*pool_, signature_, signature);
+        set();
+    }
+
+    Functor(const char *encoding, 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::Parse(*pool_, &signature_, encoding, &Structor_);
+        set();

     }
 
     }
 

-    void (*GetValue())() const {
+    void (*GetValue() const)() {

         return reinterpret_cast<void (*)()>(value_);
     }
 
     static JSStaticFunction const * const StaticFunctions;
         return reinterpret_cast<void (*)()>(value_);
     }
 
     static JSStaticFunction const * const StaticFunctions;

+    static JSStaticValue const * const StaticValues;

 }; }
 
 struct Closure_privateData :
     cy::Functor
 {
 }; }
 
 struct Closure_privateData :
     cy::Functor
 {

-    JSContextRef context_;
+    JSGlobalContextRef context_;

     JSObjectRef function_;
     JSObjectRef function_;

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

 
 

-    Closure_privateData(JSContextRef context, JSObjectRef function, const char *type) :
-        cy::Functor(type, NULL),
-        context_(context),
-        function_(function)
+    Closure_privateData(JSContextRef context, JSObjectRef function, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef), const sig::Signature &signature) :
+        cy::Functor(signature, NULL),
+        context_(CYGetJSContext(context)),
+        function_(function),
+        adapter_(adapter)

     {
     {

+        //XXX:JSGlobalContextRetain(context_);

         JSValueProtect(context_, function_);
     }
 
     virtual ~Closure_privateData() {
         JSValueUnprotect(context_, function_);
         JSValueProtect(context_, function_);
     }
 
     virtual ~Closure_privateData() {
         JSValueUnprotect(context_, function_);

+        //XXX:JSGlobalContextRelease(context_);

     }
 };
 
     }
 };
 

-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, 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*/
 
 #endif/*CYCRIPT_INTERNAL_HPP*/