Drastically improve pretty printed code structure.

[cycript.git] / ObjectiveC / Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index 0777d24fd42e7cb9044eaddda9cb896da145e815..0f3cc38ca498484c019f7000a8443ade36642416 100644 (file)
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -1,5 +1,5 @@
 /* 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 {{{ */
@@ -45,12 +45,12 @@ struct CYObjCBlock :
 {
     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),
-        statements_(statements)
+        code_(code)
     {
     }
 
@@ -110,13 +110,13 @@ struct CYSelector :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYField :
-    CYNext<CYField>
+struct CYClassField :
+    CYNext<CYClassField>
 {
     CYTypedIdentifier *typed_;
 
-    CYField(CYTypedIdentifier *typed, CYField *next = NULL) :
-        CYNext<CYField>(next),
+    CYClassField(CYTypedIdentifier *typed, CYClassField *next = NULL) :
+        CYNext<CYClassField>(next),
         typed_(typed)
     {
     }
@@ -129,13 +129,11 @@ struct CYMessageParameter :
     CYNext<CYMessageParameter>
 {
     CYWord *tag_;
-    CYExpression *type_;
-    CYIdentifier *name_;
+    CYTypedIdentifier *type_;
 
-    CYMessageParameter(CYWord *tag, CYExpression *type, CYIdentifier *name) :
+    CYMessageParameter(CYWord *tag, CYTypedIdentifier *type) :
         tag_(tag),
-        type_(type),
-        name_(name)
+        type_(type)
     {
     }
 
@@ -149,15 +147,15 @@ struct CYMessage :
     CYNext<CYMessage>
 {
     bool instance_;
-    CYExpression *type_;
+    CYTypedIdentifier *type_;
     CYMessageParameter *parameters_;
     CYBlock code_;
 
-    CYMessage(bool instance, CYExpression *type, CYMessageParameter *parameter, CYStatement *statements) :
+    CYMessage(bool instance, CYTypedIdentifier *type, CYMessageParameter *parameter, CYStatement *code) :
         instance_(instance),
         type_(type),
         parameters_(parameter),
-        code_(statements)
+        code_(code)
     {
     }
 
@@ -187,10 +185,10 @@ struct CYClass {
     CYClassName *name_;
     CYExpression *super_;
     CYProtocol *protocols_;
-    CYField *fields_;
+    CYClassField *fields_;
     CYMessage *messages_;
 
-    CYClass(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
+    CYClass(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYClassField *fields, CYMessage *messages) :
         name_(name),
         super_(super),
         protocols_(protocols),
@@ -210,7 +208,7 @@ struct CYClassExpression :
     CYClass,
     CYExpression
 {
-    CYClassExpression(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
+    CYClassExpression(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYClassField *fields, CYMessage *messages) :
         CYClass(name, super, protocols, fields, messages)
     {
     }
@@ -225,11 +223,13 @@ struct CYClassStatement :
     CYClass,
     CYStatement
 {
-    CYClassStatement(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
+    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;
 };
@@ -246,6 +246,8 @@ struct CYCategory :
     {
     }
 
+    CYCompact(None)
+
     virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };