Merge preparser Scanner with main JavaScript scanner.

src/scanner.h

Index: src/scanner.h
diff --git a/src/scanner.h b/src/scanner.h
index daf39219839117ff596f1b9bd46054e8f667e599..5f3c3ed51e3333213242455df11f40f571e61375 100644
--- a/src/scanner.h
+++ b/src/scanner.h
@@ -108,13 +108,17 @@ class V8JavaScriptScanner : public JavaScriptScanner {
   Token::Value NextCheckStack();
 
   // Initialize the Scanner to scan source.
-  void Initialize(Handle<String> source);
+  void Initialize(Handle<String> source, int literal_flags = kAllLiteralsFlag);
   void Initialize(Handle<String> source,
-                  unibrow::CharacterStream* stream);
+                  unibrow::CharacterStream* stream,
+                  int literal_flags = kAllLiteralsFlag);
   void Initialize(Handle<String> source,
-                  int start_position, int end_position);
+                  int start_position, int end_position,
+                  int literal_flags = kAllLiteralsFlag);
 
  protected:
+  static const int kAllLiteralsFlag = kLiteralNumber | kLiteralString

[Søren Thygesen Gjesse, 2010/11/19 08:17:21]

This constant should also be in the enum.

[Lasse Reichstein, 2010/11/19 08:51:24]

Done.

+      | kLiteralIdentifier | kLiteralRegExp | kLiteralRegExpFlags;
   StreamInitializer stream_initializer_;
 };