Experimental parser: Starting to unify the ExperimentalScanner iface with Scanner iface.

src/lexer/lexer.h

 // Portions of this code based on re2c:
 //   (re2c/examples/push.re)
 // Copyright 2013 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
@@ skipping 12 matching lines @@
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef V8_LEXER_LEXER_H
 #define V8_LEXER_LEXER_H
 
-#include <vector>
-
 #include "token.h"
 #include "flags.h"
 
+namespace v8 {
+namespace internal {
+
 class ExperimentalScanner;
 
 class PushScanner {
  public:
   explicit PushScanner(ExperimentalScanner* sink);
 
   ~PushScanner();
 
   void send(v8::internal::Token::Value token);
   uint32_t push(const void *input, int input_size);
@@ skipping 11 matching lines @@
 
   uint8_t* buffer_;
   uint8_t* buffer_end_;
 
   uint8_t yych;
   uint32_t yyaccept;
 
   ExperimentalScanner* sink_;
 };
 
-class ExperimentalScanner {
- public:
-  ExperimentalScanner(const char* fname, bool read_all_at_once);
-  ~ExperimentalScanner();
-  v8::internal::Token::Value Next(int* beg_pos, int* end_pos);
-  void Record(v8::internal::Token::Value token, int beg_pos, int end_pos);
-
- private:
-  void FillTokens();
-  static const int BUFFER_SIZE = 256;
-  std::vector<v8::internal::Token::Value> token_;
-  std::vector<int> beg_;
-  std::vector<int> end_;
-  size_t current_;
-  size_t fetched_;
-  FILE* file_;
-  PushScanner* scanner_;
-  bool read_all_at_once_;
-  const v8::internal::byte* source_;
-  int length_;
-};
+} }
 
 #endif  // V8_LEXER_LEXER_H