X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c15969fd0a6280c60d2f35876b5343004fed2b11..9a39f7051ad983d4377917e66222727dcbe6c099:/ObjectiveC/Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index 92e4363..618a25e 100644
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -24,112 +24,15 @@
 
 #include "Parser.hpp"
 
-struct CYTypeModifier :
-    CYNext<CYTypeModifier>
-{
-    CYTypeModifier(CYTypeModifier *next) :
-        CYNext<CYTypeModifier>(next)
-    {
-    }
-
-    virtual CYExpression *Replace(CYContext &context) = 0;
-};
-
-struct CYTypeArrayOf :
-    CYTypeModifier
-{
-    CYExpression *size_;
-
-    CYTypeArrayOf(CYExpression *size, CYTypeModifier *next = NULL) :
-        CYTypeModifier(next),
-        size_(size)
-    {
-    }
-
-    CYPrecedence(2)
-
-    virtual CYExpression *Replace(CYContext &context);
-};
-
-struct CYTypeConstant :
-    CYTypeModifier
-{
-    CYTypeConstant(CYTypeModifier *next = NULL) :
-        CYTypeModifier(next)
-    {
-    }
-
-    CYPrecedence(3)
-
-    virtual CYExpression *Replace(CYContext &context);
-};
-
-struct CYTypePointerTo :
-    CYTypeModifier
-{
-    CYTypePointerTo(CYTypeModifier *next = NULL) :
-        CYTypeModifier(next)
-    {
-    }
-
-    CYPrecedence(3)
-
-    virtual CYExpression *Replace(CYContext &context);
-};
-
-struct CYTypeVariable :
-    CYTypeModifier
-{
-    CYExpression *expression_;
-
-    CYTypeVariable(CYExpression *expression) :
-        CYTypeModifier(NULL),
-        expression_(expression)
-    {
-    }
-
-    CYPrecedence(1)
-
-    virtual CYExpression *Replace(CYContext &context);
-};
-
-struct CYTypedIdentifier :
-    CYNext<CYTypedIdentifier>
-{
-    CYIdentifier *identifier_;
-    CYTypeModifier *type_;
-
-    CYTypedIdentifier(CYIdentifier *identifier) :
-        identifier_(identifier),
-        type_(NULL)
-    {
-    }
-};
-
-struct CYTypedParameter :
-    CYNext<CYTypedParameter>
-{
-    CYTypedIdentifier *typed_;
-
-    CYTypedParameter(CYTypedIdentifier *typed, CYTypedParameter *next) :
-        CYNext<CYTypedParameter>(next),
-        typed_(typed)
-    {
-    }
-
-    CYFunctionParameter *Parameters(CYContext &context);
-    CYExpression *TypeSignature(CYContext &context, CYExpression *prefix);
-};
-
 struct CYObjCBlock :
     CYExpression
 {
-    CYTypeModifier *type_;
+    CYTypedIdentifier *typed_;
     CYTypedParameter *parameters_;
     CYStatement *statements_;
 
-    CYObjCBlock(CYTypeModifier *type, CYTypedParameter *parameters, CYStatement *statements) :
-        type_(type),
+    CYObjCBlock(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *statements) :
+        typed_(typed),
         parameters_(parameters),
         statements_(statements)
     {
@@ -141,22 +44,6 @@ struct CYObjCBlock :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYEncodedType :
-    CYExpression
-{
-    CYTypeModifier *type_;
-
-    CYEncodedType(CYTypeModifier *type) :
-        type_(type)
-    {
-    }
-
-    CYPrecedence(1)
-
-    virtual CYExpression *Replace(CYContext &context);
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
 struct CYBox :
     CYExpression
 {