Disentangle AstNode::Name and AstNode::ShortName.

runtime/vm/ast.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.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/isolate.h"
 #include "vm/object_store.h"
 #include "vm/resolver.h"
 
 
 namespace dart {
 
 #define DEFINE_VISIT_FUNCTION(type, name)                                      \
   void type::Visit(AstNodeVisitor* visitor) {                                  \
     visitor->Visit##type(this);                                                \
   }
 NODE_LIST(DEFINE_VISIT_FUNCTION)
 #undef DEFINE_VISIT_FUNCTION
 
 
 #define DEFINE_NAME_FUNCTION(type, name)                                       \
-  const char* type::ShortName() const {                                        \
+  const char* type::PrettyName() const {                                       \
     return name;                                                               \
   }
 NODE_LIST(DEFINE_NAME_FUNCTION)
 #undef DEFINE_NAME_FUNCTION
 
 
 // A visitor class to collect all the nodes (including children) into an
 // array.
 class AstNodeCollector : public AstNodeVisitor {
  public:
@@ skipping 95 matching lines @@
       double new_value = (dbl.value() == 0.0) ? -0.0 : (0.0 - dbl.value());
       const Double& double_instance =
           Double::ZoneHandle(Double::NewCanonical(new_value));
       return new LiteralNode(this->token_pos(), double_instance);
     }
   }
   return NULL;
 }
 
 
-const char* TypeNode::Name() const {
+const char* TypeNode::TypeName() const {
   return String::Handle(type().UserVisibleName()).ToCString();
 }
 
 
 bool ComparisonNode::IsKindValid() const {
   return Token::IsRelationalOperator(kind_)
       || Token::IsEqualityOperator(kind_)
       || Token::IsTypeTestOperator(kind_)
       || Token::IsTypeCastOperator(kind_);
 }
 
 
-const char* ComparisonNode::Name() const {
+const char* ComparisonNode::TokenName() const {
   return Token::Str(kind_);
 }
 
 
 bool ComparisonNode::IsPotentiallyConst() const {
   switch (kind_) {
     case Token::kLT:
     case Token::kGT:
     case Token::kLTE:
     case Token::kGTE:
@@ skipping 68 matching lines @@
     case Token::kBIT_AND:
     case Token::kSHL:
     case Token::kSHR:
       return true;
     default:
       return false;
   }
 }
 
 
-const char* BinaryOpNode::Name() const {
+const char* BinaryOpNode::TokenName() const {
   return Token::Str(kind_);
 }
 
 
-const char* BinaryOpWithMask32Node::Name() const {
+const char* BinaryOpWithMask32Node::TokenName() const {
   return Token::Str(kind());
 }
 
 
 bool BinaryOpNode::IsPotentiallyConst() const {
   switch (kind_) {
     case Token::kADD:
     case Token::kSUB:
     case Token::kMUL:
     case Token::kDIV:
@@ skipping 140 matching lines @@
     return new StaticSetterNode(token_pos(),
                                 receiver(),
                                 Class::ZoneHandle(function().Owner()),
                                 String::ZoneHandle(function().name()),
                                 rhs);
   }
   return NULL;
 }
 
 
-const char* UnaryOpNode::Name() const {
+const char* UnaryOpNode::TokenName() const {
   return Token::Str(kind_);
 }
 
 
-const char* JumpNode::Name() const {
+const char* JumpNode::TokenName() const {
   return Token::Str(kind_);
 }
 
 
-const char* LoadLocalNode::Name() const {
-  return local().name().ToCString();
-}
-
-
 bool LoadLocalNode::IsPotentiallyConst() const {
   // Parameters of const constructors are implicitly final and can be
   // used in initializer expressions.
   // We can't check here whether the local variable is indeed a parameter,
   // but this code is executed before any other local variables are
   // added to the scope.
   return local().is_final();
 }
 
 
@@ skipping 122 matching lines @@
   if (result.IsError() || result.IsNull()) {
     // TODO(turnidge): We could get better error messages by returning
     // the Error object directly to the parser.  This will involve
     // replumbing all of the EvalConstExpr methods.
     return NULL;
   }
   return &Instance::ZoneHandle(Instance::Cast(result).raw());
 }
 
 }  // namespace dart