Do not output class extension syntax for Object{}.

[cycript.git] / Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index 72b2986ecfe3ee0aeb9366e30c936b63afd0edb2..9228379e36f0a4d3a2bd7357dbba78ab1ee9f3ef 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  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,28 +30,46 @@
 #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"

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

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

 
 extern JSClassRef Functor_;
 
 
 extern JSClassRef Functor_;
 

-struct Type_privateData :
+template <typename Internal_>
+struct CYPrivate :

     CYData
 {
     static JSClassRef Class_;
 
     CYData
 {
     static JSClassRef Class_;
 

-    ffi_type *ffi_;
-    sig::Type *type_;
+    _finline JSValueRef GetPrototype(JSContextRef context) const {
+        return NULL;
+    }

 
 

-    void Set(sig::Type *type) {
-        type_ = new(*pool_) sig::Type;
-        sig::Copy(*pool_, *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;
+    }
+};
+
+struct Type_privateData :
+    CYPrivate<Type_privateData>
+{
+    ffi_type *ffi_;
+    sig::Type *type_;
+

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


@@ -60,27 +78,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 +102,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,16 +112,17 @@ struct Type_privateData :
     }
 };
 
     }
 };
 

+template <typename Internal_, typename Value_>

 struct CYValue :
 struct CYValue :

-    CYData
+    CYPrivate<Internal_>

 {
 {

-    void *value_;
+    Value_ value_;

 
     CYValue() {
     }
 
 
     CYValue() {
     }
 

-    CYValue(const void *value) :
-        value_(const_cast<void *>(value))
+    CYValue(const Value_ &value) :
+        value_(value)

     {
     }
 
     {
     }
 


@@ -122,72 +130,75 @@ struct CYValue :
         value_(rhs.value_)
     {
     }
         value_(rhs.value_)
     {
     }

-
-    virtual Type_privateData *GetType() const {
-        return NULL;
-    }

 };
 
 };
 

-struct CYOwned :
-    CYValue
-{
+template <typename Internal_>
+JSClassRef CYPrivate<Internal_>::Class_;
+
+struct CYProtect {

   private:
     JSGlobalContextRef context_;
   private:
     JSGlobalContextRef context_;

-    JSObjectRef owner_;
+    JSObjectRef object_;

 
   public:
 
   public:

-    CYOwned(void *value, JSContextRef context, JSObjectRef owner) :
-        CYValue(value),
+    CYProtect(JSContextRef context, JSObjectRef object) :

         context_(CYGetJSContext(context)),
         context_(CYGetJSContext(context)),

-        owner_(owner)
+        object_(object)

     {
         //XXX:JSGlobalContextRetain(context_);
     {
         //XXX:JSGlobalContextRetain(context_);

-        if (owner_ != NULL)
-            JSValueProtect(context_, owner_);
+        if (object_ != NULL)
+            JSValueProtect(context_, object_);

     }
 
     }
 

-    virtual ~CYOwned() {
-        if (owner_ != NULL)
-            JSValueUnprotect(context_, owner_);
+    ~CYProtect() {
+        if (object_ != NULL)
+            JSValueUnprotect(context_, object_);

         //XXX:JSGlobalContextRelease(context_);
     }
 
         //XXX:JSGlobalContextRelease(context_);
     }
 

-    JSObjectRef GetOwner() const {
-        return owner_;
+    operator bool() const {
+        return object_ != NULL;
+    }
+
+    operator JSContextRef() const {
+        return context_;
+    }
+
+    operator JSObjectRef() const {
+        return object_;

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

-    CYValue
+    CYValue<Functor, void (*)()>

 {
   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:

+    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) :
+        CYValue(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) :
+        CYValue(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;
 }; }
     static JSStaticFunction const * const StaticFunctions;
     static JSStaticValue const * const StaticValues;
 }; }


@@ -195,25 +206,18 @@ struct Functor :
 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*/