Instance's toPointer() should return as CFTypeRef.

[cycript.git] / Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index e0193128ef5e0e8d0d9faad80e839aeefa4cc328..e6f2d45eb70d9cedcfba4ca45b05fb3649ccf1ff 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -34,58 +34,53 @@
 #include "Pooling.hpp"
 #include "Utility.hpp"
 
+struct CYPropertyName;
+
 JSGlobalContextRef CYGetJSContext(JSContextRef context);
 sig::Type *Structor_(CYPool &pool, sig::Aggregate *aggregate);
 
-extern JSClassRef Functor_;
-
 struct CYRoot :
     CYData
 {
+    // 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_
-{
+template <typename Internal_>
+struct CYPrivate {
     static JSClassRef Class_;
 
-    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));
+        JSObjectRef object(JSObjectMake(context, Class_, internal));
         if (JSValueRef prototype = internal->GetPrototype(context))
             CYSetPrototype(context, object, prototype);
         return object;
     }
 
-    static Internal_ *Get(JSContextRef context, JSObjectRef object) {
-        _assert(JSValueIsObjectOfClass(context, object, Class_));
-        return static_cast<Internal_ *>(JSObjectGetPrivate(object));
-    }
-};
+    template <typename Arg_>
+    static JSObjectRef Cache(JSContextRef context, Arg_ *arg) {
+        JSObjectRef global(CYGetGlobalObject(context));
+        JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
 
-template <typename Internal_, typename Base_>
-JSClassRef CYPrivateOld<Internal_, Base_>::Class_;
+        char label[32];
+        sprintf(label, "%s%p", Internal_::Cache_, arg);
+        CYJSString name(label);
 
-template <typename Internal_>
-struct CYPrivate {
-    static JSClassRef Class_;
+        JSValueRef value(CYGetProperty(context, cy, name));
+        if (!JSValueIsUndefined(context, value))
+            return CYCastJSObject(context, value);
 
-    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);
+        JSObjectRef object(Make(context, arg));
+        CYSetProperty(context, cy, name, object);
         return object;
     }
 
@@ -180,10 +175,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 :
     CYRoot
 {
+  public:
+    static JSClassRef Class_;
+
   private:
     void set() {
         sig::sig_ffi_cif(*pool_, variadic_ ? signature_.count : 0, signature_, &cif_);
@@ -211,8 +236,7 @@ struct Functor :
         set();
     }
 
-    static JSStaticFunction const * const StaticFunctions;
-    static JSStaticValue const * const StaticValues;
+    virtual CYPropertyName *GetName(CYPool &pool) const;
 }; }
 
 struct Closure_privateData :