DO NOT COMMIT: Trying to use ExperimentalScanner instead of Scanner; doesn't work.

src/parser.h

 // Copyright 2012 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 86 matching lines @@
   virtual const char* Data();
   virtual bool HasError();
 
   void Initialize();
   void ReadNextSymbolPosition();
 
   FunctionEntry GetFunctionEntry(int start);
   int GetSymbolIdentifier();
   bool SanityCheck();
 
-  Scanner::Location MessageLocation();
+  ScannerBase::Location MessageLocation();
   const char* BuildMessage();
   Vector<const char*> BuildArgs();
 
   int symbol_count() {
     return (store_.length() > PreparseDataConstants::kHeaderSize)
         ? store_[PreparseDataConstants::kSymbolCountOffset]
         : 0;
   }
   // The following functions should only be called if SanityCheck has
   // returned true.
@@ skipping 289 matching lines @@
 
 // Forward declaration.
 class SingletonLogger;
 
 class Parser : public ParserBase {
  public:
   explicit Parser(CompilationInfo* info);
   ~Parser() {
     delete reusable_preparser_;
     reusable_preparser_ = NULL;
+    delete scanner_;
+    scanner_ = NULL;
   }
 
   // Parses the source code represented by the compilation info and sets its
   // function literal.  Returns false (and deallocates any allocated AST
   // nodes) if parsing failed.
   static bool Parse(CompilationInfo* info) { return Parser(info).Parse(); }
   bool Parse();
 
  private:
   static const int kMaxNumFunctionLocals = 131071;  // 2^17-1
@@ skipping 89 matching lines @@
 
    private:
     Parser* parser_;
     Mode old_mode_;
   };
 
   // Returns NULL if parsing failed.
   FunctionLiteral* ParseProgram();
 
   FunctionLiteral* ParseLazy();
-  FunctionLiteral* ParseLazy(Utf16CharacterStream* source);
+  FunctionLiteral* ParseLazy(Handle<String> source);
 
   Isolate* isolate() { return isolate_; }
   Zone* zone() const { return zone_; }
   CompilationInfo* info() const { return info_; }
 
   // Called by ParseProgram after setting up the scanner.
   FunctionLiteral* DoParseProgram(CompilationInfo* info,
                                   Handle<String> source);
 
   // Report syntax error
   void ReportUnexpectedToken(Token::Value token);
   void ReportInvalidPreparseData(Handle<String> name, bool* ok);
   void ReportMessage(const char* message, Vector<const char*> args);
   void ReportMessage(const char* message, Vector<Handle<String> > args);
-  void ReportMessageAt(Scanner::Location location, const char* type) {
+  void ReportMessageAt(ScannerBase::Location location, const char* type) {
     ReportMessageAt(location, type, Vector<const char*>::empty());
   }
-  void ReportMessageAt(Scanner::Location loc,
+  void ReportMessageAt(ScannerBase::Location loc,
                        const char* message,
                        Vector<const char*> args);
-  void ReportMessageAt(Scanner::Location loc,
+  void ReportMessageAt(ScannerBase::Location loc,
                        const char* message,
                        Vector<Handle<String> > args);
 
   void set_pre_parse_data(ScriptDataImpl *data) {
     pre_parse_data_ = data;
     symbol_cache_.Initialize(data ? data->symbol_count() : 0, zone());
   }
 
   bool inside_with() const { return top_scope_->inside_with(); }
-  Scanner& scanner()  { return scanner_; }
+  ScannerBase& scanner()  { return *scanner_; }
   Mode mode() const { return mode_; }
   ScriptDataImpl* pre_parse_data() const { return pre_parse_data_; }
   bool is_extended_mode() {
     ASSERT(top_scope_ != NULL);
     return top_scope_->is_extended_mode();
   }
   Scope* DeclarationScope(VariableMode mode) {
     return IsLexicalVariableMode(mode)
         ? top_scope_ : top_scope_->DeclarationScope();
   }
@@ skipping 188 matching lines @@
        SingletonLogger* logger);
 
   AstNodeFactory<AstConstructionVisitor>* factory() {
     return current_function_state_->factory();
   }
 
   Isolate* isolate_;
   ZoneList<Handle<String> > symbol_cache_;
 
   Handle<Script> script_;
-  Scanner scanner_;
   PreParser* reusable_preparser_;
   Scope* top_scope_;
   Scope* original_scope_;  // for ES5 function declarations in sloppy eval
   FunctionState* current_function_state_;
   Target* target_stack_;  // for break, continue statements
   v8::Extension* extension_;
   ScriptDataImpl* pre_parse_data_;
   FuncNameInferrer* fni_;
 
   Mode mode_;
@@ skipping 34 matching lines @@
  private:
   static const int kLiteralTypeSlot = 0;
   static const int kElementsSlot = 1;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(CompileTimeValue);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_PARSER_H_