Combined identical classes V8JavaScriptScanner and StandAloneJavaScriptScanner.

src/preparser-api.cc

 // Copyright 2011 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 140 matching lines @@
   // Limit of pushbacks before new allocation is necessary.
   uc16* pushback_buffer_;
   // Only if that pushback buffer at the start of buffer_ isn't sufficient
   // is the following used.
   const uc16* pushback_buffer_end_cache_;
   uc16* pushback_buffer_backing_;
   unsigned pushback_buffer_backing_size_;
 };
 
 
-class StandAloneJavaScriptScanner : public JavaScriptScanner {
- public:
-  explicit StandAloneJavaScriptScanner(UnicodeCache* unicode_cache)
-      : JavaScriptScanner(unicode_cache) { }
-
-  void Initialize(UC16CharacterStream* source) {
-    source_ = source;
-    Init();
-    // Skip initial whitespace allowing HTML comment ends just like
-    // after a newline and scan first token.
-    has_line_terminator_before_next_ = true;
-    SkipWhiteSpace();
-    Scan();
-  }
-};
-
-
 // Functions declared by allocation.h and implemented in both api.cc (for v8)
 // or here (for a stand-alone preparser).
 
 void FatalProcessOutOfMemory(const char* reason) {
   V8_Fatal(__FILE__, __LINE__, reason);
 }
 
 bool EnableSlowAsserts() { return true; }
 
 }  // namespace internal.
 
 
 UnicodeInputStream::~UnicodeInputStream() { }
 
 
 PreParserData Preparse(UnicodeInputStream* input, size_t max_stack) {
   internal::InputStreamUTF16Buffer buffer(input);
   uintptr_t stack_limit = reinterpret_cast<uintptr_t>(&buffer) - max_stack;
   internal::UnicodeCache unicode_cache;
-  internal::StandAloneJavaScriptScanner scanner(&unicode_cache);
+  internal::JavaScriptScanner scanner(&unicode_cache);
   scanner.Initialize(&buffer);
   internal::CompleteParserRecorder recorder;
   preparser::PreParser::PreParseResult result =
       preparser::PreParser::PreParseProgram(&scanner,
                                             &recorder,
                                             true,
                                             stack_limit);
   if (result == preparser::PreParser::kPreParseStackOverflow) {
     return PreParserData::StackOverflow();
   }
   internal::Vector<unsigned> pre_data = recorder.ExtractData();
   size_t size = pre_data.length() * sizeof(pre_data[0]);
   unsigned char* data = reinterpret_cast<unsigned char*>(pre_data.start());
   return PreParserData(size, data);
 }
 
 }  // namespace v8.
 
 
 // Used by ASSERT macros and other immediate exits.
 extern "C" void V8_Fatal(const char* file, int line, const char* format, ...) {
   exit(EXIT_FAILURE);
 }