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

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index 0f3cc38..5f6c726 100644
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -22,7 +22,7 @@
 #ifndef CYCRIPT_OBJECTIVEC_SYNTAX_HPP
 #define CYCRIPT_OBJECTIVEC_SYNTAX_HPP
 
-#include "Parser.hpp"
+#include "../Syntax.hpp"
 
 struct CYInstanceLiteral :
     CYExpression
@@ -110,13 +110,13 @@ struct CYSelector :
     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)
     {
     }
@@ -160,7 +160,7 @@ struct CYMessage :
     }
 
     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,14 +181,16 @@ struct CYProtocol :
     void Output(CYOutput &out) const;
 };
 
-struct CYClass {
-    CYClassName *name_;
+struct CYImplementation :
+    CYStatement
+{
+    CYIdentifier *name_;
     CYExpression *super_;
     CYProtocol *protocols_;
-    CYClassField *fields_;
+    CYImplementationField *fields_;
     CYMessage *messages_;
 
-    CYClass(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYClassField *fields, CYMessage *messages) :
+    CYImplementation(CYIdentifier *name, CYExpression *super, CYProtocol *protocols, CYImplementationField *fields, CYMessage *messages) :
         name_(name),
         super_(super),
         protocols_(protocols),
@@ -197,37 +199,6 @@ struct CYClass {
     {
     }
 
-    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)
     {