Experimental scanner: fix check for two byte representation.

src/parser.cc

 // 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 560 matching lines @@
   HistogramTimerScope timer_scope(isolate()->counters()->parse(), true);
   Handle<String> source(String::cast(script_->source()));
   isolate()->counters()->total_parse_size()->Increment(source->length());
   ElapsedTimer timer;
   if (FLAG_trace_parse) {
     timer.Start();
   }
   fni_ = new(zone()) FuncNameInferrer(isolate(), zone());
 
   // Initialize parser state.
-  source->TryFlatten();
+  FlattenString(source);
   FunctionLiteral* result;
-  if (source->IsExternalTwoByteString()) {
+  if (source->IsTwoByteRepresentation()) {
     // Notice that the stream is destroyed at the end of the branch block.
     // The last line of the blocks can't be moved outside, even though they're
     // identical calls. // FIXME
     delete scanner_;
     scanner_ = new ExperimentalScanner<uint16_t>(source, isolate());
     // FIXME: set flags
     result = DoParseProgram(info(), source);
   } else {
     delete scanner_;
     scanner_ = new ExperimentalScanner<uint8_t>(source, isolate());
@@ skipping 110 matching lines @@
 
 FunctionLiteral* Parser::ParseLazy() {
   HistogramTimerScope timer_scope(isolate()->counters()->parse_lazy());
   Handle<String> source(String::cast(script_->source()));
   isolate()->counters()->total_parse_size()->Increment(source->length());
   ElapsedTimer timer;
   if (FLAG_trace_parse) {
     timer.Start();
   }
   // Initialize parser state.
-  source->TryFlatten();
+  FlattenString(source);
   Handle<SharedFunctionInfo> shared_info = info()->shared_info();
   FunctionLiteral* result = ParseLazy(
       source, shared_info->start_position(), shared_info->end_position());
   if (FLAG_trace_parse && result != NULL) {
     double ms = timer.Elapsed().InMillisecondsF();
     SmartArrayPointer<char> name_chars = result->debug_name()->ToCString();
     PrintF("[parsing function: %s - took %0.3f ms]\n", *name_chars, ms);
   }
   return result;
 }
 
 
 FunctionLiteral* Parser::ParseLazy(Handle<String> source, int start, int end) {
   delete scanner_;
-  if (source->IsExternalTwoByteString()) {
+  if (source->IsTwoByteRepresentation()) {
     scanner_ = new ExperimentalScanner<uint16_t>(source, isolate());
   } else {
     scanner_ = new ExperimentalScanner<uint8_t>(source, isolate());
   }
   scanner_->SeekForward(start);
   scanner_->SetEnd(end);
   // FIXME: set flags
 
   Handle<SharedFunctionInfo> shared_info = info()->shared_info();
   ASSERT(top_scope_ == NULL);
@@ skipping 4928 matching lines @@
       ASSERT(info()->isolate()->has_pending_exception());
     } else {
       result = ParseProgram();
     }
   }
   info()->SetFunction(result);
   return (result != NULL);
 }
 
 } }  // namespace v8::internal