Do not allow JavaMethod calls on non-Java objects.

[cycript.git] / ObjectiveC / Internal.hpp

diff --git a/ObjectiveC/Internal.hpp b/ObjectiveC/Internal.hpp
index e4fdda4aed53a8844bc843680d797f459f8a14b7..8606d55fa6941e719a2bf17e14e7671648b97749 100644 (file)
--- a/ObjectiveC/Internal.hpp
+++ b/ObjectiveC/Internal.hpp
@@ -1,119 +1,96 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2013  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)
 */
 
-/* GNU General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
 /*
- * Cycript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * Cycript is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
 
 #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,
-        Transient     = (1 << 0),
+        Permanent     = (1 << 0),
         Uninitialized = (1 << 1),
     };
 
     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::Transient),
+        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)
+    {
     }
 };