Print function scopes with indents.

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/object.h"
 #include "vm/os.h"
 #include "vm/parser.h"
@@ skipping 392 matching lines @@
 
 
 void AstPrinter::PrintNode(AstNode* node) {
   ASSERT(node != NULL);
   AstPrinter ast_printer;
   node->Visit(&ast_printer);
   OS::Print("\n");
 }
 
 
+static void IndentN(int count) {
+  for (int i = 0; i < count; i++) {
+    OS::Print(" ");
+  }
+}
+
+
 void AstPrinter::PrintLocalScopeVariable(const LocalScope* scope,
-                                         LocalVariable* var) {
+                                         LocalVariable* var,
+                                         int indent) {
   ASSERT(scope != NULL);
   ASSERT(var != NULL);
+  IndentN(indent);
   OS::Print("(%s%s '%s'",
             var->is_final() ? "final " : "",
             String::Handle(var->type().Name()).ToCString(),
             var->name().ToCString());
   if (var->owner() != scope) {
     OS::Print(" alias");
   }
   if (var->HasIndex()) {
     OS::Print(" @%d", var->index());
     if (var->is_captured()) {
       OS::Print(" ctx %d", var->owner()->context_level());
     }
   } else if (var->owner()->function_level() != 0) {
     OS::Print(" lev %d", var->owner()->function_level());
   }
-  OS::Print(" valid %" Pd "-%" Pd ")",
+  OS::Print(" valid %" Pd "-%" Pd ")\n",
             var->token_pos(),
             scope->end_token_pos());
 }
 
 
 void AstPrinter::PrintLocalScope(const LocalScope* scope,
-                                 int start_index) {
+                                 int start_index,
+                                 int indent) {
   ASSERT(scope != NULL);
   for (int i = start_index; i < scope->num_variables(); i++) {
     LocalVariable* var = scope->VariableAt(i);
-    PrintLocalScopeVariable(scope, var);
+    PrintLocalScopeVariable(scope, var, indent);
   }
   const LocalScope* child = scope->child();
   while (child != NULL) {
+    IndentN(indent);
     OS::Print("{scope %p ", child);
     if (child->HasContextLevel()) {
       OS::Print("ctx %d numctxvar %d ",
                 child->context_level(),
                 child->num_context_variables());
     }
-    OS::Print("llev %d ", child->loop_level());
-    PrintLocalScope(child, 0);
-    OS::Print("}");
+    OS::Print("llev %d\n", child->loop_level());
+    PrintLocalScope(child, 0, indent + kScopeIndent);
+    IndentN(indent);
+    OS::Print("}\n");
     child = child->sibling();
   }
 }
 
 
 void AstPrinter::PrintFunctionScope(const ParsedFunction& parsed_function) {
   HANDLESCOPE(Isolate::Current());
   const Function& function = parsed_function.function();
   const Array& default_parameter_values =
       parsed_function.default_parameter_values();
   SequenceNode* node_sequence = parsed_function.node_sequence();
   ASSERT(node_sequence != NULL);
   const LocalScope* scope = node_sequence->scope();
   ASSERT(scope != NULL);
   const char* function_name = function.ToFullyQualifiedCString();
-  OS::Print("Scope for function '%s' {scope %p ", function_name, scope);
+  OS::Print("Scope for function '%s'\n{scope %p ", function_name, scope);
   if (scope->HasContextLevel()) {
     OS::Print("ctx %d numctxvar %d ",
               scope->context_level(),
               scope->num_context_variables());
   }
-  OS::Print("llev %d ", scope->loop_level());
+  OS::Print("llev %d\n", scope->loop_level());
   const int num_fixed_params = function.num_fixed_parameters();
   const int num_params = num_fixed_params + function.NumOptionalParameters();
   // Parameters must be listed first and must all appear in the top scope.
   ASSERT(num_params <= scope->num_variables());
   int pos = 0;  // Current position of variable in scope.
+  int indent = kScopeIndent;
   while (pos < num_params) {
     LocalVariable* param = scope->VariableAt(pos);
     ASSERT(param->owner() == scope);  // No aliases should precede parameters.
+    IndentN(indent);
     OS::Print("(param %s%s '%s'",
               param->is_final() ? "final " : "",
               String::Handle(param->type().Name()).ToCString(),
               param->name().ToCString());
     // Print the default value if the parameter is optional.
     if (pos >= num_fixed_params && pos < num_params) {
       const Object& default_parameter_value = Object::Handle(
           default_parameter_values.At(pos - num_fixed_params));
       OS::Print(" =%s", default_parameter_value.ToCString());
     }
     if (param->HasIndex()) {
       OS::Print(" @%d", param->index());
       if (param->is_captured()) {
         OS::Print(" ctx %d", param->owner()->context_level());
       }
     }
-    OS::Print(" valid %" Pd "-%" Pd ")",
+    OS::Print(" valid %" Pd "-%" Pd ")\n",
               param->token_pos(),
               scope->end_token_pos());
     pos++;
   }
   // Visit remaining non-parameter variables and children scopes.
-  PrintLocalScope(scope, pos);
+  PrintLocalScope(scope, pos, indent);
   OS::Print("}\n");
 }
 
 
 void AstPrinter::PrintFunctionNodes(const ParsedFunction& parsed_function) {
   HANDLESCOPE(Isolate::Current());
   SequenceNode* node_sequence = parsed_function.node_sequence();
   ASSERT(node_sequence != NULL);
   AstPrinter ast_printer;
   const char* function_name =
       parsed_function.function().ToFullyQualifiedCString();
   OS::Print("Ast for function '%s' {\n", function_name);
   node_sequence->Visit(&ast_printer);
   OS::Print("}\n");
 }
 
 }  // namespace dart