Implemented [super ...] calls in @class blocks.

diff --git a/Cycript.y.in b/Cycript.y.in
index 7fef9ffb75f292ae237c561e551aa9a98135b529..a0ce2ccc0d4a594871b55a0ae1c9daab5a31b449 100644 (file)
--- a/Cycript.y.in
+++ b/Cycript.y.in
@@ -1419,7 +1419,8 @@ SelectorList
     ;
 
 MessageExpression
     ;
 
 MessageExpression

-    : "[" AssignmentExpression SelectorList "]" { $$ = new(driver.pool_) CYSend($2, $3); }
+    : "[" AssignmentExpression SelectorList "]" { $$ = new(driver.pool_) CYSendDirect($2, $3); }
+    | "[" "super" SelectorList "]" { $$ = new(driver.pool_) CYSendSuper($3); }

     ;
 
 SelectorExpressionOpt
     ;
 
 SelectorExpressionOpt

diff --git a/Library.mm b/Library.mm
index a9a0ae4d29c3137e8b36765bf18c13feda595f95..d61a4b22620b07279e2d4cae2ad3979fe8ea169f 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -48,7 +48,10 @@
 #include "sig/ffi_type.hpp"
 
 #include "Pooling.hpp"
 #include "sig/ffi_type.hpp"
 
 #include "Pooling.hpp"

+
+#ifdef __OBJC__

 #include "Struct.hpp"
 #include "Struct.hpp"

+#endif

 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>


@@ -96,15 +99,6 @@
     fprintf(stderr, "_trace():%u\n", __LINE__); \
 } while (false)
 
     fprintf(stderr, "_trace():%u\n", __LINE__); \
 } while (false)
 

-#define CYTry \
-    @try
-#define CYCatch \
-    @catch (NSException *error) { \
-        CYThrow(context, error, exception); \
-        return NULL; \
-    }
-
-#if 0

 #define CYTry \
     try
 #define CYCatch \
 #define CYTry \
     try
 #define CYCatch \


@@ -115,7 +109,6 @@
         *exception = CYCastJSValue(context, "catch(...)"); \
         return NULL; \
     }
         *exception = CYCastJSValue(context, "catch(...)"); \
         return NULL; \
     }

-#endif

 
 #ifdef __OBJC__
 #define CYPoolTry { \
 
 #ifdef __OBJC__
 #define CYPoolTry { \


@@ -151,7 +144,7 @@ JSStringRef CYCopyJSString(const char *value);
 void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value);
 
 JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)());
 void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value);
 
 JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)());

-JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
+JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);

 
 struct CYUTF8String {
     const char *data;
 
 struct CYUTF8String {
     const char *data;


@@ -382,13 +375,13 @@ NSString *CYCastNSString(apr_pool_t *pool, SEL sel) {
 NSString *CYCastNSString(apr_pool_t *pool, JSStringRef value) {
     return CYPoolRelease(pool, CYCopyNSString(value));
 }
 NSString *CYCastNSString(apr_pool_t *pool, JSStringRef value) {
     return CYPoolRelease(pool, CYCopyNSString(value));
 }

-/* }}} */
-#endif

 
 CYUTF8String CYCastUTF8String(NSString *value) {
     NSData *data([value dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:NO]);
     return CYUTF8String(reinterpret_cast<const char *>([data bytes]), [data length]);
 }
 
 CYUTF8String CYCastUTF8String(NSString *value) {
     NSData *data([value dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:NO]);
     return CYUTF8String(reinterpret_cast<const char *>([data bytes]), [data length]);
 }

+/* }}} */
+#endif

 
 /* JavaScript Stringify {{{ */
 void CYStringify(std::ostringstream &str, const char *data, size_t size) {
 
 /* JavaScript Stringify {{{ */
 void CYStringify(std::ostringstream &str, const char *data, size_t size) {


@@ -438,23 +431,30 @@ void CYStringify(std::ostringstream &str, const char *data, size_t size) {
 
 static JSGlobalContextRef Context_;
 static JSObjectRef System_;
 
 static JSGlobalContextRef Context_;
 static JSObjectRef System_;

-static JSObjectRef ObjectiveC_;

 
 static JSClassRef Functor_;
 
 static JSClassRef Functor_;

+static JSClassRef Pointer_;
+static JSClassRef Runtime_;
+static JSClassRef Struct_;
+
+#ifdef __OBJC__
+static JSObjectRef ObjectiveC_;
+

 static JSClassRef Instance_;
 static JSClassRef Internal_;
 static JSClassRef Message_;
 static JSClassRef Messages_;
 static JSClassRef Instance_;
 static JSClassRef Internal_;
 static JSClassRef Message_;
 static JSClassRef Messages_;

-static JSClassRef Pointer_;
-static JSClassRef Runtime_;

 static JSClassRef Selector_;
 static JSClassRef Selector_;

-static JSClassRef Struct_;
+static JSClassRef Super_;

 
 static JSClassRef ObjectiveC_Classes_;
 static JSClassRef ObjectiveC_Image_Classes_;
 static JSClassRef ObjectiveC_Images_;
 static JSClassRef ObjectiveC_Protocols_;
 
 
 static JSClassRef ObjectiveC_Classes_;
 static JSClassRef ObjectiveC_Image_Classes_;
 static JSClassRef ObjectiveC_Images_;
 static JSClassRef ObjectiveC_Protocols_;
 

+static JSObjectRef Instance_prototype_;
+#endif
+

 static JSObjectRef Array_;
 static JSObjectRef Function_;
 static JSObjectRef String_;
 static JSObjectRef Array_;
 static JSObjectRef Function_;
 static JSObjectRef String_;


@@ -468,7 +468,6 @@ static JSStringRef prototype_;
 static JSStringRef toCYON_;
 static JSStringRef toJSON_;
 
 static JSStringRef toCYON_;
 static JSStringRef toJSON_;
 

-static JSObjectRef Instance_prototype_;

 static JSObjectRef Object_prototype_;
 
 static JSObjectRef Array_prototype_;
 static JSObjectRef Object_prototype_;
 
 static JSObjectRef Array_prototype_;


@@ -635,6 +634,23 @@ struct Instance :
     virtual Type_privateData *GetType() const;
 };
 
     virtual Type_privateData *GetType() const;
 };
 

+struct Super :
+    Instance
+{
+    Class class_;
+
+    Super(id value, Class _class) :
+        Instance(value, Instance::Transient),
+        class_(_class)
+    {
+    }
+
+    static JSObjectRef Make(JSContextRef context, id object, Class _class) {
+        JSObjectRef value(JSObjectMake(context, Super_, new Super(object, _class)));
+        return value;
+    }
+};
+

 struct Messages :
     CYValue
 {
 struct Messages :
     CYValue
 {


@@ -1704,11 +1720,23 @@ id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cas
 NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
     return CYNSObject(pool, context, value, true);
 }
 NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
     return CYNSObject(pool, context, value, true);
 }

-
-id CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {

     return CYNSObject(pool, context, value, false);
 }
 
     return CYNSObject(pool, context, value, false);
 }
 

+static bool CYIsClass(id self) {
+    // XXX: this is a lame object_isClass
+    return class_getInstanceMethod(object_getClass(self), @selector(alloc)) != NULL;
+}
+
+Class CYCastClass(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+    id self(CYCastNSObject(pool, context, value));
+    if (CYIsClass(self))
+        return (Class) self;
+    _throw(NSInvalidArgumentException, "got somwthing that is not a Class");
+    return NULL;
+}
+

 NSArray *CYCastNSArray(JSPropertyNameArrayRef names) {
     CYPool pool;
     size_t size(JSPropertyNameArrayGetCount(names));
 NSArray *CYCastNSArray(JSPropertyNameArrayRef names) {
     CYPool pool;
     size_t size(JSPropertyNameArrayGetCount(names));


@@ -2511,13 +2539,13 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
         if (objc_property_t property = class_getProperty(_class, string)) {
             PropertyAttributes attributes(property);
             SEL sel(sel_registerName(attributes.Getter()));
         if (objc_property_t property = class_getProperty(_class, string)) {
             PropertyAttributes attributes(property);
             SEL sel(sel_registerName(attributes.Getter()));

-            return CYSendMessage(pool, context, self, sel, 0, NULL, false, exception);
+            return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);

         }
 #endif
 
         if (SEL sel = sel_getUid(string))
             if (CYImplements(self, _class, sel, true))
         }
 #endif
 
         if (SEL sel = sel_getUid(string))
             if (CYImplements(self, _class, sel, true))

-                return CYSendMessage(pool, context, self, sel, 0, NULL, false, exception);
+                return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);

 
         return NULL;
     } CYCatch
 
         return NULL;
     } CYCatch


@@ -2547,7 +2575,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
             if (const char *setter = attributes.Setter()) {
                 SEL sel(sel_registerName(setter));
                 JSValueRef arguments[1] = {value};
             if (const char *setter = attributes.Setter()) {
                 SEL sel(sel_registerName(setter));
                 JSValueRef arguments[1] = {value};

-                CYSendMessage(pool, context, self, sel, 1, arguments, false, exception);
+                CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception);

                 return true;
             }
         }
                 return true;
             }
         }


@@ -2572,7 +2600,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
         if (SEL sel = sel_getUid(set))
             if (CYImplements(self, _class, sel, false)) {
                 JSValueRef arguments[1] = {value};
         if (SEL sel = sel_getUid(set))
             if (CYImplements(self, _class, sel, false)) {
                 JSValueRef arguments[1] = {value};

-                CYSendMessage(pool, context, self, sel, 1, arguments, false, exception);
+                CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception);

             }
 
         if (CYInternal *internal = CYInternal::Set(self)) {
             }
 
         if (CYInternal *internal = CYInternal::Set(self)) {


@@ -2620,11 +2648,6 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef
     } CYCatch
 }
 
     } CYCatch
 }
 

-static bool CYIsClass(id self) {
-    // XXX: this is a lame object_isClass
-    return class_getInstanceMethod(object_getClass(self), @selector(alloc)) != NULL;
-}
-

 static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));
     Class _class(internal->GetValue());
 static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));
     Class _class(internal->GetValue());


@@ -3075,12 +3098,14 @@ static JSValueRef Runtime_getProperty(JSContextRef context, JSObjectRef object,
     } CYCatch
 }
 
     } CYCatch
 }
 

+#ifdef __OBJC__

 static bool stret(ffi_type *ffi_type) {
     return ffi_type->type == FFI_TYPE_STRUCT && (
         ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||
         struct_forward_array[ffi_type->size] != 0
     );
 }
 static bool stret(ffi_type *ffi_type) {
     return ffi_type->type == FFI_TYPE_STRUCT && (
         ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||
         struct_forward_array[ffi_type->size] != 0
     );
 }

+#endif

 
 extern "C" {
     int *_NSGetArgc(void);
 
 extern "C" {
     int *_NSGetArgc(void);


@@ -3097,10 +3122,12 @@ static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjec
     } CYCatch
 }
 
     } CYCatch
 }
 

-JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception) {
+JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception) {

     const char *type;
 
     const char *type;
 

-    Class _class(object_getClass(self));
+    if (_class == NULL)
+        _class = object_getClass(self);
+

     if (objc_method *method = class_getInstanceMethod(_class, _cmd))
         type = method_getTypeEncoding(method);
     else {
     if (objc_method *method = class_getInstanceMethod(_class, _cmd))
         type = method_getTypeEncoding(method);
     else {


@@ -3114,8 +3141,11 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _c
         } CYCatch
     }
 
         } CYCatch
     }
 

+    objc_super super = {self, _class};
+    void *arg0 = &super;
+

     void *setup[2];
     void *setup[2];

-    setup[0] = &self;
+    setup[0] = &arg0;

     setup[1] = &_cmd;
 
     sig::Signature signature;
     setup[1] = &_cmd;
 
     sig::Signature signature;


@@ -3124,7 +3154,7 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _c
     ffi_cif cif;
     sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
 
     ffi_cif cif;
     sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
 

-    void (*function)() = stret(cif.rtype) ? reinterpret_cast<void (*)()>(&objc_msgSend_stret) : reinterpret_cast<void (*)()>(&objc_msgSend);
+    void (*function)() = stret(cif.rtype) ? reinterpret_cast<void (*)()>(&objc_msgSendSuper_stret) : reinterpret_cast<void (*)()>(&objc_msgSendSuper);

     return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
 }
 
     return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
 }
 


@@ -3143,19 +3173,27 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
 
     id self;
     SEL _cmd;
 
     id self;
     SEL _cmd;

+    Class _class;

 
     CYTry {
         if (count < 2)
             _throw(NSInvalidArgumentException, "too few arguments to objc_msgSend");
 
 
     CYTry {
         if (count < 2)
             _throw(NSInvalidArgumentException, "too few arguments to objc_msgSend");
 

-        if (JSValueIsObjectOfClass(context, arguments[0], Instance_)) {
+        if (JSValueIsObjectOfClass(context, arguments[0], Super_)) {
+            Super *internal(reinterpret_cast<Super *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
+            self = internal->GetValue();
+            _class = internal->class_;;
+            uninitialized = false;
+        } else if (JSValueIsObjectOfClass(context, arguments[0], Instance_)) {

             Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
             self = internal->GetValue();
             Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
             self = internal->GetValue();

+            _class = nil;

             uninitialized = internal->IsUninitialized();
             if (uninitialized)
                 internal->value_ = nil;
         } else {
             self = CYCastNSObject(pool, context, arguments[0]);
             uninitialized = internal->IsUninitialized();
             if (uninitialized)
                 internal->value_ = nil;
         } else {
             self = CYCastNSObject(pool, context, arguments[0]);

+            _class = nil;

             uninitialized = false;
         }
 
             uninitialized = false;
         }
 


@@ -3165,7 +3203,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
         _cmd = CYCastSEL(context, arguments[1]);
     } CYCatch
 
         _cmd = CYCastSEL(context, arguments[1]);
     } CYCatch
 

-    return CYSendMessage(pool, context, self, _cmd, count - 2, arguments + 2, uninitialized, exception);
+    return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized, exception);

 }
 
 #ifdef __OBJC__
 }
 
 #ifdef __OBJC__


@@ -3241,6 +3279,17 @@ static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef objec
     return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
 }
 
     return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
 }
 

+static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+    CYTry {
+        if (count != 2)
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to Super constructor");
+        CYPool pool;
+        NSObject *self(CYCastNSObject(pool, context, arguments[0]));
+        Class _class(CYCastClass(pool, context, arguments[1]));
+        return Super::Make(context, self, _class);
+    } CYCatch
+}
+

 static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         if (count != 1)
 static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         if (count != 1)


@@ -3498,20 +3547,15 @@ static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef
             _throw(NSInvalidArgumentException, "incorrect number of arguments to Selector.type");
         CYPool pool;
         Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
             _throw(NSInvalidArgumentException, "incorrect number of arguments to Selector.type");
         CYPool pool;
         Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));

-        NSObject *value(CYCastNSObject(pool, context, arguments[0]));
-        if (value == NULL) lookup:
-            // XXX: do a lookup of some kind
-            return CYJSNull(context);
-        else if (!CYIsClass(value))
-            _throw(NSInvalidArgumentException, "Selector.type takes a Class");
-        else {
-            Class _class((Class) value);
+        if (Class _class = CYCastClass(pool, context, arguments[0])) {

             SEL sel(internal->GetValue());
             SEL sel(internal->GetValue());

-            if (objc_method *method = class_getInstanceMethod(_class, sel)) {
-                const char *type(CYPoolTypeEncoding(pool, _class, sel, method));
-                return type == NULL ? CYJSNull(context) : CYCastJSValue(context, CYJSString(type));
-            } else goto lookup;
+            if (objc_method *method = class_getInstanceMethod(_class, sel))
+                if (const char *type = CYPoolTypeEncoding(pool, _class, sel, method))
+                    return CYCastJSValue(context, CYJSString(type));

         }
         }

+
+        // XXX: do a lookup of some kind
+        return CYJSNull(context);

     } CYCatch
 }
 #endif
     } CYCatch
 }
 #endif


@@ -3817,6 +3861,9 @@ JSGlobalContextRef CYGetJSContext() {
         Messages_ = JSClassCreate(&definition);
         definition = kJSClassDefinitionEmpty;
 
         Messages_ = JSClassCreate(&definition);
         definition = kJSClassDefinitionEmpty;
 

+        definition.className = "Super";
+        Super_ = JSClassCreate(&definition);
+

         definition.className = "ObjectiveC::Classes";
         definition.getProperty = &ObjectiveC_Classes_getProperty;
         definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames;
         definition.className = "ObjectiveC::Classes";
         definition.getProperty = &ObjectiveC_Classes_getProperty;
         definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames;


@@ -3850,12 +3897,14 @@ JSGlobalContextRef CYGetJSContext() {
         JSObjectRef Instance(JSObjectMakeConstructor(context, Instance_, &Instance_new));
         JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL));
         JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
         JSObjectRef Instance(JSObjectMakeConstructor(context, Instance_, &Instance_new));
         JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL));
         JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));

+        JSObjectRef Super(JSObjectMakeConstructor(context, Super_, &Super_new));

 
         Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_);
         JSValueProtect(context, Instance_prototype_);
 
         CYSetProperty(context, global, CYJSString("Instance"), Instance);
         CYSetProperty(context, global, CYJSString("Selector"), Selector);
 
         Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_);
         JSValueProtect(context, Instance_prototype_);
 
         CYSetProperty(context, global, CYJSString("Instance"), Instance);
         CYSetProperty(context, global, CYJSString("Selector"), Selector);

+        CYSetProperty(context, global, CYJSString("Super"), Super);

 
         CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_));
         CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));
 
         CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_));
         CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));

diff --git a/ObjectiveC.hpp b/ObjectiveC.hpp
index 230813ff35ba02e16cc11afc66cd8dd8f8f7cad4..5a41c5ebb5b65f5a6618201f599f6e314b5b209f 100644 (file)
--- a/ObjectiveC.hpp
+++ b/ObjectiveC.hpp
@@ -187,17 +187,41 @@ struct CYCategory :
 struct CYSend :
     CYExpression
 {
 struct CYSend :
     CYExpression
 {

-    CYExpression *self_;

     CYArgument *arguments_;
 
     CYArgument *arguments_;
 

-    CYSend(CYExpression *self, CYArgument *arguments) :
-        self_(self),
+    CYSend(CYArgument *arguments) :

         arguments_(arguments)
     {
     }
 
     CYPrecedence(0)
 
         arguments_(arguments)
     {
     }
 
     CYPrecedence(0)
 

+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYSendDirect :
+    CYSend
+{
+    CYExpression *self_;
+
+    CYSendDirect(CYExpression *self, CYArgument *arguments) :
+        CYSend(arguments),
+        self_(self)
+    {
+    }
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYSendSuper :
+    CYSend
+{
+    CYSendSuper(CYArgument *arguments) :
+        CYSend(arguments)
+    {
+    }
+

     virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
     virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };

diff --git a/ObjectiveC.mm b/ObjectiveC.mm
index 73dbf7f22d46e853c80a0dcc0c7b2c1b75bc1aa3..00cf0572af9ad44f61b1b4339e67fbd19f9fb40d 100644 (file)
--- a/ObjectiveC.mm
+++ b/ObjectiveC.mm
@@ -117,17 +117,24 @@ void CYSelectorPart::Output(CYOutput &out) const {
 }
 
 void CYSend::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYSend::Output(CYOutput &out, CYFlags flags) const {

-    out << '[';
-
-    self_->Output(out, CYPA, CYNoFlags);
-

     for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
         if (argument->name_ != NULL) {
             out << ' ' << *argument->name_;
             if (argument->value_ != NULL)
                 out << ':' << *argument->value_;
         }
     for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
         if (argument->name_ != NULL) {
             out << ' ' << *argument->name_;
             if (argument->value_ != NULL)
                 out << ':' << *argument->value_;
         }

+}
+
+void CYSendDirect::Output(CYOutput &out, CYFlags flags) const {
+    out << '[';
+    self_->Output(out, CYPA, CYNoFlags);
+    CYSend::Output(out, flags);
+    out << ']';
+}

 
 

+void CYSendSuper::Output(CYOutput &out, CYFlags flags) const {
+    out << '[' << "super";
+    CYSend::Output(out, flags);

     out << ']';
 }
 /* }}} */
     out << ']';
 }
 /* }}} */


@@ -173,16 +180,19 @@ CYStatement *CYField::Replace(CYContext &context) const {
 CYStatement *CYMessage::Replace(CYContext &context, bool replace) const { $T(NULL)
     CYVariable *cyn($V("$cyn"));
     CYVariable *cyt($V("$cyt"));
 CYStatement *CYMessage::Replace(CYContext &context, bool replace) const { $T(NULL)
     CYVariable *cyn($V("$cyn"));
     CYVariable *cyt($V("$cyt"));

+    CYVariable *self($V("self"));
+    CYVariable *_class($V(instance_ ? "$cys" : "$cyp"));

 
     return $ CYBlock($$->*
         next_->Replace(context, replace)->*
         $E($ CYAssign(cyn, parameters_->Selector(context)))->*
 
     return $ CYBlock($$->*
         next_->Replace(context, replace)->*
         $E($ CYAssign(cyn, parameters_->Selector(context)))->*

-        $E($ CYAssign(cyt, $C1($M(cyn, $S("type")), $V(instance_ ? "$cys" : "$cyp"))))->*
+        $E($ CYAssign(cyt, $C1($M(cyn, $S("type")), _class)))->*

         $E($C4($V(replace ? "class_replaceMethod" : "class_addMethod"),
             $V(instance_ ? "$cyc" : "$cym"),
             cyn,
             $N2($V("Functor"), $F(NULL, $P2("self", "_cmd", parameters_->Parameters(context)), $$->*
         $E($C4($V(replace ? "class_replaceMethod" : "class_addMethod"),
             $V(instance_ ? "$cyc" : "$cym"),
             cyn,
             $N2($V("Functor"), $F(NULL, $P2("self", "_cmd", parameters_->Parameters(context)), $$->*

-                $ CYReturn($C1($M($F(NULL, NULL, code_), $S("call")), $V("self")))
+                $ CYVar($ CYDeclarations($ CYDeclaration($I("$cyr"), $N2($V("Super"), self, _class))))->*
+                $ CYReturn($C1($M($F(NULL, NULL, code_), $S("call")), self))

             ), cyt),
             cyt
         ))
             ), cyt),
             cyt
         ))


@@ -218,7 +228,7 @@ CYString *CYSelectorPart::Replace(CYContext &context) {
     return $S(apr_pstrdup(context.pool_, str.str().c_str()));
 }
 
     return $S(apr_pstrdup(context.pool_, str.str().c_str()));
 }
 

-CYExpression *CYSend::Replace(CYContext &context) {
+CYExpression *CYSendDirect::Replace(CYContext &context) {

     std::ostringstream name;
     CYArgument **argument(&arguments_);
 
     std::ostringstream name;
     CYArgument **argument(&arguments_);
 


@@ -241,4 +251,8 @@ CYExpression *CYSend::Replace(CYContext &context) {
 
     return $C2($V("objc_msgSend"), self_, $D(address), arguments_);
 }
 
     return $C2($V("objc_msgSend"), self_, $D(address), arguments_);
 }

+
+CYExpression *CYSendSuper::Replace(CYContext &context) {
+    return $ CYSendDirect($V("$cyr"), arguments_);
+}

 /* }}} */
 /* }}} */

diff --git a/Parser.hpp b/Parser.hpp
index 1e8825df6eaeff2b1615a7c43c316f7f5dec27da..86b7d17a70494cd4624afe3d18a1ee902fea88af 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -953,7 +953,7 @@ struct CYDeclarations :
 {
     CYDeclaration *declaration_;
 
 {
     CYDeclaration *declaration_;
 

-    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) :
+    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next = NULL) :

         CYNext<CYDeclarations>(next),
         declaration_(declaration)
     {
         CYNext<CYDeclarations>(next),
         declaration_(declaration)
     {

diff --git a/makefile b/makefile
index 78641e89c1d251f900593640ba6cb9ee1cb979cf..edf2668c024ba26bc7cfad38c2ab6c57cedde8f0 100644 (file)
--- a/makefile
+++ b/makefile
@@ -104,15 +104,16 @@ lex.cy.c: Cycript.l
 %.o: sig/%.cpp
        $(target)g++ $(flags) -c -o $@ $<
 
 %.o: sig/%.cpp
        $(target)g++ $(flags) -c -o $@ $<
 

-Cycript.tab.o: Cycript.tab.cc Cycript.tab.hh Parser.hpp Pooling.hpp
+Cycript.tab.o: Cycript.tab.cc $(header)

        $(target)g++ $(flags) -c -o $@ $<
 
        $(target)g++ $(flags) -c -o $@ $<
 

-lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
+lex.cy.o: lex.cy.c $(header)

        $(target)g++ $(flags) -c -o $@ $<
 
 %.o: %.cpp $(header)
        $(target)g++ $(flags) -c -o $@ $<
 
        $(target)g++ $(flags) -c -o $@ $<
 
 %.o: %.cpp $(header)
        $(target)g++ $(flags) -c -o $@ $<
 

+#objc := -x c++

 %.o: %.mm $(header)
        $(target)g++ $(objc) $(flags) -c -o $@ $<
 
 %.o: %.mm $(header)
        $(target)g++ $(objc) $(flags) -c -o $@ $<