Rename CYForEachIn to CYForOf to better match ECMA6.

diff --git a/Cycript.yy.in b/Cycript.yy.in
index 9943a9d2459edc94bbaeaca5090d044e83241c2d..410730af0d411330e40caf52a4c43fd8b7ade770 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -358,7 +358,6 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> Declaration_
 %type <statement_> Declaration
 %type <clause_> DefaultClause
 %type <statement_> Declaration_
 %type <statement_> Declaration
 %type <clause_> DefaultClause

-%type <statement_> DoWhileStatement

 %type <expression_> Element
 %type <expression_> ElementOpt
 %type <element_> ElementList
 %type <expression_> Element
 %type <expression_> ElementOpt
 %type <element_> ElementList


@@ -372,9 +371,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> ExpressionStatement
 %type <finally_> FinallyOpt
 %type <comprehension_> ForComprehension
 %type <statement_> ExpressionStatement
 %type <finally_> FinallyOpt
 %type <comprehension_> ForComprehension

-%type <statement_> ForStatement

 %type <for_> ForStatementInitialiser
 %type <for_> ForStatementInitialiser

-%type <statement_> ForInStatement

 %type <forin_> ForInStatementInitialiser
 %type <declaration_> FormalParameter
 %type <functionParameter_> FormalParameterList_
 %type <forin_> ForInStatementInitialiser
 %type <declaration_> FormalParameter
 %type <functionParameter_> FormalParameterList_


@@ -441,7 +438,6 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <declarations_> VariableDeclarationList_
 %type <declarations_> VariableDeclarationList
 %type <statement_> VariableStatement
 %type <declarations_> VariableDeclarationList_
 %type <declarations_> VariableDeclarationList
 %type <statement_> VariableStatement

-%type <statement_> WhileStatement

 %type <statement_> WithStatement
 
 @begin ObjectiveC
 %type <statement_> WithStatement
 
 @begin ObjectiveC


@@ -1098,26 +1094,18 @@ IfStatement
     ;
 /* }}} */
 
     ;
 /* }}} */
 

-/* 12.6 Iteration Statements {{{ */
-IterationStatement
-    : DoWhileStatement { $$ = $1; }
-    | WhileStatement { $$ = $1; }
-    | ForStatement { $$ = $1; }
-    | ForInStatement { $$ = $1; }
-    ;
-/* }}} */

 /* 12.6.1 The do-while Statement {{{ */
 /* 12.6.1 The do-while Statement {{{ */

-DoWhileStatement
+IterationStatement

     : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = CYNew CYDoWhile($5, $2); }
     ;
 /* }}} */
 /* 12.6.2 The while Statement {{{ */
     : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = CYNew CYDoWhile($5, $2); }
     ;
 /* }}} */
 /* 12.6.2 The while Statement {{{ */

-WhileStatement
+IterationStatement

     : "while" "(" Expression ")" Statement { $$ = CYNew CYWhile($3, $5); }
     ;
 /* }}} */
 /* 12.6.3 The for Statement {{{ */
     : "while" "(" Expression ")" Statement { $$ = CYNew CYWhile($3, $5); }
     ;
 /* }}} */
 /* 12.6.3 The for Statement {{{ */

-ForStatement
+IterationStatement

     : "for" "(" LexPushInOn ForStatementInitialiser LexPopIn ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $7, $9, $11); }
     ;
 
     : "for" "(" LexPushInOn ForStatementInitialiser LexPopIn ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $7, $9, $11); }
     ;
 


@@ -1127,9 +1115,9 @@ ForStatementInitialiser
     ;
 /* }}} */
 /* 12.6.4 The for-in and for-of Statements {{{ */
     ;
 /* }}} */
 /* 12.6.4 The for-in and for-of Statements {{{ */

-ForInStatement
+IterationStatement

     : "for" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForIn($4, $7, $9); }
     : "for" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForIn($4, $7, $9); }

-    | "for" "(" LexPushInOn ForInStatementInitialiser LexPopIn "of" Expression ")" Statement { $$ = CYNew CYForEachIn($4, $7, $9); }
+    | "for" "(" LexPushInOn ForInStatementInitialiser LexPopIn "of" Expression ")" Statement { $$ = CYNew CYForOf($4, $7, $9); }

     ;
 
 ForInStatementInitialiser
     ;
 
 ForInStatementInitialiser


@@ -1665,7 +1653,7 @@ IfComprehension
 
 ForComprehension
     : "for" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForInComprehension($4, $7); }
 
 ForComprehension
     : "for" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForInComprehension($4, $7); }

-    | "for" "each" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForEachInComprehension($5, $8); }
+    | "for" "each" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForOfComprehension($5, $8); }

     ;
 
 ComprehensionList
     ;
 
 ComprehensionList


@@ -1683,8 +1671,8 @@ PrimaryExpression
     ;
 /* }}} */
 /* JavaScript 1.7: for each {{{ */
     ;
 /* }}} */
 /* JavaScript 1.7: for each {{{ */

-ForInStatement
-    : "for" "each" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForEachIn($5, $8, $10); }
+IterationStatement
+    : "for" "each" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForOf($5, $8, $10); }

     ;
 /* }}} */
 /* JavaScript 1.7: let Statements {{{ */
     ;
 /* }}} */
 /* JavaScript 1.7: let Statements {{{ */

diff --git a/Output.cpp b/Output.cpp
index 752d8a9ed6f250897c0b3070e254fefc8397ac51..53d5bfe14aa04c70326d2e22f033297e0905e81d 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -356,14 +356,14 @@ void CYFor::Output(CYOutput &out, CYFlags flags) const {
     code_->Single(out, CYRight(flags));
 }
 
     code_->Single(out, CYRight(flags));
 }
 

-void CYForEachIn::Output(CYOutput &out, CYFlags flags) const {
+void CYForOf::Output(CYOutput &out, CYFlags flags) const {

     out << "for" << ' ' << "each" << ' ' << '(';
     initialiser_->ForIn(out, CYNoIn);
     out << "in" << *set_ << ')';
     code_->Single(out, CYRight(flags));
 }
 
     out << "for" << ' ' << "each" << ' ' << '(';
     initialiser_->ForIn(out, CYNoIn);
     out << "in" << *set_ << ')';
     code_->Single(out, CYRight(flags));
 }
 

-void CYForEachInComprehension::Output(CYOutput &out) const {
+void CYForOfComprehension::Output(CYOutput &out) const {

     out << "for" << ' ' << "each" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')' << next_;
 }
 
     out << "for" << ' ' << "each" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')' << next_;
 }
 

diff --git a/Parser.hpp b/Parser.hpp
index 9364826d9e51e24c52775c0ca45c1d4f0f91f082..47a60c04ece3ddaf26e13631ea07028714c7138c 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -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)

diff --git a/Replace.cpp b/Replace.cpp
index d4037f85a227a3b5c519a264be6e568f76bf3087..9040f1af1976359fd4d90c1fd2e739db07a8de5e 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -360,7 +360,7 @@ CYStatement *CYForInComprehension::Replace(CYContext &context, CYStatement *stat
     return $ CYForIn($V(name_), set_, CYComprehension::Replace(context, statement));
 }
 
     return $ CYForIn($V(name_), set_, CYComprehension::Replace(context, statement));
 }
 

-CYStatement *CYForEachIn::Replace(CYContext &context) {
+CYStatement *CYForOf::Replace(CYContext &context) {

     if (CYAssignment *assignment = initialiser_->Assignment(context))
         return $ CYBlock($$->*
             $E(assignment)->*
     if (CYAssignment *assignment = initialiser_->Assignment(context))
         return $ CYBlock($$->*
             $E(assignment)->*


@@ -377,11 +377,11 @@ CYStatement *CYForEachIn::Replace(CYContext &context) {
     );
 }
 
     );
 }
 

-CYFunctionParameter *CYForEachInComprehension::Parameter(CYContext &context) const {
+CYFunctionParameter *CYForOfComprehension::Parameter(CYContext &context) const {

     return $ CYFunctionParameter($ CYDeclaration(name_));
 }
 
     return $ CYFunctionParameter($ CYDeclaration(name_));
 }
 

-CYStatement *CYForEachInComprehension::Replace(CYContext &context, CYStatement *statement) const {
+CYStatement *CYForOfComprehension::Replace(CYContext &context, CYStatement *statement) const {

     CYIdentifier *cys($I("cys"));
 
     return $E($C0($F(NULL, $P1($L("$cys")), $$->*
     CYIdentifier *cys($I("cys"));
 
     return $E($C0($F(NULL, $P1($L("$cys")), $$->*