X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b0385401f63fe31f3cc1459ed159747a445852d6..20052ff75c224699725da0f8e096053009c62741:/ObjectiveC/Syntax.hpp diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp index 8beabb9..025612a 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 @@ -181,14 +181,16 @@ struct CYProtocol : void Output(CYOutput &out) const; }; -struct CYClass { +struct CYClassStatement : + CYStatement +{ CYClassName *name_; CYExpression *super_; CYProtocol *protocols_; CYClassField *fields_; CYMessage *messages_; - CYClass(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYClassField *fields, CYMessage *messages) : + CYClassStatement(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYClassField *fields, CYMessage *messages) : name_(name), super_(super), protocols_(protocols), @@ -197,36 +199,7 @@ 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); virtual void Output(CYOutput &out, CYFlags flags) const; @@ -244,6 +217,8 @@ struct CYCategory : { } + CYCompact(None) + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; };