Merged Scanner and JavaScriptScanner.

src/parser.h

Index: src/parser.h
diff --git a/src/parser.h b/src/parser.h
index 2e82d4ebbb3f797daae8d5dab9cb1c9f3388f4a3..9624301fcdd65a1c4ef08f1cc89c60bd573c05e0 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -486,7 +486,7 @@ class Parser {
   void ReportMessage(const char* message, Vector<const char*> args);
 
   bool inside_with() const { return top_scope_->inside_with(); }
-  JavaScriptScanner& scanner()  { return scanner_; }
+  Scanner& scanner()  { return scanner_; }
   Mode mode() const { return mode_; }
   ScriptDataImpl* pre_data() const { return pre_data_; }
 
@@ -726,7 +726,7 @@ class Parser {
   ZoneList<Handle<String> > symbol_cache_;
 
   Handle<Script> script_;
-  JavaScriptScanner scanner_;
+  Scanner scanner_;
 
   Scope* top_scope_;