Move number's typeid set to FromFFI from Type_new.

[cycript.git] / Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index b4acd1871de7dfd158f8439680263d1cacf49f94..7e6b1fd3ea3d164542f06ed9a7b1203fa7428256 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -34,20 +34,30 @@
 #include "Pooling.hpp"
 #include "Utility.hpp"
 
+struct CYPropertyName;
+
 JSGlobalContextRef CYGetJSContext(JSContextRef context);
 sig::Type *Structor_(CYPool &pool, sig::Aggregate *aggregate);
 
-extern JSClassRef Functor_;
-
-template <typename Internal_>
-struct CYPrivate :
+struct CYRoot :
     CYData
 {
-    static JSClassRef Class_;
+    // XXX: without this, CYData is zero-initialized?!
+    CYRoot() :
+        CYData()
+    {
+    }
 
     _finline JSValueRef GetPrototype(JSContextRef context) const {
         return NULL;
     }
+};
+
+template <typename Internal_, typename Base_ = CYRoot>
+struct CYPrivateOld :
+    Base_
+{
+    static JSClassRef Class_;
 
     template <typename... Args_>
     _finline static JSClassRef GetClass(Args_ &&... args) {
@@ -69,8 +79,51 @@ struct CYPrivate :
     }
 };
 
+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 :
-    CYPrivate<Type_privateData>
+    CYRoot
 {
     ffi_type *ffi_;
     sig::Type *type_;
@@ -117,9 +170,6 @@ struct Type_privateData :
     }
 };
 
-template <typename Internal_>
-JSClassRef CYPrivate<Internal_>::Class_;
-
 struct CYProtect {
   private:
     JSGlobalContextRef context_;
@@ -154,10 +204,40 @@ struct CYProtect {
     }
 };
 
+class CYBuffer {
+  private:
+    JSObjectRef owner_;
+    CYPool *pool_;
+
+  public:
+    CYBuffer(JSContextRef context) :
+        owner_(CYPrivate<CYRoot>::Make(context)),
+        pool_(CYPrivate<CYRoot>::Get(context, owner_)->pool_)
+    {
+        auto internal(CYPrivate<CYRoot>::Get(context, owner_));
+        internal->pool_->malloc<int>(10);
+    }
+
+    operator JSObjectRef() const {
+        return owner_;
+    }
+
+    operator CYPool *() const {
+        return pool_;
+    }
+
+    CYPool *operator ->() const {
+        return pool_;
+    }
+};
+
 namespace cy {
 struct Functor :
-    CYPrivate<Functor>
+    CYRoot
 {
+  public:
+    static JSClassRef Class_;
+
   private:
     void set() {
         sig::sig_ffi_cif(*pool_, variadic_ ? signature_.count : 0, signature_, &cif_);
@@ -185,8 +265,7 @@ struct Functor :
         set();
     }
 
-    static JSStaticFunction const * const StaticFunctions;
-    static JSStaticValue const * const StaticValues;
+    virtual CYPropertyName *GetName(CYPool &pool) const;
 }; }
 
 struct Closure_privateData :