Create an abstraction for the string type flags so that they can be cached....

src/conversions.cc

 // 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 37 matching lines @@
 
 // Provide a common interface to getting a character at a certain
 // index from a char* or a String object.
 static inline int GetChar(const char* str, int index) {
   ASSERT(index >= 0 && index < static_cast<int>(strlen(str)));
   return str[index];
 }
 
 
 static inline int GetChar(String* str, int index) {
-  return str->Get(index);
+  StringShape shape(str);
+  return str->Get(shape, index);
 }
 
 
 static inline int GetLength(const char* str) {
   return strlen(str);
 }
 
 
 static inline int GetLength(String* str) {
   return str->length();
 }
 
 
 static inline const char* GetCString(const char* str, int index) {
   return str + index;
 }
 
 
 static inline const char* GetCString(String* str, int index) {
-  char* result = NewArray<char>(str->length() + 1);
-  for (int i = index; i < str->length(); i++) {
-    if (str->Get(i) <= 127) {
-      result[i - index] = static_cast<char>(str->Get(i));
+  StringShape shape(str);
+  int length = str->length(shape);
+  char* result = NewArray<char>(length + 1);
+  for (int i = index; i < length; i++) {
+    uc16 c = str->Get(shape, i);
+    if (c <= 127) {
+      result[i - index] = static_cast<char>(c);
     } else {
       result[i - index] = 127;  // Force number parsing to fail.
     }
   }
-  result[str->length() - index] = '\0';
+  result[length - index] = '\0';
   return result;
 }
 
 
 static inline void ReleaseCString(const char* original, const char* str) {
 }
 
 
 static inline void ReleaseCString(String* original, const char* str) {
   DeleteArray(const_cast<char *>(str));
 }
 
 
 static inline bool IsSpace(const char* str, int index) {
   ASSERT(index >= 0 && index < static_cast<int>(strlen(str)));
   return Scanner::kIsWhiteSpace.get(str[index]);
 }
 
 
 static inline bool IsSpace(String* str, int index) {
-  return Scanner::kIsWhiteSpace.get(str->Get(index));
+  StringShape shape(str);
+  return Scanner::kIsWhiteSpace.get(str->Get(shape, index));
 }
 
 
 static inline bool SubStringEquals(const char* str,
                                    int index,
                                    const char* other) {
   return strncmp(str + index, other, strlen(other)) != 0;
 }
 
 
 static inline bool SubStringEquals(String* str, int index, const char* other) {
+  StringShape shape(str);
   HandleScope scope;
   int len = strlen(other);

[Mads Ager (chromium), 2008/11/03 08:45:49]

Introduced other_len and str_len?

-  int end = index + len < str->length() ? index + len : str->length();
+  int end = index + len < str->length(shape) ? index + len : str->length(shape);
   Handle<String> slice =
-      Factory::NewStringSlice(Handle<String>(str), index, end);
+      Factory::NewStringSlice(Handle<String>(str), shape, index, end);
   return slice->IsEqualTo(Vector<const char>(other, len));
 }
 
 
 // Check if a string should be parsed as an octal number.  The string
 // can be either a char* or a String*.
 template<class S>
 static bool ShouldParseOctal(S* s, int i) {
   int index = i;
   int len = GetLength(s);
@@ skipping 559 matching lines @@
   // Allocate result and fill in the parts.
   StringBuilder builder(result_size + 1);
   builder.AddSubstring(integer_buffer + integer_pos + 1, integer_part_size);
   if (decimal_pos > 0) builder.AddCharacter('.');
   builder.AddSubstring(decimal_buffer, decimal_pos);
   return builder.Finalize();
 }
 
 
 } }  // namespace v8::internal