new operator must return JSObject even for errors.

[cycript.git] / ObjectiveC / Internal.hpp

diff --git a/ObjectiveC/Internal.hpp b/ObjectiveC/Internal.hpp
index 3a297752e0b881ba73cd5a90bae62e3c693943d3..fcfec702d7131e1d4bafe74e5ebd9ea6e1e135dd 100644 (file)
--- a/ObjectiveC/Internal.hpp
+++ b/ObjectiveC/Internal.hpp
@@ -81,13 +81,44 @@ struct Super :
 struct Messages :
     CYRoot
 {
+    virtual Class GetClass() const = 0;
+};
+
+struct Prototype :
+    Messages
+{
+    static constexpr const char *const Cache_ = "p";
+
     Class value_;
 
-    _finline Messages(Class value) :
+    _finline Prototype(Class value) :
         value_(value)
     {
     }
 
+    Class GetClass() const override {
+        return value_;
+    }
+
+    JSValueRef GetPrototype(JSContextRef context) const;
+};
+
+struct Constructor :
+    Messages
+{
+    static constexpr const char *const Cache_ = "m";
+
+    Class value_;
+
+    _finline Constructor(Class value) :
+        value_(value)
+    {
+    }
+
+    Class GetClass() const override {
+        return value_;
+    }
+
     JSValueRef GetPrototype(JSContextRef context) const;
 };