The grammar and lexer should not share a filename.

[cycript.git] / ObjectiveC / Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index 5702171318c91d80bcb645e1a001f0ff58705549..025612aba1ab98218928bcf0715e6107ebf72fdc 100644 (file)
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -22,7 +22,7 @@
 #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 :
     CYExpression
 
 struct CYInstanceLiteral :
     CYExpression


@@ -45,12 +45,12 @@ struct CYObjCBlock :
 {
     CYTypedIdentifier *typed_;
     CYTypedParameter *parameters_;
 {
     CYTypedIdentifier *typed_;
     CYTypedParameter *parameters_;

-    CYStatement *statements_;
+    CYStatement *code_;

 
 

-    CYObjCBlock(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *statements) :
+    CYObjCBlock(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *code) :

         typed_(typed),
         parameters_(parameters),
         typed_(typed),
         parameters_(parameters),

-        statements_(statements)
+        code_(code)

     {
     }
 
     {
     }
 


@@ -110,13 +110,13 @@ struct CYSelector :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

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

 {
     CYTypedIdentifier *typed_;
 
 {
     CYTypedIdentifier *typed_;
 

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

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


@@ -130,12 +130,10 @@ struct CYMessageParameter :
 {
     CYWord *tag_;
     CYTypedIdentifier *type_;
 {
     CYWord *tag_;
     CYTypedIdentifier *type_;

-    CYIdentifier *name_;

 
 

-    CYMessageParameter(CYWord *tag, CYTypedIdentifier *type, CYIdentifier *name) :
+    CYMessageParameter(CYWord *tag, CYTypedIdentifier *type) :

         tag_(tag),
         tag_(tag),

-        type_(type),
-        name_(name)
+        type_(type)

     {
     }
 
     {
     }
 


@@ -153,11 +151,11 @@ struct CYMessage :
     CYMessageParameter *parameters_;
     CYBlock code_;
 
     CYMessageParameter *parameters_;
     CYBlock code_;
 

-    CYMessage(bool instance, CYTypedIdentifier *type, CYMessageParameter *parameter, CYStatement *statements) :
+    CYMessage(bool instance, CYTypedIdentifier *type, CYMessageParameter *parameter, CYStatement *code) :

         instance_(instance),
         type_(type),
         parameters_(parameter),
         instance_(instance),
         type_(type),
         parameters_(parameter),

-        code_(statements)
+        code_(code)

     {
     }
 
     {
     }
 


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

-struct CYClass {
+struct CYClassStatement :
+    CYStatement
+{

     CYClassName *name_;
     CYExpression *super_;
     CYProtocol *protocols_;
     CYClassName *name_;
     CYExpression *super_;
     CYProtocol *protocols_;

-    CYField *fields_;
+    CYClassField *fields_;

     CYMessage *messages_;
 
     CYMessage *messages_;
 

-    CYClass(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
+    CYClassStatement(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYClassField *fields, CYMessage *messages) :

         name_(name),
         super_(super),
         protocols_(protocols),
         name_(name),
         super_(super),
         protocols_(protocols),


@@ -199,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, CYField *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, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, protocols, fields, messages)
-    {
-    }
+    CYCompact(None)

 
     virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 
     virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;


@@ -246,6 +217,8 @@ struct CYCategory :
     {
     }
 
     {
     }
 

+    CYCompact(None)
+

     virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
     virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };