Verify lexer tokens are always default reductions.

[cycript.git] / ObjectiveC / Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index d7a74cd76195f6c78702c8c086f5c7b642d789c0..aa55a42bc16be489116f41c0abd58f7c58ad6797 100644 (file)
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -22,10 +22,10 @@
 #ifndef CYCRIPT_OBJECTIVEC_SYNTAX_HPP
 #define CYCRIPT_OBJECTIVEC_SYNTAX_HPP
 
 #ifndef CYCRIPT_OBJECTIVEC_SYNTAX_HPP
 #define CYCRIPT_OBJECTIVEC_SYNTAX_HPP
 

-#include "Parser.hpp"
+#include "../Syntax.hpp"

 
 struct CYInstanceLiteral :
 
 struct CYInstanceLiteral :

-    CYExpression
+    CYTarget

 {
     CYNumber *number_;
 
 {
     CYNumber *number_;
 


@@ -36,12 +36,12 @@ struct CYInstanceLiteral :
 
     CYPrecedence(1)
 
 
     CYPrecedence(1)
 

-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);

     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYObjCBlock :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYObjCBlock :

-    CYExpression
+    CYTarget

 {
     CYTypedIdentifier *typed_;
     CYTypedParameter *parameters_;
 {
     CYTypedIdentifier *typed_;
     CYTypedParameter *parameters_;


@@ -56,12 +56,12 @@ struct CYObjCBlock :
 
     CYPrecedence(1)
 
 
     CYPrecedence(1)
 

-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);

     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYBox :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYBox :

-    CYExpression
+    CYTarget

 {
     CYExpression *value_;
 
 {
     CYExpression *value_;
 


@@ -72,7 +72,7 @@ struct CYBox :
 
     CYPrecedence(1)
 
 
     CYPrecedence(1)
 

-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);

     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 


@@ -106,17 +106,17 @@ struct CYSelector :
 
     CYPrecedence(1)
 
 
     CYPrecedence(1)
 

-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);

     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYClassField :
-    CYNext<CYClassField>
+struct CYImplementationField :
+    CYNext<CYImplementationField>

 {
     CYTypedIdentifier *typed_;
 
 {
     CYTypedIdentifier *typed_;
 

-    CYClassField(CYTypedIdentifier *typed, CYClassField *next = NULL) :
-        CYNext<CYClassField>(next),
+    CYImplementationField(CYTypedIdentifier *typed, CYImplementationField *next = NULL) :
+        CYNext<CYImplementationField>(next),

         typed_(typed)
     {
     }
         typed_(typed)
     {
     }


@@ -160,7 +160,7 @@ struct CYMessage :
     }
 
     CYStatement *Replace(CYContext &context, bool replace) const;
     }
 
     CYStatement *Replace(CYContext &context, bool replace) const;

-    void Output(CYOutput &out, bool replace) const;
+    void Output(CYOutput &out) const;

 
     CYExpression *TypeSignature(CYContext &context) const;
 };
 
     CYExpression *TypeSignature(CYContext &context) const;
 };


@@ -181,16 +181,16 @@ struct CYProtocol :
     void Output(CYOutput &out) const;
 };
 
     void Output(CYOutput &out) const;
 };
 

-struct CYClassStatement :
+struct CYImplementation :

     CYStatement
 {
     CYStatement
 {

-    CYClassName *name_;
+    CYIdentifier *name_;

     CYExpression *super_;
     CYProtocol *protocols_;
     CYExpression *super_;
     CYProtocol *protocols_;

-    CYClassField *fields_;
+    CYImplementationField *fields_;

     CYMessage *messages_;
 
     CYMessage *messages_;
 

-    CYClassStatement(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),
         name_(name),
         super_(super),
         protocols_(protocols),


@@ -208,10 +208,10 @@ struct CYClassStatement :
 struct CYCategory :
     CYStatement
 {
 struct CYCategory :
     CYStatement
 {

-    CYClassName *name_;
+    CYIdentifier *name_;

     CYMessage *messages_;
 
     CYMessage *messages_;
 

-    CYCategory(CYClassName *name, CYMessage *messages) :
+    CYCategory(CYIdentifier *name, CYMessage *messages) :

         name_(name),
         messages_(messages)
     {
         name_(name),
         messages_(messages)
     {


@@ -224,7 +224,7 @@ struct CYCategory :
 };
 
 struct CYSend :
 };
 
 struct CYSend :

-    CYExpression
+    CYTarget

 {
     CYArgument *arguments_;
 
 {
     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;
 };
 
     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;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };