Add String::toCYON, toString_s, and bridge NSString via String.prototype.

[cycript.git] / ObjectiveC / Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index f101858839721222a4071953d4d1ba566fb7d44b..d8f57ec88cc6810dc65e89673a009e24f5bda800 100644 (file)
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -49,7 +49,7 @@ struct CYSelectorPart :
     CYWord *name_;
     bool value_;
 
     CYWord *name_;
     bool value_;
 

-    CYSelectorPart(CYWord *name, bool value, CYSelectorPart *next) :
+    CYSelectorPart(CYWord *name, bool value, CYSelectorPart *next = NULL) :

         CYNext<CYSelectorPart>(next),
         name_(name),
         value_(value)
         CYNext<CYSelectorPart>(next),
         name_(name),
         value_(value)


@@ -122,20 +122,41 @@ struct CYMessage :
     void Output(CYOutput &out, bool replace) const;
 };
 
     void Output(CYOutput &out, bool replace) const;
 };
 

+struct CYProtocol :
+    CYNext<CYProtocol>,
+    CYThing
+{
+    CYExpression *name_;
+
+    CYProtocol(CYExpression *name, CYProtocol *next = NULL) :
+        CYNext<CYProtocol>(next),
+        name_(name)
+    {
+    }
+
+    CYStatement *Replace(CYContext &context) const;
+    void Output(CYOutput &out) const;
+};
+

 struct CYClass {
     CYClassName *name_;
     CYExpression *super_;
 struct CYClass {
     CYClassName *name_;
     CYExpression *super_;

+    CYProtocol *protocols_;

     CYField *fields_;
     CYMessage *messages_;
 
     CYField *fields_;
     CYMessage *messages_;
 

-    CYClass(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
+    CYClass(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :

         name_(name),
         super_(super),
         name_(name),
         super_(super),

+        protocols_(protocols),

         fields_(fields),
         messages_(messages)
     {
     }
 
         fields_(fields),
         messages_(messages)
     {
     }
 

+    virtual ~CYClass() {
+    }
+

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


@@ -144,8 +165,8 @@ struct CYClassExpression :
     CYClass,
     CYExpression
 {
     CYClass,
     CYExpression
 {

-    CYClassExpression(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, fields, messages)
+    CYClassExpression(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
+        CYClass(name, super, protocols, fields, messages)

     {
     }
 
     {
     }
 


@@ -159,8 +180,8 @@ struct CYClassStatement :
     CYClass,
     CYStatement
 {
     CYClass,
     CYStatement
 {

-    CYClassStatement(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, fields, messages)
+    CYClassStatement(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
+        CYClass(name, super, protocols, fields, messages)

     {
     }
 
     {
     }