[parser] Refactor AstTraversalVisitor (BROKEN)

src/ast/ast.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_AST_AST_H_
 #define V8_AST_AST_H_
 
 #include "src/ast/ast-value-factory.h"
 #include "src/ast/modules.h"
 #include "src/ast/variables.h"
@@ skipping 2868 matching lines @@
 
 
 // ----------------------------------------------------------------------------
 // Basic visitor
 // Sub-class should parametrize AstVisitor with itself, e.g.:
 //   class SpecificVisitor : public AstVisitor<SpecificVisitor> { ... }
 
 template <class Subclass>
 class AstVisitor BASE_EMBEDDED {
  public:
-  void Visit(AstNode* node) { This()->Visit(node); }
+  void Visit(AstNode* node) { impl()->Visit(node); }
 
   void VisitDeclarations(ZoneList<Declaration*>* declarations) {
     for (int i = 0; i < declarations->length(); i++) {
       Visit(declarations->at(i));
     }
   }
 
   void VisitStatements(ZoneList<Statement*>* statements) {
     for (int i = 0; i < statements->length(); i++) {
       Statement* stmt = statements->at(i);
       Visit(stmt);
       if (stmt->IsJump()) break;
     }
   }
 
   void VisitExpressions(ZoneList<Expression*>* expressions) {
     for (int i = 0; i < expressions->length(); i++) {
       // The variable statement visiting code may pass NULL expressions
       // to this code. Maybe this should be handled by introducing an
       // undefined expression or literal?  Revisit this code if this
       // changes
       Expression* expression = expressions->at(i);
       if (expression != NULL) Visit(expression);
     }
   }
 
- private:
-  Subclass* This() { return static_cast<Subclass*>(this); }
+ protected:
+  Subclass* impl() { return static_cast<Subclass*>(this); }
 };
 
-#define GENERATE_VISIT_CASE(NodeType) \
-  case AstNode::k##NodeType:          \
+#define GENERATE_VISIT_CASE(NodeType)                                   \
+  case AstNode::k##NodeType:                                            \
     return Visit##NodeType(static_cast<NodeType*>(node));
 
 #define GENERATE_AST_VISITOR_SWITCH()  \
   switch (node->node_type()) {         \
     AST_NODE_LIST(GENERATE_VISIT_CASE) \
     case AstNode::kModule:             \
       UNREACHABLE();                   \
   }
 
-#define DEFINE_AST_VISITOR_SUBCLASS_MEMBERS()               \
+#define DEFINE_AST_VISITOR_STACKOVERFLOW_MEMBERS()          \
  public:                                                    \
-  void Visit(AstNode* node) {                               \
-    if (CheckStackOverflow()) return;                       \
-    GENERATE_AST_VISITOR_SWITCH()                           \
-  }                                                         \
-                                                            \
   void SetStackOverflow() { stack_overflow_ = true; }       \
   void ClearStackOverflow() { stack_overflow_ = false; }    \
   bool HasStackOverflow() const { return stack_overflow_; } \
                                                             \
   bool CheckStackOverflow() {                               \
     if (stack_overflow_) return true;                       \
     if (GetCurrentStackPosition() < stack_limit_) {         \
       stack_overflow_ = true;                               \
       return true;                                          \
     }                                                       \
     return false;                                           \
   }                                                         \
                                                             \
  private:                                                   \
   void InitializeAstVisitor(Isolate* isolate) {             \
     stack_limit_ = isolate->stack_guard()->real_climit();   \
     stack_overflow_ = false;                                \
   }                                                         \
                                                             \
   void InitializeAstVisitor(uintptr_t stack_limit) {        \
     stack_limit_ = stack_limit;                             \
     stack_overflow_ = false;                                \
   }                                                         \
                                                             \
   uintptr_t stack_limit_;                                   \
   bool stack_overflow_
 
-#define DEFINE_AST_VISITOR_MEMBERS_WITHOUT_STACKOVERFLOW()    \
- public:                                                      \
-  void Visit(AstNode* node) { GENERATE_AST_VISITOR_SWITCH() } \
-                                                              \
- private:
+#define DEFINE_AST_VISITOR_DISPATCH()                       \
+ public:                                                    \
+  void Visit(AstNode* node) {                               \
+    if (CheckStackOverflow()) return;                       \
+    GENERATE_AST_VISITOR_SWITCH()                           \
+  }
+
+#define DEFINE_AST_VISITOR_MEMBERS_WITHOUT_STACKOVERFLOW()      \
+ public:                                                        \
+  void Visit(AstNode* node) { GENERATE_AST_VISITOR_SWITCH() }
+
+#define DEFINE_AST_VISITOR_SUBCLASS_MEMBERS()         \
+ public:                                              \
+  DEFINE_AST_VISITOR_DISPATCH()                       \
+  DEFINE_AST_VISITOR_STACKOVERFLOW_MEMBERS()
 
 #define DEFINE_AST_REWRITER_SUBCLASS_MEMBERS()        \
  public:                                              \
   AstNode* Rewrite(AstNode* node) {                   \
     DCHECK_NULL(replacement_);                        \
     DCHECK_NOT_NULL(node);                            \
     Visit(node);                                      \
     if (HasStackOverflow()) return node;              \
     if (replacement_ == nullptr) return node;         \
     AstNode* result = replacement_;                   \
     replacement_ = nullptr;                           \
     return result;                                    \
   }                                                   \
                                                       \
  private:                                             \
   void InitializeAstRewriter(Isolate* isolate) {      \
     InitializeAstVisitor(isolate);                    \
     replacement_ = nullptr;                           \
   }                                                   \
                                                       \
   void InitializeAstRewriter(uintptr_t stack_limit) { \
     InitializeAstVisitor(stack_limit);                \
     replacement_ = nullptr;                           \
   }                                                   \
                                                       \
   DEFINE_AST_VISITOR_SUBCLASS_MEMBERS();              \
                                                       \
  protected:                                           \
   AstNode* replacement_
+
 // Generic macro for rewriting things; `GET` is the expression to be
 // rewritten; `SET` is a command that should do the rewriting, i.e.
 // something sensible with the variable called `replacement`.
 #define AST_REWRITE(Type, GET, SET)                            \
   do {                                                         \
     DCHECK(!HasStackOverflow());                               \
     DCHECK_NULL(replacement_);                                 \
     Visit(GET);                                                \
     if (HasStackOverflow()) return;                            \
     if (replacement_ == nullptr) break;                        \
@@ skipping 16 matching lines @@
 // `at` and `Set`.
 #define AST_REWRITE_LIST_ELEMENT(Type, list, index)                        \
   do {                                                                     \
     auto _list = (list);                                                   \
     auto _index = (index);                                                 \
     AST_REWRITE(Type, _list->at(_index), _list->Set(_index, replacement)); \
   } while (false)
 
 
 // ----------------------------------------------------------------------------
-// Traversing visitor
-// - fully traverses the entire AST.
-
-// This AstVistor is not final, and provides the AstVisitor methods as virtual
-// methods so they can be specialized by subclasses.
-class AstTraversalVisitor : public AstVisitor<AstTraversalVisitor> {
- public:
-  explicit AstTraversalVisitor(Isolate* isolate);
-  explicit AstTraversalVisitor(uintptr_t stack_limit);
-  virtual ~AstTraversalVisitor() {}
-
-  // Iteration left-to-right.
-  void VisitDeclarations(ZoneList<Declaration*>* declarations);
-  void VisitStatements(ZoneList<Statement*>* statements);
-
-// Individual nodes
-#define DECLARE_VISIT(type) virtual void Visit##type(type* node);
-  AST_NODE_LIST(DECLARE_VISIT)
-#undef DECLARE_VISIT
-
- protected:
-  int depth() { return depth_; }
-
- private:
-  DEFINE_AST_VISITOR_SUBCLASS_MEMBERS();
-
-  int depth_;
-
-  DISALLOW_COPY_AND_ASSIGN(AstTraversalVisitor);
-};
-
-// ----------------------------------------------------------------------------
 // AstNode factory
 
 class AstNodeFactory final BASE_EMBEDDED {
  public:
   explicit AstNodeFactory(AstValueFactory* ast_value_factory)
       : local_zone_(ast_value_factory->zone()),
         parser_zone_(ast_value_factory->zone()),
         ast_value_factory_(ast_value_factory) {}
 
   AstValueFactory* ast_value_factory() const { return ast_value_factory_; }
@@ skipping 466 matching lines @@
                                     : NULL;                                   \
   }
 AST_NODE_LIST(DECLARE_NODE_FUNCTIONS)
 #undef DECLARE_NODE_FUNCTIONS
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_AST_AST_H_