Improve --print-ast printing of LetNode.

runtime/vm/ast_printer.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/ast_printer.h"
 
 #include "vm/handles.h"
 #include "vm/log.h"
 #include "vm/object.h"
 #include "vm/os.h"
@@ skipping 26 matching lines @@
                    scope->end_token_pos().ToCString(), scope->loop_level());
     if (scope->HasContextLevel()) {
       logger_->Print(" context %d captures %d", scope->context_level(),
                      scope->num_context_variables());
     } else {
       ASSERT(scope->num_context_variables() == 0);
     }
   }
   logger_->Print(")");
   for (int i = 0; i < node->length(); ++i) {
-    logger_->Print("\n");
-    for (intptr_t p = 0; p < indent_; p++) {
-      logger_->Print("  ");
-    }
+    PrintNewlineAndIndent();
     node->NodeAt(i)->Visit(this);
   }
   logger_->Print(")");
   indent_--;
 }
 
 
 void AstPrinter::VisitCloneContextNode(CloneContextNode* node) {
   VisitGenericAstNode(node);
 }
@@ skipping 20 matching lines @@
       kind = "";
       UNREACHABLE();
   }
   logger_->Print("(%s %s", node->Name(), kind);
   node->VisitChildren(this);
   logger_->Print(")");
 }
 
 
 void AstPrinter::VisitGenericLocalNode(AstNode* node,
-                                       const LocalVariable& var) {
-  logger_->Print(
-      "(%s %s%s \"%s\"", node->Name(), var.is_final() ? "final " : "",
-      String::Handle(var.type().Name()).ToCString(), var.name().ToCString());
-  if (var.HasIndex()) {
-    if (var.is_captured()) {
-      logger_->Print(" (context %d %d)", var.owner()->context_level(),
-                     var.index());
-    } else {
-      logger_->Print(" (stack %d)", var.index());
-    }
-  }
+                                       const LocalVariable& variable) {
+  logger_->Print("(%s ", node->Name());
+  PrintLocalVariable(&variable);
   logger_->Print(" ");
   node->VisitChildren(this);
   logger_->Print(")");
 }
 
 
 void AstPrinter::VisitLoadLocalNode(LoadLocalNode* node) {
   VisitGenericLocalNode(node, node->local());
 }
 
@@ skipping 26 matching lines @@
 void AstPrinter::VisitLoadStaticFieldNode(LoadStaticFieldNode* node) {
   VisitGenericFieldNode(node, node->field());
 }
 
 
 void AstPrinter::VisitStoreStaticFieldNode(StoreStaticFieldNode* node) {
   VisitGenericFieldNode(node, node->field());
 }
 
 
+void AstPrinter::PrintLocalVariable(const LocalVariable* variable) {
+  logger_->Print("%s%s \"%s\"", variable->is_final() ? "final " : "",
+                 String::Handle(variable->type().Name()).ToCString(),
+                 variable->name().ToCString());
+  if (variable->HasIndex()) {
+    if (variable->is_captured()) {
+      logger_->Print(" (context %d %d)", variable->owner()->context_level(),
+                     variable->index());
+    } else {
+      logger_->Print(" (stack %d)", variable->index());
+    }
+  }
+}
+
+
+void AstPrinter::PrintNewlineAndIndent() {
+  logger_->Print("\n");
+  for (intptr_t p = 0; p < indent_; ++p) {
+    logger_->Print("  ");
+  }
+}
+
+
 void AstPrinter::VisitLetNode(LetNode* node) {
-  VisitGenericAstNode(node);
+  logger_->Print("(Let (");
+  // Indent the variables and initializers by two.
+  indent_ += 2;
+  for (intptr_t i = 0; i < node->num_temps(); ++i) {
+    if (i != 0) PrintNewlineAndIndent();
+    logger_->Print("(");
+    PrintLocalVariable(node->TempAt(i));
+    logger_->Print(" ");
+    node->InitializerAt(i)->Visit(this);
+    logger_->Print(")");
+  }
+  logger_->Print(")");
+
+  // Indent the body nodes by one.
+  --indent_;
+  for (intptr_t i = 0; i < node->nodes().length(); ++i) {
+    PrintNewlineAndIndent();
+    node->nodes()[i]->Visit(this);
+  }
+  logger_->Print(")");
+  --indent_;
 }
 
 
 void AstPrinter::VisitArrayNode(ArrayNode* node) {
   VisitGenericAstNode(node);
 }
 
 
 void AstPrinter::VisitStringInterpolateNode(StringInterpolateNode* node) {
   VisitGenericAstNode(node);
@@ skipping 373 matching lines @@
   const char* function_name =
       parsed_function.function().ToFullyQualifiedCString();
   logger_->Print("Ast for function '%s' {\n", function_name);
   node_sequence->Visit(this);
   logger_->Print("}\n");
 }
 
 }  // namespace dart
 
 #endif  // !defined(PRODUCT)