More automaton translation

src/jsregexp.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 118 matching lines @@
   // A one element cache of the last utf8_subject string and its length.  The
   // subject JS String object is cached in the heap.  We also cache a
   // translation between position and utf8 position.
   static char* utf8_subject_cache_;
   static int utf8_length_cache_;
   static int utf8_position_;
   static int character_position_;
 };
 
 
-template <typename Char> class RegExpNode;
-
-
 class CharacterRange {
  public:
   // For compatibility with the CHECK_OK macro
   CharacterRange(void* null) { ASSERT_EQ(NULL, null); }  //NOLINT
   CharacterRange(uc16 from, uc16 to)
     : from_(from),
       to_(to) {
   }
   static void AddClassEscape(uc16 type, ZoneList<CharacterRange>* ranges);
   static inline CharacterRange Singleton(uc16 value) {
@@ skipping 159 matching lines @@
     }
   };
   void AddRange(CharacterRange range, int value);
   OutSet Get(uc16 value);
  private:
   ZoneSplayTree<Config>* tree() { return &tree_; }
   ZoneSplayTree<Config> tree_;
 };
 
 
+struct RegExpParseResult {
+  RegExpTree* tree;
+  bool has_character_escapes;
+  Handle<String> error;
+  int capture_count;
+};

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

What!?! No third out-parameter? ;)
Good call.

+
+
 class RegExpEngine: public AllStatic {
  public:
-  template <typename Char>
-  static RegExpNode<Char>* Compile(RegExpTree* regexp);
-
-  template <typename Char>
-  static bool Execute(RegExpNode<Char>* start, Vector<Char> input);
+  static RegExpNode* Compile(RegExpParseResult* input);
+  static void DotPrint(const char* label, RegExpNode* node);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_JSREGEXP_H_