X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/efd689d86ad25be72d38cf012d90ffe0203850d1..4d3ff0620d59450567fc334325ce99e3ebc89563:/ObjectiveC/Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index 0f3cc38..16927ac 100644
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -22,10 +22,10 @@
 #ifndef CYCRIPT_OBJECTIVEC_SYNTAX_HPP
 #define CYCRIPT_OBJECTIVEC_SYNTAX_HPP
 
-#include "Parser.hpp"
+#include "../Syntax.hpp"
 
 struct CYInstanceLiteral :
-    CYExpression
+    CYTarget
 {
     CYNumber *number_;
 
@@ -36,12 +36,12 @@ struct CYInstanceLiteral :
 
     CYPrecedence(1)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYObjCBlock :
-    CYExpression
+    CYTarget
 {
     CYTypedIdentifier *typed_;
     CYTypedParameter *parameters_;
@@ -56,12 +56,12 @@ struct CYObjCBlock :
 
     CYPrecedence(1)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYBox :
-    CYExpression
+    CYTarget
 {
     CYExpression *value_;
 
@@ -72,7 +72,7 @@ struct CYBox :
 
     CYPrecedence(1)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -97,26 +97,26 @@ struct CYSelectorPart :
 struct CYSelector :
     CYLiteral
 {
-    CYSelectorPart *name_;
+    CYSelectorPart *parts_;
 
-    CYSelector(CYSelectorPart *name) :
-        name_(name)
+    CYSelector(CYSelectorPart *parts) :
+        parts_(parts)
     {
     }
 
     CYPrecedence(1)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYClassField :
-    CYNext<CYClassField>
+struct CYImplementationField :
+    CYNext<CYImplementationField>
 {
     CYTypedIdentifier *typed_;
 
-    CYClassField(CYTypedIdentifier *typed, CYClassField *next = NULL) :
-        CYNext<CYClassField>(next),
+    CYImplementationField(CYTypedIdentifier *typed, CYImplementationField *next = NULL) :
+        CYNext<CYImplementationField>(next),
         typed_(typed)
     {
     }
@@ -128,11 +128,11 @@ struct CYClassField :
 struct CYMessageParameter :
     CYNext<CYMessageParameter>
 {
-    CYWord *tag_;
+    CYWord *name_;
     CYTypedIdentifier *type_;
 
-    CYMessageParameter(CYWord *tag, CYTypedIdentifier *type) :
-        tag_(tag),
+    CYMessageParameter(CYWord *name, CYTypedIdentifier *type) :
+        name_(name),
         type_(type)
     {
     }
@@ -151,16 +151,16 @@ struct CYMessage :
     CYMessageParameter *parameters_;
     CYBlock code_;
 
-    CYMessage(bool instance, CYTypedIdentifier *type, CYMessageParameter *parameter, CYStatement *code) :
+    CYMessage(bool instance, CYTypedIdentifier *type, CYMessageParameter *parameters, CYStatement *code) :
         instance_(instance),
         type_(type),
-        parameters_(parameter),
+        parameters_(parameters),
         code_(code)
     {
     }
 
     CYStatement *Replace(CYContext &context, bool replace) const;
-    void Output(CYOutput &out, bool replace) const;
+    void Output(CYOutput &out) const;
 
     CYExpression *TypeSignature(CYContext &context) const;
 };
@@ -181,53 +181,24 @@ struct CYProtocol :
     void Output(CYOutput &out) const;
 };
 
-struct CYClass {
-    CYClassName *name_;
-    CYExpression *super_;
+struct CYImplementation :
+    CYStatement
+{
+    CYIdentifier *name_;
+    CYExpression *extends_;
     CYProtocol *protocols_;
-    CYClassField *fields_;
+    CYImplementationField *fields_;
     CYMessage *messages_;
 
-    CYClass(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYClassField *fields, CYMessage *messages) :
+    CYImplementation(CYIdentifier *name, CYExpression *extends, CYProtocol *protocols, CYImplementationField *fields, CYMessage *messages) :
         name_(name),
-        super_(super),
+        extends_(extends),
         protocols_(protocols),
         fields_(fields),
         messages_(messages)
     {
     }
 
-    virtual ~CYClass() {
-    }
-
-    CYExpression *Replace_(CYContext &context);
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYClassExpression :
-    CYClass,
-    CYExpression
-{
-    CYClassExpression(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYClassField *fields, CYMessage *messages) :
-        CYClass(name, super, protocols, fields, messages)
-    {
-    }
-
-    CYPrecedence(0)
-
-    virtual CYExpression *Replace(CYContext &context);
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYClassStatement :
-    CYClass,
-    CYStatement
-{
-    CYClassStatement(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYClassField *fields, CYMessage *messages) :
-        CYClass(name, super, protocols, fields, messages)
-    {
-    }
-
     CYCompact(None)
 
     virtual CYStatement *Replace(CYContext &context);
@@ -237,10 +208,10 @@ struct CYClassStatement :
 struct CYCategory :
     CYStatement
 {
-    CYClassName *name_;
+    CYIdentifier *name_;
     CYMessage *messages_;
 
-    CYCategory(CYClassName *name, CYMessage *messages) :
+    CYCategory(CYIdentifier *name, CYMessage *messages) :
         name_(name),
         messages_(messages)
     {
@@ -253,7 +224,7 @@ struct CYCategory :
 };
 
 struct CYSend :
-    CYExpression
+    CYTarget
 {
     CYArgument *arguments_;
 
@@ -278,7 +249,7 @@ struct CYSendDirect :
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -290,7 +261,7 @@ struct CYSendSuper :
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };