Rename CYField to CYClassField, for CYStructField.

diff --git a/Cycript.yy.in b/Cycript.yy.in
index 0f45ef82b43d81b65575acd2db2581d65abef093..ae8330c94481b11ab620c14eae6e94eab4295a54 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -91,7 +91,7 @@ typedef struct {
 
 @begin ObjectiveC
         CYClassName *className_;
 
 @begin ObjectiveC
         CYClassName *className_;

-        CYField *field_;
+        CYClassField *classField_;

         CYMessage *message_;
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;
         CYMessage *message_;
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;


@@ -496,8 +496,8 @@ int cylex(YYSTYPE *, CYLocation *, void *);
 %type <expression_> BoxableExpression
 %type <statement_> CategoryStatement
 %type <expression_> ClassExpression
 %type <expression_> BoxableExpression
 %type <statement_> CategoryStatement
 %type <expression_> ClassExpression

-%type <field_> ClassFieldListOpt
-%type <field_> ClassFields
+%type <classField_> ClassFieldListOpt
+%type <classField_> ClassFields

 %type <statement_> ClassStatement
 %type <expression_> ClassSuperOpt
 %type <message_> ClassMessageDeclaration
 %type <statement_> ClassStatement
 %type <expression_> ClassSuperOpt
 %type <message_> ClassMessageDeclaration


@@ -1472,7 +1472,7 @@ ClassSuperOpt
     ;
 
 ClassFieldListOpt
     ;
 
 ClassFieldListOpt

-    : TypedIdentifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $3); }
+    : TypedIdentifier ";" ClassFieldListOpt { $$ = CYNew CYClassField($1, $3); }

     | LexSetRegExp { $$ = NULL; }
     ;
 
     | LexSetRegExp { $$ = NULL; }
     ;
 

diff --git a/ObjectiveC/Output.cpp b/ObjectiveC/Output.cpp
index b9a9b6b6cf671639e7b1ebb69919245387dfc419..ee41e48c89221a616a5e8572821971c0340b4b6e 100644 (file)
--- a/ObjectiveC/Output.cpp
+++ b/ObjectiveC/Output.cpp
@@ -74,7 +74,7 @@ void CYClassStatement::Output(CYOutput &out, CYFlags flags) const {
     CYClass::Output(out, flags);
 }
 
     CYClass::Output(out, flags);
 }
 

-void CYField::Output(CYOutput &out) const {
+void CYClassField::Output(CYOutput &out) const {

 }
 
 void CYInstanceLiteral::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYInstanceLiteral::Output(CYOutput &out, CYFlags flags) const {

diff --git a/ObjectiveC/Replace.cpp b/ObjectiveC/Replace.cpp
index 15361f2260a09dda14e565ef8425227632ad9d34..b7071f9b8e2cddc36c6c03897886fcc0af6df7dc 100644 (file)
--- a/ObjectiveC/Replace.cpp
+++ b/ObjectiveC/Replace.cpp
@@ -75,7 +75,7 @@ CYStatement *CYClassStatement::Replace(CYContext &context) {
     return $E(Replace_(context));
 }
 
     return $E(Replace_(context));
 }
 

-CYStatement *CYField::Replace(CYContext &context) const { $T(NULL)
+CYStatement *CYClassField::Replace(CYContext &context) const { $T(NULL)

     CYVariable *cyn($V("$cyn"));
     CYVariable *cyt($V("$cyt"));
 
     CYVariable *cyn($V("$cyn"));
     CYVariable *cyt($V("$cyt"));
 

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index 4cee64f87fa6b2641d20ed83be9dd6bcb7127a57..642aae4e298db6775b56242883fb5d43742372a0 100644 (file)
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -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)
     {
     }


@@ -185,10 +185,10 @@ struct CYClass {
     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) :
+    CYClass(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYClassField *fields, CYMessage *messages) :

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


@@ -208,7 +208,7 @@ struct CYClassExpression :
     CYClass,
     CYExpression
 {
     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)
     {
     }
         CYClass(name, super, protocols, fields, messages)
     {
     }


@@ -223,7 +223,7 @@ struct CYClassStatement :
     CYClass,
     CYStatement
 {
     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)
     {
     }
         CYClass(name, super, protocols, fields, messages)
     {
     }