X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c5b15840ab1bb70218506531f9a73fe2d112b007..d3865d294299f1d5404b59f4482ebb116c8fcee0:/ObjectiveC/Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index 5f6c726..16927ac 100644
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -25,7 +25,7 @@
 #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,16 +97,16 @@ 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;
 };
 
@@ -128,11 +128,11 @@ struct CYImplementationField :
 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,10 +151,10 @@ 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)
     {
     }
@@ -185,14 +185,14 @@ struct CYImplementation :
     CYStatement
 {
     CYIdentifier *name_;
-    CYExpression *super_;
+    CYExpression *extends_;
     CYProtocol *protocols_;
     CYImplementationField *fields_;
     CYMessage *messages_;
 
-    CYImplementation(CYIdentifier *name, CYExpression *super, CYProtocol *protocols, CYImplementationField *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)
@@ -224,7 +224,7 @@ struct CYCategory :
 };
 
 struct CYSend :
-    CYExpression
+    CYTarget
 {
     CYArgument *arguments_;
 
@@ -249,7 +249,7 @@ struct CYSendDirect :
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -261,7 +261,7 @@ struct CYSendSuper :
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };