Rename CYForEachIn to CYForOf to better match ECMA6.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index d809e770f5e54ee4e62d6cf5bb765f0da28ca44a..47a60c04ece3ddaf26e13631ea07028714c7138c 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -451,7 +451,7 @@ class CYDriver {
     void *scanner_;
 
     CYState state_;
     void *scanner_;
 
     CYState state_;

-    bool statement_;
+    bool nobrace_;

     std::stack<bool> in_;
 
     const char *data_;
     std::stack<bool> in_;
 
     const char *data_;


@@ -680,13 +680,13 @@ struct CYForInComprehension :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYForEachInComprehension :
+struct CYForOfComprehension :

     CYComprehension
 {
     CYIdentifier *name_;
     CYExpression *set_;
 
     CYComprehension
 {
     CYIdentifier *name_;
     CYExpression *set_;
 

-    CYForEachInComprehension(CYIdentifier *name, CYExpression *set) :
+    CYForOfComprehension(CYIdentifier *name, CYExpression *set) :

         name_(name),
         set_(set)
     {
         name_(name),
         set_(set)
     {


@@ -1268,14 +1268,14 @@ struct CYForIn :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYForEachIn :
+struct CYForOf :

     CYStatement
 {
     CYForInInitialiser *initialiser_;
     CYExpression *set_;
     CYStatement *code_;
 
     CYStatement
 {
     CYForInInitialiser *initialiser_;
     CYExpression *set_;
     CYStatement *code_;
 

-    CYForEachIn(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
+    CYForOf(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :

         initialiser_(initialiser),
         set_(set),
         code_(code)
         initialiser_(initialiser),
         set_(set),
         code_(code)