Disentangle AstNode::Name and AstNode::ShortName.

runtime/vm/ast.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_AST_H_
 #define VM_AST_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
@@ skipping 67 matching lines @@
 NODE_LIST(DEFINE_VISITOR_FUNCTION)
 #undef DEFINE_VISITOR_FUNCTION
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AstNodeVisitor);
 };
 
 
 #define DECLARE_COMMON_NODE_FUNCTIONS(type)                                    \
   virtual void Visit(AstNodeVisitor* visitor);                                 \
-  virtual const char* ShortName() const;                                       \
+  virtual const char* PrettyName() const;                                      \
   virtual bool Is##type() const { return true; }                               \
   virtual type* As##type() { return this; }
 
 
 class AstNode : public ZoneAllocated {
  public:
   explicit AstNode(intptr_t token_pos)
       : token_pos_(token_pos) {
     ASSERT(token_pos_ >= 0);
   }
 
   intptr_t token_pos() const { return token_pos_; }
 
 #define AST_TYPE_CHECK(type, name)                                             \
   virtual bool Is##type() const { return false; }                              \
   virtual type* As##type() { return NULL; }
 NODE_LIST(AST_TYPE_CHECK)
 #undef AST_TYPE_CHECK
 
   virtual void Visit(AstNodeVisitor* visitor) = 0;
   virtual void VisitChildren(AstNodeVisitor* visitor) const = 0;
-  virtual const char* ShortName() const = 0;
-
-  // 'ShortName' is predefined for each AstNode and is the default
-  // implementation of "Name()". Each AST node can override the function
-  // "Name" to do more complex name composition.
-  virtual const char* Name() const {
-    return ShortName();
-  }
+  virtual const char* PrettyName() const = 0;
 
   // Convert the node into an assignment node using the rhs which is passed in,
   // this is typically used for converting nodes like LoadLocalNode,
   // LoadStaticFieldNode, InstanceGetterNode etc. which were created during
   // parsing as the assignment context was not known yet at that time.
   virtual AstNode* MakeAssignmentNode(AstNode* rhs) {
     return NULL;  // By default all nodes are not assignable.
   }
 
   // Return NULL if 'unary_op_kind' can't be applied.
@@ skipping 223 matching lines @@
  public:
   TypeNode(intptr_t token_pos, const AbstractType& type)
       : AstNode(token_pos), type_(type) {
     ASSERT(type_.IsZoneHandle());
     ASSERT(!type_.IsNull());
     ASSERT(type_.IsFinalized());
   }
 
   const AbstractType& type() const { return type_; }
 
-  virtual const char* Name() const;
+  const char* TypeName() const;
 
   virtual const Instance* EvalConstExpr() const {
     // TODO(regis): What if the type is malbounded?
     if (!type_.IsInstantiated() || type_.IsMalformed()) {
       return NULL;
     }
     return &type();
   }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const { }
@@ skipping 168 matching lines @@
 
   Token::Kind kind() const { return kind_; }
   AstNode* left() const { return left_; }
   AstNode* right() const { return right_; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const {
     left()->Visit(visitor);
     right()->Visit(visitor);
   }
 
-  virtual const char* Name() const;
+  const char* TokenName() const;
   virtual bool IsPotentiallyConst() const;
   virtual const Instance* EvalConstExpr() const;
 
   DECLARE_COMMON_NODE_FUNCTIONS(ComparisonNode);
 
  private:
   const Token::Kind kind_;
   AstNode* left_;
   AstNode* right_;
 
@@ skipping 23 matching lines @@
   virtual int64_t mask32() const {
     UNREACHABLE();
     return 0;
   }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const {
     left()->Visit(visitor);
     right()->Visit(visitor);
   }
 
-  virtual const char* Name() const;
+  const char* TokenName() const;
   virtual bool IsPotentiallyConst() const;
   virtual const Instance* EvalConstExpr() const;
 
   DECLARE_COMMON_NODE_FUNCTIONS(BinaryOpNode);
 
  private:
   const Token::Kind kind_;
   AstNode* left_;
   AstNode* right_;
 
@@ skipping 15 matching lines @@
     ASSERT((kind_value != Token::kAND) && (kind_value != Token::kOR));
   }
 
   // The optional 32-bit mask must be a an unsigned 32-bit value.
   virtual bool has_mask32() const { return true; }
   virtual int64_t mask32() const {
     ASSERT(has_mask32());
     return mask32_;
   }
 
-  virtual const char* Name() const;
+  const char* TokenName() const;
   DECLARE_COMMON_NODE_FUNCTIONS(BinaryOpWithMask32Node);
 
  private:
   // Optional unsigned 32 bit mask applied on result. No mask: -1.
   const int64_t mask32_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(BinaryOpWithMask32Node);
 };
 
 
@@ skipping 12 matching lines @@
     ASSERT(IsKindValid());
   }
 
   Token::Kind kind() const { return kind_; }
   AstNode* operand() const { return operand_; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const {
     operand()->Visit(visitor);
   }
 
-  virtual const char* Name() const;
+  const char* TokenName() const;
   virtual bool IsPotentiallyConst() const;
   virtual const Instance* EvalConstExpr() const;
 
   DECLARE_COMMON_NODE_FUNCTIONS(UnaryOpNode);
 
  private:
   const Token::Kind kind_;
   AstNode* operand_;
 
   bool IsKindValid() const;
@@ skipping 297 matching lines @@
   intptr_t inlined_finally_list_length() const {
     return inlined_finally_list_.length();
   }
   InlinedFinallyNode* InlinedFinallyNodeAt(intptr_t index) const {
     return inlined_finally_list_[index];
   }
   void AddInlinedFinallyNode(InlinedFinallyNode* finally_node) {
     inlined_finally_list_.Add(finally_node);
   }
 
-  virtual const char* Name() const;
+  const char* TokenName() const;
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const { }
 
   DECLARE_COMMON_NODE_FUNCTIONS(JumpNode);
 
  private:
   Token::Kind kind_;
   SourceLabel* label_;
   GrowableArray<InlinedFinallyNode*> inlined_finally_list_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(JumpNode);
 };
 
 
 class LoadLocalNode : public AstNode {
  public:
   LoadLocalNode(intptr_t token_pos, const LocalVariable* local)
       : AstNode(token_pos), local_(*local) {
     ASSERT(local != NULL);
   }
 
   const LocalVariable& local() const { return local_; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const { }
 
-  virtual const char* Name() const;
   virtual const Instance* EvalConstExpr() const;
   virtual bool IsPotentiallyConst() const;
   virtual AstNode* MakeAssignmentNode(AstNode* rhs);
 
   DECLARE_COMMON_NODE_FUNCTIONS(LoadLocalNode);
 
  private:
   const LocalVariable& local_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(LoadLocalNode);
@@ skipping 739 matching lines @@
   const intptr_t try_index_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_