Remove most uses of StringInputBuffer

src/objects-inl.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 2827 matching lines @@
   // Verify output.
   ASSERT(string == NULL || offset_out == 0);
   ASSERT(string == NULL ||
          *length_out == static_cast<unsigned>(string->length()));
   ASSERT(string == NULL || *type_out == string->map()->instance_type());
   return string;
 }
 
 
 uint16_t StringCharacterStream::GetNext() {
-  ASSERT((buffer8_ == NULL && end_ == NULL) || buffer8_ < end_);
+  ASSERT(buffer8_ != NULL && end_ != NULL);
+  // Advance cursor if needed.
+  // TODO(dcarney): Ensure uses of the api call HasMore first and avoid this.
+  if (buffer8_ == end_) HasMore();
+  ASSERT(buffer8_ < end_);
   return is_one_byte_ ? *buffer8_++ : *buffer16_++;
 }
 
 
-StringCharacterStream::StringCharacterStream(
-    String* string, unsigned offset, ConsStringIteratorOp* op)
-  : is_one_byte_(false),
-    buffer8_(NULL),
-    end_(NULL),
-    op_(op) {
-  op->Reset();
-  int32_t type = string->map()->instance_type();
-  unsigned length = string->length();
-  String::Visit(string, offset, *this, *op, type, length);
+StringCharacterStream::StringCharacterStream(String* string,
+                                             ConsStringIteratorOp* op)
+  : op_(op) {

[Yang, 2012/12/21 09:21:48]

Please initialize is_one_byte_, some compilers whine if it's not.

+  Reset(string);
 }
 
 
+StringCharacterStream::StringCharacterStream(String* string,
+                                             unsigned offset,
+                                             ConsStringIteratorOp* op)

[Yang, 2012/12/21 09:21:48]

Wouldn't it be cleaner to put offset as last and optional argument?

+  : op_(op) {
+  Reset(string, offset);
+}
+
+
+void StringCharacterStream::Reset(String* string, unsigned offset) {
+  op_->Reset();
+  buffer8_ = NULL;
+  end_ = NULL;
+  int32_t type = string->map()->instance_type();
+  unsigned length = string->length();
+  String::Visit(string, offset, *this, *op_, type, length);
+}
+
+
 bool StringCharacterStream::HasMore() {
   if (buffer8_ != end_) return true;
   if (!op_->HasMore()) return false;
   unsigned length;
   int32_t type;
   String* string = op_->ContinueOperation(&type, &length);
   if (string == NULL) return false;
   ASSERT(!string->IsConsString());
   ASSERT(string->length() != 0);
   ConsStringNullOp null_op;
@@ skipping 2895 matching lines @@
 #undef WRITE_UINT32_FIELD
 #undef READ_SHORT_FIELD
 #undef WRITE_SHORT_FIELD
 #undef READ_BYTE_FIELD
 #undef WRITE_BYTE_FIELD
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_INL_H_