Move various top-level Unicode definitions into classes and methods.

runtime/lib/string.cc

 // Copyright (c) 2011, 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/bootstrap_natives.h"
 
 #include "vm/exceptions.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
 #include "vm/symbols.h"
+#include "vm/unicode.h"
 
 namespace dart {
 
 DEFINE_NATIVE_ENTRY(StringBase_createFromCodePoints, 1) {
   GET_NATIVE_ARGUMENT(Array, a, arguments->NativeArgAt(0));
   // TODO(srdjan): Check that parameterized type is an int.
   Zone* zone = isolate->current_zone();
   intptr_t array_len = a.Length();
 
   // Unbox the array and determine the maximum element width.
   bool is_one_byte_string = true;
   intptr_t utf16_len = array_len;
   int32_t* utf32_array = zone->Alloc<int32_t>(array_len);
   Object& index_object = Object::Handle(isolate);
   for (intptr_t i = 0; i < array_len; i++) {
     index_object = a.At(i);
     if (!index_object.IsSmi()) {
       GrowableArray<const Object*> args;
       args.Add(&index_object);
       Exceptions::ThrowByType(Exceptions::kArgument, args);
     }
     intptr_t value = Smi::Cast(index_object).Value();
     if (value < 0) {

[siva, 2012/11/30 02:42:53]

We could change this check to:
if (Utf::IsOutOfRange(value)) {

once Utf::OutOfRange includes the < 0 check.

[cshapiro, 2012/11/30 03:21:24]

Right.  Done and done.

       GrowableArray<const Object*> args;
       Exceptions::ThrowByType(Exceptions::kArgument, args);
     } else {
-      if (value > 0xFF) {
+      if (!Utf::IsLatin1(value)) {
         is_one_byte_string = false;
       }
-      if (value > 0xFFFF) {
+      if (!Utf::IsBmp(value)) {

[siva, 2012/11/30 02:42:53]

if (Utf::IsSupplementary(value)) {
   ...
}
might make this more readable.

Actually a slightly more efficient way might be:

if (!Utf::IsLatin1(value)) {
  is_one_byte_string = false;
  if (Utf::IsSupplementary(value)) {
    utf16_len += 1;
  }
}

[cshapiro, 2012/11/30 03:21:24]

A great idea.  Done!

         utf16_len += 1;
       }
     }
     utf32_array[i] = value;
   }
   if (is_one_byte_string) {
     return OneByteString::New(utf32_array, array_len, Heap::kNew);
   }
   return TwoByteString::New(utf16_len, utf32_array, array_len, Heap::kNew);
 }
@@ skipping 108 matching lines @@
     if (!elem.IsString()) {
       GrowableArray<const Object*> args;
       args.Add(&elem);
       Exceptions::ThrowByType(Exceptions::kArgument, args);
     }
   }
   return String::ConcatAll(strings);
 }
 
 }  // namespace dart