Merge preparser Scanner with main JavaScript scanner.

src/scanner.h

 // Copyright 2010 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 90 matching lines @@
 // JavaScript scanner getting its input from either a V8 String or a unicode
 // CharacterStream.
 
 class V8JavaScriptScanner : public JavaScriptScanner {
  public:
   V8JavaScriptScanner() {}
 
   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_;
 };
 
 
 class JsonScanner : public Scanner {
  public:
   JsonScanner();
 
   // Initialize the Scanner to scan source.
   void Initialize(Handle<String> source);
@@ skipping 81 matching lines @@
 
 
 template <typename StringType, typename CharType>
 void ExternalStringUTF16Buffer<StringType, CharType>::SeekForward(int pos) {
   pos_ = pos;
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_SCANNER_H_