Experimental parser: cleanup after bleeding_edge merge

src/lexer/lexer.cc

 // Copyright 2013 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 154 matching lines @@
 }
 
 
 template<typename Char>
 Lexer<Char>::Lexer(UnicodeCache* unicode_cache,
                    Handle<String> source,
                    int start_position,
                    int end_position)
     : LexerBase(unicode_cache),
       isolate_(source->GetIsolate()),
-      // TODO(dcarney): don't need to allocate here, used stored positions
-      source_handle_(isolate_->factory()->NewSubString(
-          source, start_position, end_position)),
+      source_handle_(FlattenGetString(source)),
       source_ptr_(NULL),
       start_position_(start_position),
       end_position_(end_position),
       buffer_(NULL),
       buffer_end_(NULL),
       start_(NULL),
       cursor_(NULL),
       last_octal_end_(NULL) {
-  ASSERT(source->IsFlat());
-  fprintf(stderr, "%s %d %d %d %d %d\n",
-    __func__, start_position_, end_position_,
-    source->length(), source_handle_->length(),
-    source->IsOneByteRepresentation());
   UpdateBufferBasedOnHandle();
   current_.beg_pos = current_.end_pos = next_.beg_pos = next_.end_pos = 0;
   isolate_->lexer_gc_handler()->AddLexer(this);
+  // TODO(dcarney): move this to UpdateBufferBasedOnHandle
+  cursor_ = buffer_ + start_position;
+  buffer_end_ = buffer_ + end_position;
+  start_ = cursor_;
+  has_line_terminator_before_next_ = false;
+  has_multiline_comment_before_next_ = false;
 }
 
 
 template<typename Char>
 Lexer<Char>::~Lexer() {
   if (!source_handle_.is_null()) {
     isolate_->lexer_gc_handler()->RemoveLexer(this);
   }
 }
 
@@ skipping 465 matching lines @@
   // FIXME: implement
   UNREACHABLE();
   return Handle<String>();
 }
 
 template class Lexer<uint8_t>;
 template class Lexer<uint16_t>;
 template class Lexer<int8_t>;
 
 } }  // v8::internal