[cleanup] Split ForOf and ForIn AST nodes apart as they share little

src/ast/prettyprinter.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/ast/prettyprinter.h"
 
 #include <stdarg.h>
 
 #include "src/ast/ast-value-factory.h"
 #include "src/ast/scopes.h"
@@ skipping 174 matching lines @@
 
 
 void CallPrinter::VisitForInStatement(ForInStatement* node) {
   Find(node->each());
   Find(node->enumerable());
   Find(node->body());
 }
 
 
 void CallPrinter::VisitForOfStatement(ForOfStatement* node) {
-  Find(node->each());
   Find(node->assign_iterator());
+  Find(node->next_result());
+  Find(node->result_done());
+  Find(node->assign_each());
   Find(node->body());
-  Find(node->next_result());
 }
 
 
 void CallPrinter::VisitTryCatchStatement(TryCatchStatement* node) {
   Find(node->try_block());
   Find(node->catch_block());
 }
 
 
 void CallPrinter::VisitTryFinallyStatement(TryFinallyStatement* node) {
@@ skipping 459 matching lines @@
   Print("for (");
   Visit(node->each());
   Print(" in ");
   Visit(node->enumerable());
   Print(") ");
   Visit(node->body());
 }
 
 
 void PrettyPrinter::VisitForOfStatement(ForOfStatement* node) {
+  // TODO(adamk): ForOf is largely desugared as part of parsing,
+  // so it's hard to display useful stuff here. Should likely
+  // either bite the bullet and display less or try harder
+  // to preserve more.
   PrintLabels(node->labels());
-  Print("for (");
-  Visit(node->each());
-  Print(" of ");
-  Visit(node->iterable());
+  // The <each> is embedded inside a do-expression by the time we get here.
+  Print("for (<each> of ");
+  if (node->assign_iterator()->IsAssignment() &&
+      node->assign_iterator()->AsAssignment()->value()->IsCall() &&
+      node->assign_iterator()
+          ->AsAssignment()
+          ->value()
+          ->AsCall()
+          ->expression()
+          ->IsProperty() &&
+      node->assign_iterator()
+          ->AsAssignment()
+          ->value()
+          ->AsCall()
+          ->expression()
+          ->IsProperty()) {
+    Visit(node->assign_iterator()
+              ->AsAssignment()
+              ->value()
+              ->AsCall()
+              ->expression()
+              ->AsProperty()
+              ->obj());
+  } else {
+    Print("<iterable>");
+  }
   Print(") ");
   Visit(node->body());
 }
 
 
 void PrettyPrinter::VisitTryCatchStatement(TryCatchStatement* node) {
   Print("try ");
   Visit(node->try_block());
   Print(" catch (");
   const bool quote = false;
@@ skipping 708 matching lines @@
   PrintIndentedVisit("FOR", node->each());
   PrintIndentedVisit("IN", node->enumerable());
   PrintIndentedVisit("BODY", node->body());
 }
 
 
 void AstPrinter::VisitForOfStatement(ForOfStatement* node) {
   IndentedScope indent(this, "FOR OF", node->position());
   PrintIndented("YIELD COUNT");
   Print(" %d\n", node->yield_count());
-  PrintIndentedVisit("FOR", node->each());
-  PrintIndentedVisit("OF", node->iterable());
-  PrintIndentedVisit("BODY", node->body());
   PrintIndentedVisit("INIT", node->assign_iterator());
   PrintIndentedVisit("NEXT", node->next_result());
+  PrintIndentedVisit("DONE", node->result_done());
   PrintIndentedVisit("EACH", node->assign_each());
-  PrintIndentedVisit("DONE", node->result_done());
+  PrintIndentedVisit("BODY", node->body());
 }
 
 
 void AstPrinter::VisitTryCatchStatement(TryCatchStatement* node) {
   IndentedScope indent(this, "TRY CATCH", node->position());
   PrintIndentedVisit("TRY", node->try_block());
   PrintLiteralWithModeIndented("CATCHVAR",
                                node->variable(),
                                node->variable()->name());
   PrintIndentedVisit("CATCH", node->catch_block());
@@ skipping 293 matching lines @@
 
 void AstPrinter::VisitRewritableExpression(RewritableExpression* node) {
   Visit(node->expression());
 }
 
 
 #endif  // DEBUG
 
 }  // namespace internal
 }  // namespace v8