X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/3d2d95a047dd79434f7ffbdb3556cc5de0e5cb81..59ffbc36a6b9383533e87321fc7769e8f3fd5a8a:/Internal.hpp

diff --git a/Internal.hpp b/Internal.hpp
index 8c7bc19..e6f2d45 100644
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -34,48 +34,25 @@
 #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
 {
-    _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) {
-        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;
+    // XXX: without this, CYData is zero-initialized?!
+    CYRoot() :
+        CYData()
+    {
     }
 
-    static Internal_ *Get(JSContextRef context, JSObjectRef object) {
-        _assert(JSValueIsObjectOfClass(context, object, Class_));
-        return static_cast<Internal_ *>(JSObjectGetPrivate(object));
+    _finline JSValueRef GetPrototype(JSContextRef context) const {
+        return NULL;
     }
 };
 
-template <typename Internal_, typename Base_>
-JSClassRef CYPrivateOld<Internal_, Base_>::Class_;
-
 template <typename Internal_>
 struct CYPrivate {
     static JSClassRef Class_;
@@ -198,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_);
@@ -229,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 :