Use * and -> syntax to unify Java and Objective-C.

[cycript.git] / ObjectiveC / Internal.hpp

diff --git a/ObjectiveC/Internal.hpp b/ObjectiveC/Internal.hpp
index b731dbb5c144b80f3ca77f36447cb5a4a6ed5875..759c87550c1b209fd80f11839f57e45053edb37e 100644 (file)
--- a/ObjectiveC/Internal.hpp
+++ b/ObjectiveC/Internal.hpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -22,26 +22,21 @@
 #ifndef CYCRIPT_OBJECTIVEC_INTERNAL_HPP
 #define CYCRIPT_OBJECTIVEC_INTERNAL_HPP
 
-#include <Internal.hpp>
 #include <objc/objc.h>
 
+#include "../Internal.hpp"
+
 struct Selector_privateData :
-    CYValue
+    CYValue<Selector_privateData, SEL>
 {
     _finline Selector_privateData(SEL value) :
         CYValue(value)
     {
     }
-
-    _finline SEL GetValue() const {
-        return reinterpret_cast<SEL>(value_);
-    }
-
-    virtual Type_privateData *GetType() const;
 };
 
 struct Instance :
-    CYValue
+    CYValue<Instance, id>
 {
     enum Flags {
         None          = 0,
@@ -51,69 +46,51 @@ struct Instance :
 
     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;
 
-    _finline id GetValue() const {
-        return reinterpret_cast<id>(value_);
-    }
+    static JSClassRef GetClass(id value, Flags flags);
 
     _finline bool IsUninitialized() const {
         return (flags_ & Uninitialized) != 0;
     }
-
-    virtual Type_privateData *GetType() const;
 };
 
 namespace cy {
 struct Super :
-    Instance
+    CYValue<Super, id>
 {
     Class class_;
 
     _finline Super(id value, Class _class) :
-        Instance(value, Instance::Permanent),
+        CYValue(value),
         class_(_class)
     {
     }
-
-    static JSObjectRef Make(JSContextRef context, id object, Class _class);
 }; }
 
 struct Messages :
-    CYValue
+    CYValue<Messages, Class>
 {
     _finline Messages(Class value) :
         CYValue(value)
     {
     }
 
-    static JSObjectRef Make(JSContextRef context, Class _class);
-
-    _finline Class GetValue() const {
-        return reinterpret_cast<Class>(value_);
-    }
+    JSValueRef GetPrototype(JSContextRef context) const;
 };
 
-struct Internal :
-    CYOwned
+struct Interior :
+    CYValue<Interior, id>
 {
-    _finline Internal(id value, JSContextRef context, JSObjectRef owner) :
-        CYOwned(value, context, owner)
-    {
-    }
-
-    static JSObjectRef Make(JSContextRef context, id object, JSObjectRef owner);
+    CYProtect owner_;
 
-    _finline id GetValue() const {
-        return reinterpret_cast<id>(value_);
+    _finline Interior(id value, JSContextRef context, JSObjectRef owner) :
+        CYValue(value),
+        owner_(context, owner)
+    {
     }
 };