More automaton translation

src/ast.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1186 matching lines @@
   VISIT(Assertion)                                                   \
   VISIT(CharacterClass)                                              \
   VISIT(Atom)                                                        \
   VISIT(Quantifier)                                                  \
   VISIT(Capture)                                                     \
   VISIT(Lookahead)                                                   \
   VISIT(Backreference)                                               \
   VISIT(Empty)
 
 
-class RegExpVisitor;
-template <typename Char> class RegExpNode;
 #define FORWARD_DECLARE(Name) class RegExp##Name;
 FOR_EACH_REG_EXP_NODE_TYPE(FORWARD_DECLARE)
 #undef FORWARD_DECLARE
 
 
 class RegExpTree: public ZoneObject {
  public:
   virtual ~RegExpTree() { }
   virtual void* Accept(RegExpVisitor* visitor, void* data) = 0;
+  virtual RegExpNode* ToNode(RegExpCompiler* compiler,

[Lasse Reichstein, 2008/11/06 16:46:44]

Could this be a Visitor instead?

[Christian Plesner Hansen, 2008/11/06 17:34:42]

It used to be but when I wanted to add the on_failure argument it became
unmanageable.

+                             RegExpNode* on_success,
+                             RegExpNode* on_failure) = 0;
   SmartPointer<char> ToString();
 #define MAKE_ASTYPE(Name)  virtual RegExp##Name* As##Name();
   FOR_EACH_REG_EXP_NODE_TYPE(MAKE_ASTYPE)
 #undef MAKE_ASTYPE
 };
 
 
 class RegExpDisjunction: public RegExpTree {
  public:
   explicit RegExpDisjunction(ZoneList<RegExpTree*>* nodes) : nodes_(nodes) { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
+  virtual RegExpNode* ToNode(RegExpCompiler* compiler,
+                             RegExpNode* on_success,
+                             RegExpNode* on_failure);
   virtual RegExpDisjunction* AsDisjunction();
   ZoneList<RegExpTree*>* nodes() { return nodes_; }
  private:
   ZoneList<RegExpTree*>* nodes_;
 };
 
 
 class RegExpAlternative: public RegExpTree {
  public:
   explicit RegExpAlternative(ZoneList<RegExpTree*>* nodes) : nodes_(nodes) { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
+  virtual RegExpNode* ToNode(RegExpCompiler* compiler,
+                             RegExpNode* on_success,
+                             RegExpNode* on_failure);
   virtual RegExpAlternative* AsAlternative();
   ZoneList<RegExpTree*>* nodes() { return nodes_; }
  private:
   ZoneList<RegExpTree*>* nodes_;
 };
 
 
 class RegExpAssertion: public RegExpTree {
  public:
   enum Type {
     START_OF_LINE, START_OF_INPUT, END_OF_LINE, END_OF_INPUT,
     BOUNDARY, NON_BOUNDARY
   };
   explicit RegExpAssertion(Type type) : type_(type) { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
+  virtual RegExpNode* ToNode(RegExpCompiler* compiler,
+                             RegExpNode* on_success,
+                             RegExpNode* on_failure);
   virtual RegExpAssertion* AsAssertion();
   Type type() { return type_; }
  private:
   Type type_;
 };
 
 
 class RegExpCharacterClass: public RegExpTree {
  public:
   RegExpCharacterClass(ZoneList<CharacterRange>* ranges, bool is_negated)
     : ranges_(ranges),
       is_negated_(is_negated) { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
+  virtual RegExpNode* ToNode(RegExpCompiler* compiler,
+                             RegExpNode* on_success,
+                             RegExpNode* on_failure);
   virtual RegExpCharacterClass* AsCharacterClass();
   ZoneList<CharacterRange>* ranges() { return ranges_; }
   bool is_negated() { return is_negated_; }
  private:
   ZoneList<CharacterRange>* ranges_;
   bool is_negated_;
 };
 
 
 class RegExpAtom: public RegExpTree {
  public:
   explicit RegExpAtom(Vector<const uc16> data) : data_(data) { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
+  virtual RegExpNode* ToNode(RegExpCompiler* compiler,
+                             RegExpNode* on_success,
+                             RegExpNode* on_failure);
   virtual RegExpAtom* AsAtom();
   Vector<const uc16> data() { return data_; }
  private:
   Vector<const uc16> data_;
 };
 
 
 class RegExpQuantifier: public RegExpTree {
  public:
   RegExpQuantifier(int min, int max, bool is_greedy, RegExpTree* body)
     : min_(min),
       max_(max),
       is_greedy_(is_greedy),
       body_(body) { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
+  virtual RegExpNode* ToNode(RegExpCompiler* compiler,
+                             RegExpNode* on_success,
+                             RegExpNode* on_failure);
   virtual RegExpQuantifier* AsQuantifier();
   int min() { return min_; }
   int max() { return max_; }
   bool is_greedy() { return is_greedy_; }
   RegExpTree* body() { return body_; }
   // We just use a very large integer value as infinity because 2^30
   // is infinite in practice.
   static const int kInfinity = (1 << 30);
  private:
   int min_;
   int max_;
   bool is_greedy_;
   RegExpTree* body_;
 };
 
 
 class RegExpCapture: public RegExpTree {
  public:
   explicit RegExpCapture(RegExpTree* body, int index)
     : body_(body), index_(index) { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
+  virtual RegExpNode* ToNode(RegExpCompiler* compiler,
+                             RegExpNode* on_success,
+                             RegExpNode* on_failure);
   virtual RegExpCapture* AsCapture();
   RegExpTree* body() { return body_; }
   int index() { return index_; }
+  static int StartRegister(int index) { return (index - 1) * 2; }
+  static int EndRegister(int index) { return (index - 1) * 2 + 1; }
  private:
   RegExpTree* body_;
   int index_;
 };
 
 
 class RegExpLookahead: public RegExpTree {
  public:
   RegExpLookahead(RegExpTree* body, bool is_positive)
     : body_(body),
       is_positive_(is_positive) { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
+  virtual RegExpNode* ToNode(RegExpCompiler* compiler,
+                             RegExpNode* on_success,
+                             RegExpNode* on_failure);
   virtual RegExpLookahead* AsLookahead();
   RegExpTree* body() { return body_; }
   bool is_positive() { return is_positive_; }
  private:
   RegExpTree* body_;
   bool is_positive_;
 };
 
 
 class RegExpBackreference: public RegExpTree {
  public:
   explicit RegExpBackreference(int index) : index_(index) { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
+  virtual RegExpNode* ToNode(RegExpCompiler* compiler,
+                             RegExpNode* on_success,
+                             RegExpNode* on_failure);
   virtual RegExpBackreference* AsBackreference();
   int index() { return index_; }
  private:
   int index_;
 };
 
 
 class RegExpEmpty: public RegExpTree {
  public:
   RegExpEmpty() { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
+  virtual RegExpNode* ToNode(RegExpCompiler* compiler,
+                             RegExpNode* on_success,
+                             RegExpNode* on_failure);
   virtual RegExpEmpty* AsEmpty();
   static RegExpEmpty* GetInstance() { return &kInstance; }
  private:
   static RegExpEmpty kInstance;
 };
 
 
 class RegExpVisitor BASE_EMBEDDED {
  public:
   virtual ~RegExpVisitor() { }
@@ skipping 42 matching lines @@
 #undef DEF_VISIT
 
  private:
   bool stack_overflow_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_AST_H_