X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/f95d2598051e347460e028286ff2d33e5825e548..77dd5db92b788d747c11ee9c78d79df5b88e7a1d:/ObjectiveC/Internal.hpp

diff --git a/ObjectiveC/Internal.hpp b/ObjectiveC/Internal.hpp
index 1ac20e2..fcfec70 100644
--- a/ObjectiveC/Internal.hpp
+++ b/ObjectiveC/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 {{{ */
@@ -22,98 +22,116 @@
 #ifndef CYCRIPT_OBJECTIVEC_INTERNAL_HPP
 #define CYCRIPT_OBJECTIVEC_INTERNAL_HPP
 
-#include <Internal.hpp>
 #include <objc/objc.h>
 
+#include "../Internal.hpp"
+
 struct Selector_privateData :
-    CYValue
+    CYRoot
 {
+    SEL value_;
+
     _finline Selector_privateData(SEL value) :
-        CYValue(value)
+        value_(value)
     {
     }
-
-    _finline SEL GetValue() const {
-        return reinterpret_cast<SEL>(value_);
-    }
-
-    virtual Type_privateData *GetType() const;
 };
 
 struct Instance :
-    CYValue
+    CYPrivateOld<Instance>
 {
-    enum Flags {
-        None          = 0,
-        Transient     = (1 << 0),
-        Uninitialized = (1 << 1),
-    };
+    typedef unsigned Flags;
+    static const Flags None = 0;
+    static const Flags Permanent = 1 << 0;
+    static const Flags Uninitialized = 1 << 1;
 
+    id value_;
     Flags flags_;
 
-    _finline Instance(id value, Flags flags) :
-        CYValue(value),
-        flags_(flags)
-    {
-    }
-
+    Instance(id value, Flags flags);
     virtual ~Instance();
 
-    static JSObjectRef Make(JSContextRef context, id object, Flags flags = None);
+    JSValueRef GetPrototype(JSContextRef context) const;
+
+    static JSClassRef GetClass(id value, Flags flags);
 
-    _finline id GetValue() const {
-        return reinterpret_cast<id>(value_);
+    _finline bool IsPermanent() const {
+        return (flags_ & Permanent) != 0;
     }
 
     _finline bool IsUninitialized() const {
         return (flags_ & Uninitialized) != 0;
     }
-
-    virtual Type_privateData *GetType() const;
 };
 
 namespace cy {
 struct Super :
-    Instance
+    CYRoot
 {
+    id value_;
     Class class_;
 
     _finline Super(id value, Class _class) :
-        Instance(value, Instance::Transient),
+        value_(value),
         class_(_class)
     {
     }
-
-    static JSObjectRef Make(JSContextRef context, id object, Class _class);
 }; }
 
 struct Messages :
-    CYValue
+    CYRoot
+{
+    virtual Class GetClass() const = 0;
+};
+
+struct Prototype :
+    Messages
 {
-    _finline Messages(Class value) :
-        CYValue(value)
+    static constexpr const char *const Cache_ = "p";
+
+    Class value_;
+
+    _finline Prototype(Class value) :
+        value_(value)
     {
     }
 
-    static JSObjectRef Make(JSContextRef context, Class _class);
-
-    _finline Class GetValue() const {
-        return reinterpret_cast<Class>(value_);
+    Class GetClass() const override {
+        return value_;
     }
+
+    JSValueRef GetPrototype(JSContextRef context) const;
 };
 
-struct Internal :
-    CYOwned
+struct Constructor :
+    Messages
 {
-    _finline Internal(id value, JSContextRef context, JSObjectRef owner) :
-        CYOwned(value, context, owner)
+    static constexpr const char *const Cache_ = "m";
+
+    Class value_;
+
+    _finline Constructor(Class value) :
+        value_(value)
     {
     }
 
-    static JSObjectRef Make(JSContextRef context, id object, JSObjectRef owner);
+    Class GetClass() const override {
+        return value_;
+    }
+
+    JSValueRef GetPrototype(JSContextRef context) const;
+};
 
-    _finline id GetValue() const {
-        return reinterpret_cast<id>(value_);
+struct Interior :
+    CYRoot
+{
+    id value_;
+    CYProtect owner_;
+
+    _finline Interior(id value, JSContextRef context, JSObjectRef owner) :
+        value_(value),
+        owner_(context, owner)
+    {
     }
 };