Revert "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 37 matching lines @@
   for (intptr_t i = 1; i < Symbols::kMaxPredefinedId; i++) {
     // The symbol_table needs to be reloaded as it might have grown in the
     // previous iteration.
     symbol_table = object_store->symbol_table();
     str = OneByteString::New(names[i], Heap::kOld);
     Add(symbol_table, str);
     predefined_[i] = str.raw();
   }
   Object::RegisterSingletonClassNames();
 
-  for (uint16_t c = 0; c <= kMaxOneCharCodeSymbol; c++) {
+  for (uint32_t c = 0; c <= kMaxOneCharCodeSymbol; c++) {
     ASSERT(kMaxPredefinedId + c < kMaxId);
     predefined_[kMaxPredefinedId + c] = New(&c, 1);
   }
 }
 
 
 void Symbols::SetupSymbolTable(Isolate* isolate) {
   ASSERT(isolate != NULL);
 
   // Setup the symbol table used within the String class.
@@ skipping 26 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::CodeUnitCount(utf8_array, str_len, &type);
+  intptr_t len = Utf8::CodePointCount(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::kSupplementary));
@@ skipping 29 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 31 matching lines @@
         symbol.SetHash(hash);
       }
       InsertIntoSymbolTable(symbol_table, symbol, index);
     }
   }
   ASSERT(symbol.IsSymbol());
   return symbol.raw();
 }
 
 
-RawString* Symbols::FromCharCode(int32_t char_code) {
+RawString* Symbols::FromCharCode(uint32_t char_code) {
   if (char_code > kMaxOneCharCodeSymbol) {
-    if (char_code > Utf16::kMaxBmpCodepoint) {
-      uint16_t code_units[2];
-      Utf16::Encode(char_code, &code_units[0]);
-      return New(&code_units[0], 2);
-    } else {
-      uint16_t code_unit = char_code;
-      return New(&code_unit, 1);
-    }
+    return New(&char_code, 1);
   }
   return predefined_[kNullCharId + char_code];
 }
 
 
 void Symbols::GrowSymbolTable(const Array& symbol_table) {
   // TODO(iposva): Avoid exponential growth.
   intptr_t table_size = symbol_table.Length() - 1;
   intptr_t new_table_size = table_size * 2;
   Array& new_symbol_table = Array::Handle(Array::New(new_table_size + 1));
@@ skipping 61 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