Also use CXType walker to for function prototypes.

[cycript.git] / Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index 433059079edbf9be6d1c37b1a1c37ede3398b73e..7e6b1fd3ea3d164542f06ed9a7b1203fa7428256 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -30,27 +30,103 @@
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 

+#include "JavaScript.hpp"

 #include "Pooling.hpp"
 #include "Pooling.hpp"

+#include "Utility.hpp"
+
+struct CYPropertyName;

 
 JSGlobalContextRef CYGetJSContext(JSContextRef context);
 
 JSGlobalContextRef CYGetJSContext(JSContextRef context);

-void Structor_(CYPool &pool, sig::Type *&type);
+sig::Type *Structor_(CYPool &pool, sig::Aggregate *aggregate);

 
 

-JSObjectRef CYMakeType(JSContextRef context, sig::Type *type);
+struct CYRoot :
+    CYData
+{
+    // XXX: without this, CYData is zero-initialized?!
+    CYRoot() :
+        CYData()
+    {
+    }

 
 

-extern JSClassRef Functor_;
+    _finline JSValueRef GetPrototype(JSContextRef context) const {
+        return NULL;
+    }
+};

 
 

-struct Type_privateData :
-    CYData
+template <typename Internal_, typename Base_ = CYRoot>
+struct CYPrivateOld :
+    Base_

 {
     static JSClassRef Class_;
 
 {
     static JSClassRef Class_;
 

-    ffi_type *ffi_;
-    sig::Type *type_;
+    template <typename... Args_>
+    _finline static JSClassRef GetClass(Args_ &&... args) {
+        return Class_;
+    }
+
+    template <typename... Args_>
+    static JSObjectRef Make(JSContextRef context, Args_ &&... args) {
+        Internal_ *internal(new Internal_(cy::Forward<Args_>(args)...));
+        JSObjectRef object(JSObjectMake(context, Internal_::GetClass(cy::Forward<Args_>(args)...), internal));
+        if (JSValueRef prototype = internal->GetPrototype(context))
+            CYSetPrototype(context, object, prototype);
+        return object;
+    }

 
 

-    void Set(sig::Type *type) {
-        type_ = new(*pool_) sig::Type;
-        sig::Copy(*pool_, *type_, *type);
+    static Internal_ *Get(JSContextRef context, JSObjectRef object) {
+        _assert(JSValueIsObjectOfClass(context, object, Class_));
+        return static_cast<Internal_ *>(JSObjectGetPrivate(object));

     }
     }

+};
+
+template <typename Internal_, typename Base_>
+JSClassRef CYPrivateOld<Internal_, Base_>::Class_;
+
+template <typename Internal_>
+struct CYPrivate {
+    static JSClassRef Class_;
+
+    template <typename... Args_>
+    static JSObjectRef Make(JSContextRef context, Args_ &&... args) {
+        Internal_ *internal(new Internal_(cy::Forward<Args_>(args)...));
+        JSObjectRef object(JSObjectMake(context, Class_, internal));
+        if (JSValueRef prototype = internal->GetPrototype(context))
+            CYSetPrototype(context, object, prototype);
+        return object;
+    }
+
+    template <typename Arg_>
+    static JSObjectRef Cache(JSContextRef context, Arg_ *arg) {
+        JSObjectRef global(CYGetGlobalObject(context));
+        JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
+
+        char label[32];
+        sprintf(label, "%s%p", Internal_::Cache_, arg);
+        CYJSString name(label);
+
+        JSValueRef value(CYGetProperty(context, cy, name));
+        if (!JSValueIsUndefined(context, value))
+            return CYCastJSObject(context, value);
+
+        JSObjectRef object(Make(context, arg));
+        CYSetProperty(context, cy, name, object);
+        return object;
+    }
+
+    static Internal_ *Get(JSContextRef context, JSObjectRef object) {
+        _assert(JSValueIsObjectOfClass(context, object, Class_));
+        return static_cast<Internal_ *>(JSObjectGetPrivate(object));
+    }
+};
+
+template <typename Internal_>
+JSClassRef CYPrivate<Internal_>::Class_;
+
+struct Type_privateData :
+    CYRoot
+{
+    ffi_type *ffi_;
+    sig::Type *type_;

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


@@ -60,27 +136,16 @@ struct Type_privateData :
         type_ = signature.elements[0].type;
     }
 
         type_ = signature.elements[0].type;
     }
 

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

     {
     {

-        sig::Type type;
-        memset(&type, 0, sizeof(type));
-        type.primitive = primitive;
-        Set(&type);
-    }

 
 

-    Type_privateData(sig::Type *type) :
-        ffi_(NULL)
-    {
-        // 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);
-        Set(type);
+        if (ffi == NULL)
+            ffi_ = NULL;
+        else {
+            ffi_ = new(*pool_) ffi_type;
+            sig::Copy(*pool_, *ffi_, *ffi);
+        }

     }
 
     ffi_type *GetFFI() {
     }
 
     ffi_type *GetFFI() {


@@ -95,7 +160,7 @@ 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_, false, signature, &cif);

 
             ffi_ = new(*pool_) ffi_type;
             *ffi_ = *cif.rtype;
 
             ffi_ = new(*pool_) ffi_type;
             *ffi_ = *cif.rtype;


@@ -105,115 +170,119 @@ struct Type_privateData :
     }
 };
 
     }
 };
 

-struct CYValue :
-    CYData
-{
-    void *value_;
+struct CYProtect {
+  private:
+    JSGlobalContextRef context_;
+    JSObjectRef object_;

 
 

-    CYValue() {
+  public:
+    CYProtect(JSContextRef context, JSObjectRef object) :
+        context_(CYGetJSContext(context)),
+        object_(object)
+    {
+        //XXX:JSGlobalContextRetain(context_);
+        if (object_ != NULL)
+            JSValueProtect(context_, object_);

     }
 
     }
 

-    CYValue(const void *value) :
-        value_(const_cast<void *>(value))
-    {
+    ~CYProtect() {
+        if (object_ != NULL)
+            JSValueUnprotect(context_, object_);
+        //XXX:JSGlobalContextRelease(context_);

     }
 
     }
 

-    CYValue(const CYValue &rhs) :
-        value_(rhs.value_)
-    {
+    operator bool() const {
+        return object_ != NULL;

     }
 
     }
 

-    virtual Type_privateData *GetType() const {
-        return NULL;
+    operator JSContextRef() const {
+        return context_;
+    }
+
+    operator JSObjectRef() const {
+        return object_;

     }
 };
 
     }
 };
 

-struct CYOwned :
-    CYValue
-{
+class CYBuffer {

   private:
   private:

-    JSGlobalContextRef context_;

     JSObjectRef owner_;
     JSObjectRef owner_;

+    CYPool *pool_;

 
   public:
 
   public:

-    CYOwned(void *value, JSContextRef context, JSObjectRef owner) :
-        CYValue(value),
-        context_(CYGetJSContext(context)),
-        owner_(owner)
+    CYBuffer(JSContextRef context) :
+        owner_(CYPrivate<CYRoot>::Make(context)),
+        pool_(CYPrivate<CYRoot>::Get(context, owner_)->pool_)

     {
     {

-        //XXX:JSGlobalContextRetain(context_);
-        if (owner_ != NULL)
-            JSValueProtect(context_, owner_);
+        auto internal(CYPrivate<CYRoot>::Get(context, owner_));
+        internal->pool_->malloc<int>(10);

     }
 
     }
 

-    virtual ~CYOwned() {
-        if (owner_ != NULL)
-            JSValueUnprotect(context_, owner_);
-        //XXX:JSGlobalContextRelease(context_);
+    operator JSObjectRef() const {
+        return owner_;

     }
 
     }
 

-    JSObjectRef GetOwner() const {
-        return owner_;
+    operator CYPool *() const {
+        return pool_;
+    }
+
+    CYPool *operator ->() const {
+        return pool_;

     }
 };
 
 namespace cy {
 struct Functor :
     }
 };
 
 namespace cy {
 struct Functor :

-    CYValue
+    CYRoot

 {
 {

+  public:
+    static JSClassRef Class_;
+

   private:
     void set() {
   private:
     void set() {

-        sig::sig_ffi_cif(*pool_, &sig::ObjectiveC, &signature_, &cif_);
+        sig::sig_ffi_cif(*pool_, variadic_ ? signature_.count : 0, signature_, &cif_);

     }
 
   public:
     }
 
   public:

+    void (*value_)();
+    bool variadic_;

     sig::Signature signature_;
     ffi_cif cif_;
 
     sig::Signature signature_;
     ffi_cif cif_;
 

-    Functor(const sig::Signature &signature, void (*value)()) :
-        CYValue(reinterpret_cast<void *>(value))
+    Functor(void (*value)(), bool variadic, const sig::Signature &signature) :
+        value_(value),
+        variadic_(variadic)

     {
         sig::Copy(*pool_, signature_, signature);
         set();
     }
 
     {
         sig::Copy(*pool_, signature_, signature);
         set();
     }
 

-    Functor(const char *encoding, void (*value)()) :
-        CYValue(reinterpret_cast<void *>(value))
+    Functor(void (*value)(), const char *encoding) :
+        value_(value),
+        variadic_(false)

     {
         sig::Parse(*pool_, &signature_, encoding, &Structor_);
         set();
     }
 
     {
         sig::Parse(*pool_, &signature_, encoding, &Structor_);
         set();
     }
 

-    void (*GetValue() const)() {
-        return reinterpret_cast<void (*)()>(value_);
-    }
-
-    static JSStaticFunction const * const StaticFunctions;
-    static JSStaticValue const * const StaticValues;
+    virtual CYPropertyName *GetName(CYPool &pool) const;

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

-    JSGlobalContextRef context_;
-    JSObjectRef function_;
+    CYProtect function_;
+    JSValueRef (*adapter_)(JSContextRef, size_t, JSValueRef[], JSObjectRef);

 
 

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

     {
     {

-        //XXX:JSGlobalContextRetain(context_);
-        JSValueProtect(context_, function_);
-    }
-
-    virtual ~Closure_privateData() {
-        JSValueUnprotect(context_, function_);
-        //XXX:JSGlobalContextRelease(context_);

     }
 };
 
     }
 };
 

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