Merge regexp2000 back into bleeding_edge

src/string-stream.h

 // Copyright 2006-2008 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 57 matching lines @@
   unsigned size_;
   char* space_;
 };
 
 
 class FmtElm {
  public:
   FmtElm(int value) : type_(INT) { data_.u_int_ = value; }  // NOLINT
   explicit FmtElm(double value) : type_(DOUBLE) { data_.u_double_ = value; }  // NOLINT
   FmtElm(const char* value) : type_(C_STR) { data_.u_c_str_ = value; }  // NOLINT
+  FmtElm(const Vector<const uc16>& value) : type_(LC_STR) { data_.u_lc_str_ = &value; } // NOLINT
   FmtElm(Object* value) : type_(OBJ) { data_.u_obj_ = value; }  // NOLINT
   FmtElm(Handle<Object> value) : type_(HANDLE) { data_.u_handle_ = value.location(); }  // NOLINT
   FmtElm(void* value) : type_(INT) { data_.u_int_ = reinterpret_cast<int>(value); }  // NOLINT
  private:
   friend class StringStream;
-  enum Type { INT, DOUBLE, C_STR, OBJ, HANDLE };
+  enum Type { INT, DOUBLE, C_STR, LC_STR, OBJ, HANDLE };
   Type type_;
   union {
     int u_int_;
     double u_double_;
     const char* u_c_str_;
+    const Vector<const uc16>* u_lc_str_;
     Object* u_obj_;
     Object** u_handle_;
   } data_;
 };
 
 
 class StringStream {
  public:
   explicit StringStream(StringAllocator* allocator):
     allocator_(allocator),
     capacity_(kInitialCapacity),
     length_(0),
     buffer_(allocator_->allocate(kInitialCapacity)) {
     buffer_[0] = 0;
   }
 
   ~StringStream() {
   }
 
   bool Put(char c);
   bool Put(String* str);
   bool Put(String* str, int start, int end);
-  void Add(const char* format, Vector<FmtElm> elms);
+  void Add(Vector<const char> format, Vector<FmtElm> elms);
   void Add(const char* format);
+  void Add(Vector<const char> format);
   void Add(const char* format, FmtElm arg0);
   void Add(const char* format, FmtElm arg0, FmtElm arg1);
   void Add(const char* format, FmtElm arg0, FmtElm arg1, FmtElm arg2);
+  void Add(const char* format,
+           FmtElm arg0,
+           FmtElm arg1,
+           FmtElm arg2,
+           FmtElm arg3);
 
   // Getting the message out.
   void OutputToStdOut();
   void Log();
   Handle<String> ToString();
   SmartPointer<const char> ToCString();
 
   // Object printing support.
   void PrintName(Object* o);
   void PrintFixedArray(FixedArray* array, unsigned int limit);
@@ skipping 31 matching lines @@
   int space() const { return capacity_ - length_; }
   char* cursor() const { return buffer_ + length_; }
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StringStream);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_STRING_STREAM_H_