Add some support for the code-point code-unit distinction.

runtime/vm/symbols.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/symbols.h"
 
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/raw_object.h"
@@ skipping 79 matching lines @@
   ASSERT(symbol_table.At(index) == String::null());
   InsertIntoSymbolTable(symbol_table, str, index);
 }
 
 
 RawString* Symbols::New(const char* str) {
   ASSERT(str != NULL);
   Utf8::Type type;
   intptr_t str_len = strlen(str);
   const uint8_t* utf8_array = reinterpret_cast<const uint8_t*>(str);
-  intptr_t len = Utf8::CodePointCount(utf8_array, str_len, &type);
+  intptr_t len = Utf8::CodeUnitCount(utf8_array, str_len, &type);
   Zone* zone = Isolate::Current()->current_zone();
   if (len == 0) {
     return Symbols::New(reinterpret_cast<uint8_t*>(NULL), 0);
   }
   if (type == Utf8::kLatin1) {
     uint8_t* characters = zone->Alloc<uint8_t>(len);
     Utf8::DecodeToLatin1(utf8_array, str_len, characters, len);
     return New(characters, len);
   }
   ASSERT((type == Utf8::kBMP) || (type == Utf8::kSMP));
@@ skipping 30 matching lines @@
       symbol.SetHash(hash);  // Remember the calculated hash value.
       InsertIntoSymbolTable(symbol_table, symbol, index);
     }
   }
   ASSERT(symbol.IsSymbol());
   return symbol.raw();
 }
 
 template RawString* Symbols::New(const uint8_t* characters, intptr_t len);
 template RawString* Symbols::New(const uint16_t* characters, intptr_t len);
-template RawString* Symbols::New(const uint32_t* characters, intptr_t len);
 
 
 RawString* Symbols::New(const String& str) {
   if (str.IsSymbol()) {
     return str.raw();
   }
   return New(str, 0, str.Length());
 }
 
 
@@ skipping 107 matching lines @@
 
 
 template intptr_t Symbols::FindIndex(const Array& symbol_table,
                                      const uint8_t* characters,
                                      intptr_t len,
                                      intptr_t hash);
 template intptr_t Symbols::FindIndex(const Array& symbol_table,
                                      const uint16_t* characters,
                                      intptr_t len,
                                      intptr_t hash);
-template intptr_t Symbols::FindIndex(const Array& symbol_table,
-                                     const uint32_t* characters,
-                                     intptr_t len,
-                                     intptr_t hash);
-
 
 intptr_t Symbols::FindIndex(const Array& symbol_table,
                             const String& str,
                             intptr_t begin_index,
                             intptr_t len,
                             intptr_t hash) {
   // Last element of the array is the number of used elements.
   intptr_t table_size = symbol_table.Length() - 1;
   intptr_t index = hash % table_size;
 
@@ skipping 17 matching lines @@
 }
 
 
 RawObject* Symbols::GetVMSymbol(intptr_t object_id) {
   ASSERT(IsVMSymbolId(object_id));
   intptr_t i = (object_id - kMaxPredefinedObjectIds);
   return (i > 0 && i < Symbols::kMaxId) ? predefined_[i] : Object::null();
 }
 
 }  // namespace dart