Disentangle AstNode::Name and AstNode::ShortName.

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"
 
 namespace dart {
 
 AstPrinter::AstPrinter() { }
 
 
 AstPrinter::~AstPrinter() { }
 
 
 void AstPrinter::VisitGenericAstNode(AstNode* node) {
-  OS::Print("(%s ", node->Name());
+  OS::Print("(%s ", node->PrettyName());
   node->VisitChildren(this);
   OS::Print(")");
 }
 
 
 void AstPrinter::VisitSequenceNode(SequenceNode* node_sequence) {
   // TODO(regis): Make the output more readable by indenting the nested
   // sequences. This could be achieved using a AstPrinterContext similar to the
   // CodeGeneratorContext.
   ASSERT(node_sequence != NULL);
@@ skipping 17 matching lines @@
 
 
 void AstPrinter::VisitReturnNode(ReturnNode* node) {
   VisitGenericAstNode(node);
 }
 
 
 void AstPrinter::VisitGenericLocalNode(AstNode* node,
                                        const LocalVariable& var) {
   OS::Print("(%s %s%s '%s'",
-            node->Name(),
+            node->PrettyName(),
             var.is_final() ? "final " : "",
             String::Handle(var.type().Name()).ToCString(),
             var.name().ToCString());
   if (var.HasIndex()) {
     OS::Print(" @%d", var.index());
     if (var.is_captured()) {
       OS::Print(" ctx %d", var.owner()->context_level());
     }
   }
   node->VisitChildren(this);
   OS::Print(")");
 }
 
 
 void AstPrinter::VisitLoadLocalNode(LoadLocalNode* node) {
   VisitGenericLocalNode(node, node->local());
 }
 
 
 void AstPrinter::VisitStoreLocalNode(StoreLocalNode* node) {
   VisitGenericLocalNode(node, node->local());
 }
 
 
 void AstPrinter::VisitGenericFieldNode(AstNode* node, const Field& field) {
   OS::Print("(%s %s%s '%s' ",
-            node->Name(),
+            node->PrettyName(),
             field.is_final() ? "final " : "",
             String::Handle(AbstractType::Handle(field.type()).Name()).
                 ToCString(),
             String::Handle(field.name()).ToCString());
   node->VisitChildren(this);
   OS::Print(")");
 }
 
 
 void AstPrinter::VisitLoadInstanceFieldNode(LoadInstanceFieldNode* node) {
@@ skipping 43 matching lines @@
   node->expr()->Visit(this);
   const AbstractType& type = node->type();
   const String& dst_name = node->dst_name();
   OS::Print(" to type '%s' of '%s')",
             String::Handle(type.Name()).ToCString(),
             dst_name.ToCString());
 }
 
 
 void AstPrinter::VisitPrimaryNode(PrimaryNode* node) {
-  OS::Print("***** PRIMARY NODE IN AST ***** (%s '%s')",
-      node->Name(), node->primary().ToCString());
+  OS::Print("***** PRIMARY NODE IN AST ***** (primary '%s')",
+            node->primary().ToCString());
 }
 
 
 void AstPrinter::VisitComparisonNode(ComparisonNode* node) {
   if (node->kind() == Token::kAS) {
     OS::Print("(as ");
     node->VisitChildren(this);
     OS::Print(")");
   } else {
     VisitGenericAstNode(node);
   }
 }
 
 
 void AstPrinter::VisitBinaryOpNode(BinaryOpNode* node) {
   VisitGenericAstNode(node);
 }
 
 
 void AstPrinter::VisitBinaryOpWithMask32Node(BinaryOpWithMask32Node* node) {
-  OS::Print("(%s ", node->Name());
+  OS::Print("(%s %s", node->PrettyName(), node->TokenName());
   node->VisitChildren(this);
   OS::Print(" & 0x%" Px64 "", node->mask32());
   OS::Print(")");
 }
 
 
 void AstPrinter::VisitUnaryOpNode(UnaryOpNode* node) {
   VisitGenericAstNode(node);
 }
 
@@ skipping 64 matching lines @@
 void AstPrinter::VisitDoWhileNode(DoWhileNode* node) {
   OS::Print("(do ");
   node->body()->Visit(this);
   OS::Print(" while ");
   node->condition()->Visit(this);
   OS::Print(")");
 }
 
 
 void AstPrinter::VisitJumpNode(JumpNode* node) {
-  OS::Print("(%s %s in scope %p)",
-            node->Name(),
+  OS::Print("(%s %s %s in scope %p)",
+            node->PrettyName(),
+            node->TokenName(),
             node->label()->name().ToCString(),
             node->label()->owner());
 }
 
 
 void AstPrinter::VisitInstanceCallNode(InstanceCallNode* node) {
-  OS::Print("(%s '%s'(", node->Name(), node->function_name().ToCString());
+  OS::Print("(%s '%s'(", node->PrettyName(), node->function_name().ToCString());
   node->VisitChildren(this);
   OS::Print("))");
 }
 
 
 void AstPrinter::VisitStaticCallNode(StaticCallNode* node) {
   const char* function_fullname = node->function().ToFullyQualifiedCString();
-  OS::Print("(%s '%s'(", node->Name(), function_fullname);
+  OS::Print("(%s '%s'(", node->PrettyName(), function_fullname);
   node->VisitChildren(this);
   OS::Print("))");
 }
 
 
 void AstPrinter::VisitClosureNode(ClosureNode* node) {
   const char* function_fullname = node->function().ToFullyQualifiedCString();
-  OS::Print("(%s '%s')", node->Name(), function_fullname);
+  OS::Print("(%s '%s')", node->PrettyName(), function_fullname);
 }
 
 
 void AstPrinter::VisitClosureCallNode(ClosureCallNode* node) {
   VisitGenericAstNode(node);
 }
 
 
 void AstPrinter::VisitConstructorCallNode(ConstructorCallNode* node) {
   const char* kind = node->constructor().IsFactory() ? "factory " : "";
   const char* constructor_name = node->constructor().ToFullyQualifiedCString();
-  OS::Print("(%s %s'%s' ((this)", node->Name(), kind, constructor_name);
+  OS::Print("(%s %s'%s' ((this)", node->PrettyName(), kind, constructor_name);
   node->VisitChildren(this);
   OS::Print("))");
 }
 
 
 void AstPrinter::VisitInstanceGetterNode(InstanceGetterNode* node) {
-  OS::Print("(%s 'get %s'(", node->Name(), node->field_name().ToCString());
+  OS::Print("(%s 'get %s'(",
+            node->PrettyName(),
+            node->field_name().ToCString());
   node->VisitChildren(this);
   OS::Print("))");
 }
 
 
 void AstPrinter::VisitInstanceSetterNode(InstanceSetterNode* node) {
-  OS::Print("(%s 'set %s'(", node->Name(), node->field_name().ToCString());
+  OS::Print("(%s 'set %s'(",
+            node->PrettyName(),
+            node->field_name().ToCString());
   node->VisitChildren(this);
   OS::Print("))");
 }
 
 
 void AstPrinter::VisitStaticGetterNode(StaticGetterNode* node) {
   String& class_name = String::Handle(node->cls().Name());
   OS::Print("(%s '%s.%s'(",
-            node->Name(),
+            node->PrettyName(),
             class_name.ToCString(),
             node->field_name().ToCString());
   OS::Print("))");
 }
 
 
 void AstPrinter::VisitStaticSetterNode(StaticSetterNode* node) {
   String& class_name = String::Handle(node->cls().Name());
   OS::Print("(%s '%s.%s'(",
-      node->Name(), class_name.ToCString(), node->field_name().ToCString());
+            node->PrettyName(),
+            class_name.ToCString(),
+            node->field_name().ToCString());
   node->VisitChildren(this);
   OS::Print("))");
 }
 
 
 void AstPrinter::VisitLoadIndexedNode(LoadIndexedNode* node) {
-  OS::Print("(%s%s ", node->Name(), node->IsSuperLoad() ? " super" : "");
+  OS::Print("(%s%s ", node->PrettyName(), node->IsSuperLoad() ? " super" : "");
   node->VisitChildren(this);
   OS::Print(")");
 }
 
 
 void AstPrinter::VisitStoreIndexedNode(StoreIndexedNode* node) {
-  OS::Print("(%s%s ", node->Name(), node->IsSuperStore() ? " super" : "");
+  OS::Print("(%s%s ", node->PrettyName(), node->IsSuperStore() ? " super" : "");
   node->VisitChildren(this);
   OS::Print(")");
 }
 
 
 void AstPrinter::VisitNativeBodyNode(NativeBodyNode* node) {
   OS::Print("(native_c call '%s'(%d args))",
             node->native_c_function_name().ToCString(),
             NativeArguments::ParameterCountForResolution(node->function()));
 }
@@ skipping 146 matching lines @@
   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