Slightly reorganized code, fixed @class to work with NoBF principal, integrated the...

diff --git a/Cycript.y b/Cycript.y
index dd0ea51da91105c8c09b1438853205e0aaa20d7f..1e0f0bf4953b1230f30cbae6fc4832e74288c132 100644 (file)
--- a/Cycript.y
+++ b/Cycript.y
@@ -57,6 +57,7 @@ typedef struct {
         CYBoolean *boolean_;
         CYClause *clause_;
         CYCatch *catch_;
         CYBoolean *boolean_;
         CYClause *clause_;
         CYCatch *catch_;

+        CYClass *class_;

         CYClassName *className_;
         CYCompound *compound_;
         CYDeclaration *declaration_;
         CYClassName *className_;
         CYCompound *compound_;
         CYDeclaration *declaration_;


@@ -270,7 +271,7 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <clause_> CaseClausesOpt
 %type <catch_> CatchOpt
 %type <statement_> CategoryStatement
 %type <clause_> CaseClausesOpt
 %type <catch_> CatchOpt
 %type <statement_> CategoryStatement

-%type <expression_> ClassExpression
+%type <class_> ClassDefinition

 %type <message_> ClassMessageDeclaration
 %type <message_> ClassMessageDeclarationListOpt
 %type <className_> ClassName
 %type <message_> ClassMessageDeclaration
 %type <message_> ClassMessageDeclarationListOpt
 %type <className_> ClassName


@@ -1251,7 +1252,7 @@ ClassNameOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-ClassExpression
+ClassDefinition

     : "@class" ClassNameOpt ClassSuperOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new CYClass($2, $3, $4, $5); }
     ;
 
     : "@class" ClassNameOpt ClassSuperOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new CYClass($2, $3, $4, $5); }
     ;
 


@@ -1259,12 +1260,13 @@ CategoryStatement
     : "@class" ClassName ClassMessageDeclarationListOpt "@end" { $$ = new CYCategory($2, $3); }
     ;
 
     : "@class" ClassName ClassMessageDeclarationListOpt "@end" { $$ = new CYCategory($2, $3); }
     ;
 

-PrimaryExpression_
-    : ClassExpression { $$ = $1; }
+PrimaryExpression
+    : ClassDefinition { $$ = $1; }

     ;
 
 Statement
     ;
 
 Statement

-    : CategoryStatement
+    : ClassDefinition { $$ = $1; }
+    | CategoryStatement { $$ = $1; }

     ;
 
 VariadicCall
     ;
 
 VariadicCall

diff --git a/Library.mm b/Library.mm
index 89ed137b34913cfdb6c472c5bd2fcc663eff4ef8..e292511a067cac5d381f86d9d7f291c9a0032f5f 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -96,6 +96,115 @@
     } \
 }
 
     } \
 }
 

+void CYThrow(JSContextRef context, JSValueRef value);
+
+/* JavaScript Properties {{{ */
+JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
+    JSValueRef exception(NULL);
+    JSValueRef value(JSObjectGetPropertyAtIndex(context, object, index, &exception));
+    CYThrow(context, exception);
+    return value;
+}
+
+JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, JSStringRef name) {
+    JSValueRef exception(NULL);
+    JSValueRef value(JSObjectGetProperty(context, object, name, &exception));
+    CYThrow(context, exception);
+    return value;
+}
+
+void CYSetProperty(JSContextRef context, JSObjectRef object, size_t index, JSValueRef value) {
+    JSValueRef exception(NULL);
+    JSObjectSetPropertyAtIndex(context, object, index, value, &exception);
+    CYThrow(context, exception);
+}
+
+void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value) {
+    JSValueRef exception(NULL);
+    JSObjectSetProperty(context, object, name, value, kJSPropertyAttributeNone, &exception);
+    CYThrow(context, exception);
+}
+/* }}} */
+/* JavaScript Strings {{{ */
+JSStringRef CYCopyJSString(id value) {
+    // XXX: this definition scares me; is anyone using this?!
+    return value == NULL ? NULL : JSStringCreateWithCFString(reinterpret_cast<CFStringRef>([value description]));
+}
+
+JSStringRef CYCopyJSString(const char *value) {
+    return value == NULL ? NULL : JSStringCreateWithUTF8CString(value);
+}
+
+JSStringRef CYCopyJSString(JSStringRef value) {
+    return value == NULL ? NULL : JSStringRetain(value);
+}
+
+JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) {
+    if (JSValueIsNull(context, value))
+        return NULL;
+    JSValueRef exception(NULL);
+    JSStringRef string(JSValueToStringCopy(context, value, &exception));
+    CYThrow(context, exception);
+    return string;
+}
+
+class CYJSString {
+  private:
+    JSStringRef string_;
+
+    void Clear_() {
+        if (string_ != NULL)
+            JSStringRelease(string_);
+    }
+
+  public:
+    CYJSString(const CYJSString &rhs) :
+        string_(CYCopyJSString(rhs.string_))
+    {
+    }
+
+    template <typename Arg0_>
+    CYJSString(Arg0_ arg0) :
+        string_(CYCopyJSString(arg0))
+    {
+    }
+
+    template <typename Arg0_, typename Arg1_>
+    CYJSString(Arg0_ arg0, Arg1_ arg1) :
+        string_(CYCopyJSString(arg0, arg1))
+    {
+    }
+
+    CYJSString &operator =(const CYJSString &rhs) {
+        Clear_();
+        string_ = CYCopyJSString(rhs.string_);
+        return *this;
+    }
+
+    ~CYJSString() {
+        Clear_();
+    }
+
+    void Clear() {
+        Clear_();
+        string_ = NULL;
+    }
+
+    operator JSStringRef() const {
+        return string_;
+    }
+};
+
+CFStringRef CYCopyCFString(JSStringRef value) {
+    return JSStringCopyCFString(kCFAllocatorDefault, value);
+}
+
+CFStringRef CYCopyCFString(JSContextRef context, JSValueRef value) {
+    return CYCopyCFString(CYJSString(context, value));
+}
+
+/* }}} */
+

 static JSGlobalContextRef Context_;
 static JSObjectRef System_;
 static JSObjectRef ObjectiveC_;
 static JSGlobalContextRef Context_;
 static JSObjectRef System_;
 static JSObjectRef ObjectiveC_;


@@ -104,8 +213,9 @@ static JSClassRef Functor_;
 static JSClassRef Instance_;
 static JSClassRef Internal_;
 static JSClassRef Message_;
 static JSClassRef Instance_;
 static JSClassRef Internal_;
 static JSClassRef Message_;

+static JSClassRef Messages_;
+static JSClassRef NSArrayPrototype_;

 static JSClassRef Pointer_;
 static JSClassRef Pointer_;

-static JSClassRef Prototype_;

 static JSClassRef Runtime_;
 static JSClassRef Selector_;
 static JSClassRef Struct_;
 static JSClassRef Runtime_;
 static JSClassRef Selector_;
 static JSClassRef Struct_;


@@ -118,6 +228,7 @@ static JSClassRef ObjectiveC_Protocols_;
 
 static JSObjectRef Array_;
 static JSObjectRef Function_;
 
 static JSObjectRef Array_;
 static JSObjectRef Function_;

+static JSObjectRef String_;

 
 static JSStringRef Result_;
 
 
 static JSStringRef Result_;
 


@@ -128,6 +239,9 @@ 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 Array_pop_;
 static JSObjectRef Array_push_;
 static JSObjectRef Array_prototype_;
 static JSObjectRef Array_pop_;
 static JSObjectRef Array_push_;


@@ -136,6 +250,7 @@ static JSObjectRef Array_splice_;
 static Class NSArray_;
 static Class NSCFBoolean_;
 static Class NSCFType_;
 static Class NSArray_;
 static Class NSCFBoolean_;
 static Class NSCFType_;

+static Class NSDictionary_;

 static Class NSMessageBuilder_;
 static Class NSZombie_;
 static Class Object_;
 static Class NSMessageBuilder_;
 static Class NSZombie_;
 static Class Object_;


@@ -186,6 +301,36 @@ struct Selector_privateData :
     virtual Type_privateData *GetType() const;
 };
 
     virtual Type_privateData *GetType() const;
 };
 

+// XXX: trick this out with associated objects!
+JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
+    if (self == nil)
+        return Instance_prototype_;
+
+    // XXX: I need to think through multi-context
+    typedef std::map<Class, JSValueRef> CacheMap;
+    static CacheMap cache_;
+
+    JSValueRef &value(cache_[self]);
+    if (value != NULL)
+        return value;
+
+    JSClassRef _class(NULL);
+    JSValueRef prototype;
+
+    if (self == NSArray_)
+        prototype = Array_prototype_;
+    else if (self == NSDictionary_)
+        prototype = Object_prototype_;
+    else
+        prototype = CYGetClassPrototype(context, class_getSuperclass(self));
+
+    JSObjectRef object(JSObjectMake(context, _class, NULL));
+    JSObjectSetPrototype(context, object, prototype);
+
+    value = object;
+    return object;
+}
+

 struct Instance :
     CYValue
 {
 struct Instance :
     CYValue
 {


@@ -211,12 +356,7 @@ struct Instance :
 
     static JSObjectRef Make(JSContextRef context, id object, Flags flags = None) {
         JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags)));
 
     static JSObjectRef Make(JSContextRef context, id object, Flags flags = None) {
         JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags)));

-        if (object != nil)
-            for (Class _class(object_getClass(object)); _class != nil; _class = class_getSuperclass(_class))
-                if (_class == NSArray_) {
-                    JSObjectSetPrototype(context, value, Array_prototype_);
-                    break;
-                }
+        JSObjectSetPrototype(context, value, CYGetClassPrototype(context, object == nil ? nil : object_getClass(object)));

         return value;
     }
 
         return value;
     }
 


@@ -231,20 +371,20 @@ struct Instance :
     virtual Type_privateData *GetType() const;
 };
 
     virtual Type_privateData *GetType() const;
 };
 

-struct Prototype :
+struct Messages :

     CYValue
 {
     CYValue
 {

-    Prototype(Class value) :
+    Messages(Class value) :

         CYValue(value)
     {
     }
 
     static JSObjectRef Make(JSContextRef context, Class _class, bool array = false) {
         CYValue(value)
     {
     }
 
     static JSObjectRef Make(JSContextRef context, Class _class, bool array = false) {

-        JSObjectRef value(JSObjectMake(context, Prototype_, new Prototype(_class)));
+        JSObjectRef value(JSObjectMake(context, Messages_, new Messages(_class)));

         if (_class == NSArray_)
             array = true;
         if (Class super = class_getSuperclass(_class))
         if (_class == NSArray_)
             array = true;
         if (Class super = class_getSuperclass(_class))

-            JSObjectSetPrototype(context, value, Prototype::Make(context, super, array));
+            JSObjectSetPrototype(context, value, Messages::Make(context, super, array));

         /*else if (array)
             JSObjectSetPrototype(context, value, Array_prototype_);*/
         return value;
         /*else if (array)
             JSObjectSetPrototype(context, value, Array_prototype_);*/
         return value;


@@ -727,98 +867,11 @@ struct PropertyAttributes {
 
 };
 
 
 };
 

-@implementation NSProxy (Cycript)
-
-- (NSObject *) cy$toJSON:(NSString *)key {
-    return [self description];
-}
-
-- (NSString *) cy$toCYON {
-    return [[self cy$toJSON:@""] cy$toCYON];
-}
-
-@end
-
-@implementation NSObject (Cycript)
-
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context {
-    return CYMakeInstance(context, self, false);
-}
-
-- (JSType) cy$JSType {
-    return kJSTypeObject;
-}
-
-- (NSObject *) cy$toJSON:(NSString *)key {
-    return [self description];
-}
-
-- (NSString *) cy$toCYON {
-    return [[self cy$toJSON:@""] cy$toCYON];
-}
-
-- (NSString *) cy$toKey {
-    return [self cy$toCYON];
-}
-
-- (bool) cy$hasProperty:(NSString *)name {
-    return false;
-}
-
-- (NSObject *) cy$getProperty:(NSString *)name {
-    return nil;
-}
-
-- (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
-    return false;
-}
-
-- (bool) cy$deleteProperty:(NSString *)name {
-    return false;
-}
-
-@end
-

 NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
     return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease];
 }
 
 NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
     return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease];
 }
 

-@implementation WebUndefined (Cycript)
-
-- (JSType) cy$JSType {
-    return kJSTypeUndefined;
-}
-
-- (NSObject *) cy$toJSON:(NSString *)key {
-    return self;
-}
-
-- (NSString *) cy$toCYON {
-    return @"undefined";
-}
-
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context {
-    return CYJSUndefined(context);
-}
-
-@end
-
-@implementation NSNull (Cycript)
-
-- (JSType) cy$JSType {
-    return kJSTypeNull;
-}
-
-- (NSObject *) cy$toJSON:(NSString *)key {
-    return self;
-}
-
-- (NSString *) cy$toCYON {
-    return @"null";
-}
-
-@end
-
+/* Bridge: NSArray {{{ */

 @implementation NSArray (Cycript)
 
 - (NSString *) cy$toCYON {
 @implementation NSArray (Cycript)
 
 - (NSString *) cy$toCYON {


@@ -866,7 +919,41 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 
 @end
 }
 
 @end

+/* }}} */
+/* Bridge: NSDictionary {{{ */
+@implementation NSDictionary (Cycript)
+
+- (NSString *) cy$toCYON {
+    NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
+    [json appendString:@"{"];
+
+    bool comma(false);
+    for (id key in self) {
+        if (comma)
+            [json appendString:@","];
+        else
+            comma = true;
+        [json appendString:[key cy$toKey]];
+        [json appendString:@":"];
+        NSObject *object([self objectForKey:key]);
+        [json appendString:CYPoolNSCYON(NULL, object)];
+    }

 
 

+    [json appendString:@"}"];
+    return json;
+}
+
+- (bool) cy$hasProperty:(NSString *)name {
+    return [self objectForKey:name] != nil;
+}
+
+- (NSObject *) cy$getProperty:(NSString *)name {
+    return [self objectForKey:name];
+}
+
+@end
+/* }}} */
+/* Bridge: NSMutableArray {{{ */

 @implementation NSMutableArray (Cycript)
 
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
 @implementation NSMutableArray (Cycript)
 
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {


@@ -903,51 +990,20 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
         [self addObject:object];
     }
 
         [self addObject:object];
     }
 

-    return true;
-}
-
-- (bool) cy$deleteProperty:(NSString *)name {
-    size_t index(CYGetIndex(NULL, name));
-    if (index == _not(size_t) || index >= [self count])
-        return [super cy$deleteProperty:name];
-    [self replaceObjectAtIndex:index withObject:[WebUndefined undefined]];
-    return true;
-}
-
-@end
-
-@implementation NSDictionary (Cycript)
-
-- (NSString *) cy$toCYON {
-    NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
-    [json appendString:@"{"];
-
-    bool comma(false);
-    for (id key in self) {
-        if (comma)
-            [json appendString:@","];
-        else
-            comma = true;
-        [json appendString:[key cy$toKey]];
-        [json appendString:@":"];
-        NSObject *object([self objectForKey:key]);
-        [json appendString:CYPoolNSCYON(NULL, object)];
-    }
-
-    [json appendString:@"}"];
-    return json;
-}
-
-- (bool) cy$hasProperty:(NSString *)name {
-    return [self objectForKey:name] != nil;
+    return true;

 }
 
 }
 

-- (NSObject *) cy$getProperty:(NSString *)name {
-    return [self objectForKey:name];
+- (bool) cy$deleteProperty:(NSString *)name {
+    size_t index(CYGetIndex(NULL, name));
+    if (index == _not(size_t) || index >= [self count])
+        return [super cy$deleteProperty:name];
+    [self replaceObjectAtIndex:index withObject:[WebUndefined undefined]];
+    return true;

 }
 
 @end
 }
 
 @end

-
+/* }}} */
+/* Bridge: NSMutableDictionary {{{ */

 @implementation NSMutableDictionary (Cycript)
 
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
 @implementation NSMutableDictionary (Cycript)
 
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {


@@ -965,7 +1021,8 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 
 @end
 }
 
 @end

-
+/* }}} */
+/* Bridge: NSNumber {{{ */

 @implementation NSNumber (Cycript)
 
 - (JSType) cy$JSType {
 @implementation NSNumber (Cycript)
 
 - (JSType) cy$JSType {


@@ -986,7 +1043,79 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 
 @end
 }
 
 @end

+/* }}} */
+/* Bridge: NSNull {{{ */
+@implementation NSNull (Cycript)
+
+- (JSType) cy$JSType {
+    return kJSTypeNull;
+}
+
+- (NSObject *) cy$toJSON:(NSString *)key {
+    return self;
+}
+
+- (NSString *) cy$toCYON {
+    return @"null";
+}
+
+@end
+/* }}} */
+/* Bridge: NSObject {{{ */
+@implementation NSObject (Cycript)
+
+- (JSValueRef) cy$JSValueInContext:(JSContextRef)context {
+    return CYMakeInstance(context, self, false);
+}
+
+- (JSType) cy$JSType {
+    return kJSTypeObject;
+}
+
+- (NSObject *) cy$toJSON:(NSString *)key {
+    return [self description];
+}
+
+- (NSString *) cy$toCYON {
+    return [[self cy$toJSON:@""] cy$toCYON];
+}
+
+- (NSString *) cy$toKey {
+    return [self cy$toCYON];
+}
+
+- (bool) cy$hasProperty:(NSString *)name {
+    return false;
+}
+
+- (NSObject *) cy$getProperty:(NSString *)name {
+    return nil;
+}
+
+- (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
+    return false;
+}
+
+- (bool) cy$deleteProperty:(NSString *)name {
+    return false;
+}
+
+@end
+/* }}} */
+/* Bridge: NSProxy {{{ */
+@implementation NSProxy (Cycript)
+
+- (NSObject *) cy$toJSON:(NSString *)key {
+    return [self description];
+}
+
+- (NSString *) cy$toCYON {
+    return [[self cy$toJSON:@""] cy$toCYON];
+}

 
 

+@end
+/* }}} */
+/* Bridge: NSString {{{ */

 @implementation NSString (Cycript)
 
 - (JSType) cy$JSType {
 @implementation NSString (Cycript)
 
 - (JSType) cy$JSType {


@@ -1044,6 +1173,28 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 
 @end
 }
 
 @end

+/* }}} */
+/* Bridge: WebUndefined {{{ */
+@implementation WebUndefined (Cycript)
+
+- (JSType) cy$JSType {
+    return kJSTypeUndefined;
+}
+
+- (NSObject *) cy$toJSON:(NSString *)key {
+    return self;
+}
+
+- (NSString *) cy$toCYON {
+    return @"undefined";
+}
+
+- (JSValueRef) cy$JSValueInContext:(JSContextRef)context {
+    return CYJSUndefined(context);
+}
+
+@end
+/* }}} */

 
 @interface CYJSObject : NSMutableDictionary {
     JSObjectRef object_;
 
 @interface CYJSObject : NSMutableDictionary {
     JSObjectRef object_;


@@ -1092,8 +1243,6 @@ CYRange WordEndRange_  (0x3ff001000000000LLU, 0x7fffffe87fffffeLLU); // A-Za-z_$
         return NULL; \
     }
 
         return NULL; \
     }
 

-void CYThrow(JSContextRef context, JSValueRef value);
-

 apr_status_t CYPoolRelease_(void *data) {
     id object(reinterpret_cast<id>(data));
     [object release];
 apr_status_t CYPoolRelease_(void *data) {
     id object(reinterpret_cast<id>(data));
     [object release];


@@ -1132,82 +1281,6 @@ id CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
     }
 }
 
     }
 }
 

-JSStringRef CYCopyJSString(id value) {
-    return value == NULL ? NULL : JSStringCreateWithCFString(reinterpret_cast<CFStringRef>([value description]));
-}
-
-JSStringRef CYCopyJSString(const char *value) {
-    return value == NULL ? NULL : JSStringCreateWithUTF8CString(value);
-}
-
-JSStringRef CYCopyJSString(JSStringRef value) {
-    return value == NULL ? NULL : JSStringRetain(value);
-}
-
-JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) {
-    if (JSValueIsNull(context, value))
-        return NULL;
-    JSValueRef exception(NULL);
-    JSStringRef string(JSValueToStringCopy(context, value, &exception));
-    CYThrow(context, exception);
-    return string;
-}
-
-class CYJSString {
-  private:
-    JSStringRef string_;
-
-    void Clear_() {
-        if (string_ != NULL)
-            JSStringRelease(string_);
-    }
-
-  public:
-    CYJSString(const CYJSString &rhs) :
-        string_(CYCopyJSString(rhs.string_))
-    {
-    }
-
-    template <typename Arg0_>
-    CYJSString(Arg0_ arg0) :
-        string_(CYCopyJSString(arg0))
-    {
-    }
-
-    template <typename Arg0_, typename Arg1_>
-    CYJSString(Arg0_ arg0, Arg1_ arg1) :
-        string_(CYCopyJSString(arg0, arg1))
-    {
-    }
-
-    CYJSString &operator =(const CYJSString &rhs) {
-        Clear_();
-        string_ = CYCopyJSString(rhs.string_);
-        return *this;
-    }
-
-    ~CYJSString() {
-        Clear_();
-    }
-
-    void Clear() {
-        Clear_();
-        string_ = NULL;
-    }
-
-    operator JSStringRef() const {
-        return string_;
-    }
-};
-
-CFStringRef CYCopyCFString(JSStringRef value) {
-    return JSStringCopyCFString(kCFAllocatorDefault, value);
-}
-
-CFStringRef CYCopyCFString(JSContextRef context, JSValueRef value) {
-    return CYCopyCFString(CYJSString(context, value));
-}
-

 double CYCastDouble(const char *value, size_t size) {
     char *end;
     double number(strtod(value, &end));
 double CYCastDouble(const char *value, size_t size) {
     char *end;
     double number(strtod(value, &end));


@@ -1351,32 +1424,6 @@ JSObjectRef CYCastJSObject(JSContextRef context, JSValueRef value) {
     return object;
 }
 
     return object;
 }
 

-JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetPropertyAtIndex(context, object, index, &exception));
-    CYThrow(context, exception);
-    return value;
-}
-
-JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, JSStringRef name) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetProperty(context, object, name, &exception));
-    CYThrow(context, exception);
-    return value;
-}
-
-void CYSetProperty(JSContextRef context, JSObjectRef object, size_t index, JSValueRef value) {
-    JSValueRef exception(NULL);
-    JSObjectSetPropertyAtIndex(context, object, index, value, &exception);
-    CYThrow(context, exception);
-}
-
-void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value) {
-    JSValueRef exception(NULL);
-    JSObjectSetProperty(context, object, name, value, kJSPropertyAttributeNone, &exception);
-    CYThrow(context, exception);
-}
-

 void CYThrow(JSContextRef context, id error, JSValueRef *exception) {
     if (exception == NULL)
         throw error;
 void CYThrow(JSContextRef context, id error, JSValueRef *exception) {
     if (exception == NULL)
         throw error;


@@ -1418,12 +1465,11 @@ bool CYIsCallable(JSContextRef context, JSValueRef value) {
 
 - (NSString *) cy$toCYON {
     JSValueRef toCYON(CYGetProperty(context_, object_, toCYON_));
 
 - (NSString *) cy$toCYON {
     JSValueRef toCYON(CYGetProperty(context_, object_, toCYON_));

-    if (!CYIsCallable(context_, toCYON))
+    if (!CYIsCallable(context_, toCYON)) super:

         return [super cy$toCYON];
         return [super cy$toCYON];

-    else {
-        JSValueRef value(CYCallAsFunction(context_, (JSObjectRef) toCYON, object_, 0, NULL));
+    else if (JSValueRef value = CYCallAsFunction(context_, (JSObjectRef) toCYON, object_, 0, NULL))

         return CYCastNSString(NULL, CYJSString(context_, value));
         return CYCastNSString(NULL, CYJSString(context_, value));

-    }
+    else goto super;

 }
 
 - (NSUInteger) count {
 }
 
 - (NSUInteger) count {


@@ -1990,8 +2036,8 @@ static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *typ
     return reinterpret_cast<IMP>(internal->GetValue());
 }
 
     return reinterpret_cast<IMP>(internal->GetValue());
 }
 

-static bool Prototype_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
-    Prototype *internal(reinterpret_cast<Prototype *>(JSObjectGetPrivate(object)));
+static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
+    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

     Class _class(internal->GetValue());
 
     CYPool pool;
     Class _class(internal->GetValue());
 
     CYPool pool;


@@ -2004,8 +2050,8 @@ static bool Prototype_hasProperty(JSContextRef context, JSObjectRef object, JSSt
     return false;
 }
 
     return false;
 }
 

-static JSValueRef Prototype_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
-    Prototype *internal(reinterpret_cast<Prototype *>(JSObjectGetPrivate(object)));
+static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

     Class _class(internal->GetValue());
 
     CYPool pool;
     Class _class(internal->GetValue());
 
     CYPool pool;


@@ -2018,8 +2064,8 @@ static JSValueRef Prototype_getProperty(JSContextRef context, JSObjectRef object
     return NULL;
 }
 
     return NULL;
 }
 

-static bool Prototype_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) {
-    Prototype *internal(reinterpret_cast<Prototype *>(JSObjectGetPrivate(object)));
+static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) {
+    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

     Class _class(internal->GetValue());
 
     CYPool pool;
     Class _class(internal->GetValue());
 
     CYPool pool;


@@ -2050,8 +2096,8 @@ static bool Prototype_setProperty(JSContextRef context, JSObjectRef object, JSSt
 }
 
 #if !__OBJC2__
 }
 
 #if !__OBJC2__

-static bool Prototype_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
-    Prototype *internal(reinterpret_cast<Prototype *>(JSObjectGetPrivate(object)));
+static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

     Class _class(internal->GetValue());
 
     CYPool pool;
     Class _class(internal->GetValue());
 
     CYPool pool;


@@ -2068,8 +2114,8 @@ static bool Prototype_deleteProperty(JSContextRef context, JSObjectRef object, J
 }
 #endif
 
 }
 #endif
 

-static void Prototype_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-    Prototype *internal(reinterpret_cast<Prototype *>(JSObjectGetPrivate(object)));
+static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
+    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

     Class _class(internal->GetValue());
 
     unsigned int size;
     Class _class(internal->GetValue());
 
     unsigned int size;


@@ -2093,13 +2139,16 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr
         if (internal->HasProperty(context, property))
             return true;
 
         if (internal->HasProperty(context, property))
             return true;
 

+    Class _class(object_getClass(self));
+

     CYPoolTry {
     CYPoolTry {

-        if ([self cy$hasProperty:name])
-            return true;
+        // XXX: this is an evil hack to deal with NSProxy; fix elsewhere
+        if (CYImplements(self, _class, @selector(cy$hasProperty:), false))
+            if ([self cy$hasProperty:name])
+                return true;

     } CYPoolCatch(false)
 
     const char *string(CYPoolCString(pool, name));
     } CYPoolCatch(false)
 
     const char *string(CYPoolCString(pool, name));

-    Class _class(object_getClass(self));

 
     if (class_getProperty(_class, string) != NULL)
         return true;
 
     if (class_getProperty(_class, string) != NULL)
         return true;


@@ -2243,6 +2292,28 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef
     } CYCatch
 }
 
     } CYCatch
 }
 

+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());
+    if (!CYIsClass(_class))
+        return false;
+
+    if (JSValueIsObjectOfClass(context, instance, Instance_)) {
+        Instance *linternal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) instance)));
+        // XXX: this isn't always safe
+        CYTry {
+            return [linternal->GetValue() isKindOfClass:_class];
+        } CYCatch
+    }
+
+    return false;
+}
+

 static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     CYPool pool;
 static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     CYPool pool;


@@ -2750,6 +2821,9 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
     return CYSendMessage(pool, context, self, _cmd, count - 2, arguments + 2, uninitialized, exception);
 }
 
     return CYSendMessage(pool, context, self, _cmd, count - 2, arguments + 2, uninitialized, exception);
 }
 

+/* Hook: objc_registerClassPair {{{ */
+// XXX: replace this with associated objects
+

 MSHook(void, CYDealloc, id self, SEL sel) {
     CYInternal *internal;
     object_getInstanceVariable(self, "cy$internal_", reinterpret_cast<void **>(&internal));
 MSHook(void, CYDealloc, id self, SEL sel) {
     CYInternal *internal;
     object_getInstanceVariable(self, "cy$internal_", reinterpret_cast<void **>(&internal));


@@ -2778,6 +2852,7 @@ static JSValueRef objc_registerClassPair_(JSContextRef context, JSObjectRef obje
         return CYJSUndefined(context);
     } CYCatch
 }
         return CYJSUndefined(context);
     } CYCatch
 }

+/* }}} */

 
 static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     JSValueRef setup[count + 2];
 
 static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     JSValueRef setup[count + 2];


@@ -2942,16 +3017,28 @@ static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjec
     return Instance::Make(context, object_getClass(internal->GetValue()));
 }
 
     return Instance::Make(context, object_getClass(internal->GetValue()));
 }
 

-static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+static JSValueRef Instance_getProperty_protocol(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+    Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
+    id self(internal->GetValue());
+    if (!CYIsClass(self))
+        return CYJSUndefined(context);
+    CYTry {
+        return CYGetClassPrototype(context, self);
+    } CYCatch
+}
+
+static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());

-    // XXX: this is a lame object_isClass

     if (class_getInstanceMethod(object_getClass(self), @selector(alloc)) == NULL)
         return CYJSUndefined(context);
     if (class_getInstanceMethod(object_getClass(self), @selector(alloc)) == NULL)
         return CYJSUndefined(context);

-    return Prototype::Make(context, self);
+    return Messages::Make(context, self);

 }
 
 static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
 }
 
 static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {

+    if (!JSValueIsObjectOfClass(context, _this, Instance_))
+        return NULL;
+

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {


@@ -2962,17 +3049,24 @@ static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectR
 }
 
 static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
 }
 
 static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {

+    if (!JSValueIsObjectOfClass(context, _this, Instance_))
+        return NULL;
+

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {
         CYPoolTry {
             NSString *key(count == 0 ? nil : CYCastNSString(NULL, CYJSString(context, arguments[0])));
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {
         CYPoolTry {
             NSString *key(count == 0 ? nil : CYCastNSString(NULL, CYJSString(context, arguments[0])));

+            // XXX: check for support of cy$toJSON?

             return CYCastJSValue(context, CYJSString([internal->GetValue() cy$toJSON:key]));
         } CYPoolCatch(NULL)
     } CYCatch
 }
 
 static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
             return CYCastJSValue(context, CYJSString([internal->GetValue() cy$toJSON:key]));
         } CYPoolCatch(NULL)
     } CYCatch
 }
 
 static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {

+    if (!JSValueIsObjectOfClass(context, _this, Instance_))
+        return NULL;
+

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {


@@ -3074,9 +3168,10 @@ static JSStaticFunction Functor_staticFunctions[4] = {
     {NULL, NULL, 0}
 };
 
     {NULL, NULL, 0}
 };
 

-static JSStaticValue Instance_staticValues[4] = {
+static JSStaticValue Instance_staticValues[5] = {

     {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

-    {"prototype", &Instance_getProperty_prototype, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"prototype", &Instance_getProperty_protocol, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, NULL, 0}
 };
     {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, NULL, 0}
 };


@@ -3300,6 +3395,7 @@ MSInitialize { _pooled
     NSArray_ = objc_getClass("NSArray");
     NSCFBoolean_ = objc_getClass("NSCFBoolean");
     NSCFType_ = objc_getClass("NSCFType");
     NSArray_ = objc_getClass("NSArray");
     NSCFBoolean_ = objc_getClass("NSCFBoolean");
     NSCFType_ = objc_getClass("NSCFType");

+    NSDictionary_ = objc_getClass("NSDictonary");

     NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
     NSZombie_ = objc_getClass("_NSZombie_");
     Object_ = objc_getClass("Object");
     NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
     NSZombie_ = objc_getClass("_NSZombie_");
     Object_ = objc_getClass("Object");


@@ -3326,6 +3422,7 @@ JSGlobalContextRef CYGetJSContext() {
         definition.deleteProperty = &Instance_deleteProperty;
         definition.getPropertyNames = &Instance_getPropertyNames;
         definition.callAsConstructor = &Instance_callAsConstructor;
         definition.deleteProperty = &Instance_deleteProperty;
         definition.getPropertyNames = &Instance_getPropertyNames;
         definition.callAsConstructor = &Instance_callAsConstructor;

+        definition.hasInstance = &Instance_hasInstance;

         definition.finalize = &Finalize;
         Instance_ = JSClassCreate(&definition);
 
         definition.finalize = &Finalize;
         Instance_ = JSClassCreate(&definition);
 


@@ -3346,6 +3443,27 @@ JSGlobalContextRef CYGetJSContext() {
         definition.finalize = &Finalize;
         Message_ = JSClassCreate(&definition);
 
         definition.finalize = &Finalize;
         Message_ = JSClassCreate(&definition);
 

+        definition = kJSClassDefinitionEmpty;
+        definition.className = "Messages";
+        definition.hasProperty = &Messages_hasProperty;
+        definition.getProperty = &Messages_getProperty;
+        definition.setProperty = &Messages_setProperty;
+#if !__OBJC2__
+        definition.deleteProperty = &Messages_deleteProperty;
+#endif
+        definition.getPropertyNames = &Messages_getPropertyNames;
+        definition.finalize = &Finalize;
+        Messages_ = JSClassCreate(&definition);
+
+        definition = kJSClassDefinitionEmpty;
+        definition.className = "NSArrayPrototype";
+        //definition.hasProperty = &NSArrayPrototype_hasProperty;
+        //definition.getProperty = &NSArrayPrototype_getProperty;
+        //definition.setProperty = &NSArrayPrototype_setProperty;
+        //definition.deleteProperty = &NSArrayPrototype_deleteProperty;
+        //definition.getPropertyNames = &NSArrayPrototype_getPropertyNames;
+        NSArrayPrototype_ = JSClassCreate(&definition);
+

         definition = kJSClassDefinitionEmpty;
         definition.className = "Pointer";
         definition.staticValues = Pointer_staticValues;
         definition = kJSClassDefinitionEmpty;
         definition.className = "Pointer";
         definition.staticValues = Pointer_staticValues;


@@ -3355,18 +3473,6 @@ JSGlobalContextRef CYGetJSContext() {
         definition.finalize = &Finalize;
         Pointer_ = JSClassCreate(&definition);
 
         definition.finalize = &Finalize;
         Pointer_ = JSClassCreate(&definition);
 

-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Prototype";
-        definition.hasProperty = &Prototype_hasProperty;
-        definition.getProperty = &Prototype_getProperty;
-        definition.setProperty = &Prototype_setProperty;
-#if !__OBJC2__
-        definition.deleteProperty = &Prototype_deleteProperty;
-#endif
-        definition.getPropertyNames = &Prototype_getPropertyNames;
-        definition.finalize = &Finalize;
-        Prototype_ = JSClassCreate(&definition);
-

         definition = kJSClassDefinitionEmpty;
         definition.className = "Selector";
         definition.staticValues = CYValue_staticValues;
         definition = kJSClassDefinitionEmpty;
         definition.className = "Selector";
         definition.staticValues = CYValue_staticValues;


@@ -3442,6 +3548,7 @@ JSGlobalContextRef CYGetJSContext() {
 
         Array_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Array")));
         Function_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Function")));
 
         Array_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Array")));
         Function_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Function")));

+        String_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String")));

 
         length_ = JSStringCreateWithUTF8CString("length");
         message_ = JSStringCreateWithUTF8CString("message");
 
         length_ = JSStringCreateWithUTF8CString("length");
         message_ = JSStringCreateWithUTF8CString("message");


@@ -3450,22 +3557,28 @@ JSGlobalContextRef CYGetJSContext() {
         toCYON_ = JSStringCreateWithUTF8CString("toCYON");
         toJSON_ = JSStringCreateWithUTF8CString("toJSON");
 
         toCYON_ = JSStringCreateWithUTF8CString("toCYON");
         toJSON_ = JSStringCreateWithUTF8CString("toJSON");
 

+        JSObjectRef Object(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Object"))));
+        Object_prototype_ = CYCastJSObject(context, CYGetProperty(context, Object, prototype_));
+

         Array_prototype_ = CYCastJSObject(context, CYGetProperty(context, Array_, prototype_));
         Array_pop_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("pop")));
         Array_push_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("push")));
         Array_splice_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("splice")));
 
         JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
         Array_prototype_ = CYCastJSObject(context, CYGetProperty(context, Array_, prototype_));
         Array_pop_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("pop")));
         Array_push_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("push")));
         Array_splice_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("splice")));
 
         JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));

+        JSObjectRef Instance(JSObjectMakeConstructor(context, Instance_, &Instance_new));

         JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL));
         JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
 
         JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL));
         JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
 

+        Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_);
+

         JSValueRef function(CYGetProperty(context, Function_, prototype_));
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), function);
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Functor, prototype_), function);
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), function);
 
         CYSetProperty(context, global, CYJSString("Functor"), Functor);
         JSValueRef function(CYGetProperty(context, Function_, prototype_));
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), function);
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Functor, prototype_), function);
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), function);
 
         CYSetProperty(context, global, CYJSString("Functor"), Functor);

-        CYSetProperty(context, global, CYJSString("Instance"), JSObjectMakeConstructor(context, Instance_, &Instance_new));
+        CYSetProperty(context, global, CYJSString("Instance"), Instance);

         CYSetProperty(context, global, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new));
         CYSetProperty(context, global, CYJSString("Selector"), Selector);
         CYSetProperty(context, global, CYJSString("Type"), JSObjectMakeConstructor(context, Type_, &Type_new));
         CYSetProperty(context, global, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new));
         CYSetProperty(context, global, CYJSString("Selector"), Selector);
         CYSetProperty(context, global, CYJSString("Type"), JSObjectMakeConstructor(context, Type_, &Type_new));

diff --git a/Output.cpp b/Output.cpp
index 3fc3355417ddfda231625f47f25f541d893be8ec..3774a6ab87947e7c2a5807c0ca85a44f171dc486 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -123,6 +123,11 @@ void CYCategory::Output(std::ostream &out) const {
     out << ");";
 }
 
     out << ");";
 }
 

+void CYClass::Output(std::ostream &out) const {
+    Output(out, CYNoBF);
+    out << ";";
+}
+

 void CYClass::Output(std::ostream &out, CYFlags flags) const {
     // XXX: I don't necc. need the ()s
     out << "(function($cys,$cyp,$cyc,$cyn,$cyt,$cym){";
 void CYClass::Output(std::ostream &out, CYFlags flags) const {
     // XXX: I don't necc. need the ()s
     out << "(function($cys,$cyp,$cyc,$cyn,$cyt,$cym){";


@@ -267,7 +272,7 @@ void CYEmpty::Output(std::ostream &out, bool block) const {
 }
 
 void CYExpress::Output(std::ostream &out) const {
 }
 
 void CYExpress::Output(std::ostream &out) const {

-    expression_->Output(out, CYNoFunction | CYNoBrace);
+    expression_->Output(out, CYNoBF);

     out << ';';
 }
 
     out << ';';
 }
 

diff --git a/Parser.hpp b/Parser.hpp
index 2e872a9d0bc36d7e832003b3a7fa4e46dbb2c194..caddafca634d92c116b111db3c00a5b9fa12fd36 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -233,6 +233,7 @@ enum CYFlags {
     CYNoTrailer =  (1 << 3),
     CYNoIn =       (1 << 4),
     CYNoHyphen =   (1 << 5),
     CYNoTrailer =  (1 << 3),
     CYNoIn =       (1 << 4),
     CYNoHyphen =   (1 << 5),

+    CYNoBF =       (CYNoBrace | CYNoFunction),

 };
 
 struct CYExpression :
 };
 
 struct CYExpression :


@@ -703,7 +704,8 @@ struct CYMessage :
 };
 
 struct CYClass :
 };
 
 struct CYClass :

-    CYExpression
+    CYExpression,
+    CYStatement

 {
     CYClassName *name_;
     CYExpression *super_;
 {
     CYClassName *name_;
     CYExpression *super_;


@@ -720,6 +722,7 @@ struct CYClass :
 
     CYPrecedence(0)
 
 
     CYPrecedence(0)
 

+    virtual void Output(std::ostream &out) const;

     virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
     virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 

diff --git a/todo.txt b/todo.txt
index e8c3584ca0177301720f54792f3eebba8ef8abca..f84adc8481db4bef8853b91e8ff94e5da3cba99d 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -4,3 +4,4 @@ unicode identifier support (native and \u)
 object literal compilation should use numerify strings
 support unions (right now 0-1 fields parsed as struct)
 \\\n escapes in strings aren't handled in the console
 object literal compilation should use numerify strings
 support unions (right now 0-1 fields parsed as struct)
 \\\n escapes in strings aren't handled in the console

+look into what String is, and whether to bridge it