- Represent strings internally in UTF-16 format, this makes it

runtime/vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 255 matching lines @@
       *peer = data->peer();
       return true;
     }
     case kExternalTwoByteStringCid: {
       RawExternalTwoByteString* raw_string =
           reinterpret_cast<RawExternalTwoByteString*>(raw_obj)->ptr();
       ExternalStringData<uint16_t>* data = raw_string->external_data_;
       *peer = data->peer();
       return true;
     }
-    case kExternalFourByteStringCid: {
-      RawExternalFourByteString* raw_string =
-          reinterpret_cast<RawExternalFourByteString*>(raw_obj)->ptr();
-      ExternalStringData<uint32_t>* data = raw_string->external_data_;
-      *peer = data->peer();
-      return true;
-    }
   }
   return false;
 }
 
 
 // When we want to return a handle to a type to the user, we handle
 // class-types differently than some other types.
 static Dart_Handle TypeToHandle(Isolate* isolate,
                                 const char* function_name,
                                 const AbstractType& type) {
@@ skipping 1222 matching lines @@
 
 
 // --- Strings ---
 
 
 DART_EXPORT bool Dart_IsString(Dart_Handle object) {
   return RawObject::IsStringClassId(Api::ClassId(object));
 }
 
 
-DART_EXPORT bool Dart_IsString8(Dart_Handle object) {
+DART_EXPORT bool Dart_IsAsciiString(Dart_Handle object) {
   return RawObject::IsOneByteStringClassId(Api::ClassId(object));
 }
 
 
-DART_EXPORT bool Dart_IsString16(Dart_Handle object) {
-  return RawObject::IsTwoByteStringClassId(Api::ClassId(object));
-}
-
-
 DART_EXPORT Dart_Handle Dart_StringLength(Dart_Handle str, intptr_t* len) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const String& str_obj = Api::UnwrapStringHandle(isolate, str);
   if (str_obj.IsNull()) {
     RETURN_TYPE_ERROR(isolate, str, String);
   }
   *len = str_obj.Length();
   return Api::Success(isolate);
 }
 
 
-DART_EXPORT Dart_Handle Dart_NewString(const char* str) {
+DART_EXPORT Dart_Handle Dart_NewStringFromCString(const char* str) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   if (str == NULL) {
     RETURN_NULL_ERROR(str);
   }
-  if (!Utf8::IsValid(str)) {
-    return Api::NewError("%s expects argument 'str' to be valid UTF-8.",
-                         CURRENT_FUNC);
-  }
   return Api::NewHandle(isolate, String::New(str));
 }
 
 
-DART_EXPORT Dart_Handle Dart_NewString8(const uint8_t* codepoints,
-                                        intptr_t length) {
+DART_EXPORT Dart_Handle Dart_NewStringFromUTF8(const uint8_t* utf8_array,
+                                               intptr_t length) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  if (codepoints == NULL && length != 0) {
-    RETURN_NULL_ERROR(codepoints);
+  if (utf8_array == NULL && length != 0) {
+    RETURN_NULL_ERROR(utf8_array);
   }
   CHECK_LENGTH(length, String::kMaxElements);
-  return Api::NewHandle(isolate, String::New(codepoints, length));
+  if (!Utf8::IsValid(utf8_array, length)) {
+    return Api::NewError("%s expects argument 'str' to be valid UTF-8.",
+                         CURRENT_FUNC);
+  }
+  return Api::NewHandle(isolate, String::New(utf8_array, length));
 }
 
 
-DART_EXPORT Dart_Handle Dart_NewString16(const uint16_t* codepoints,
-                                         intptr_t length) {
+DART_EXPORT Dart_Handle Dart_NewStringFromUTF16(const uint16_t* utf16_array,
+                                                intptr_t length) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  if (codepoints == NULL && length != 0) {
-    RETURN_NULL_ERROR(codepoints);
+  if (utf16_array == NULL && length != 0) {
+    RETURN_NULL_ERROR(utf16_array);
   }
   CHECK_LENGTH(length, String::kMaxElements);
-  return Api::NewHandle(isolate, String::New(codepoints, length));
+  return Api::NewHandle(isolate, String::New(utf16_array, length));
 }
 
 
-DART_EXPORT Dart_Handle Dart_NewString32(const uint32_t* codepoints,
-                                         intptr_t length) {
+DART_EXPORT Dart_Handle Dart_NewStringFromUTF32(const uint32_t* utf32_array,
+                                                intptr_t length) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  if (codepoints == NULL && length != 0) {
-    RETURN_NULL_ERROR(codepoints);
+  if (utf32_array == NULL && length != 0) {
+    RETURN_NULL_ERROR(utf32_array);
   }
   CHECK_LENGTH(length, String::kMaxElements);
-  return Api::NewHandle(isolate, String::New(codepoints, length));
+  return Api::NewHandle(isolate, String::New(utf32_array, length));
 }
 
 
 DART_EXPORT bool Dart_IsExternalString(Dart_Handle object) {
   return RawObject::IsExternalStringClassId(Api::ClassId(object));
 }
 
 
 DART_EXPORT Dart_Handle Dart_ExternalStringGetPeer(Dart_Handle object,
                                                    void** peer) {
@@ skipping 12 matching lines @@
     RETURN_TYPE_ERROR(Isolate::Current(), object, String);
   } else {
     return
         Api::NewError(
             "%s expects argument 'object' to be an external String.",
             CURRENT_FUNC);
   }
 }
 
 
-DART_EXPORT Dart_Handle Dart_NewExternalString8(const uint8_t* codepoints,
-                                                intptr_t length,
-                                                void* peer,
-                                                Dart_PeerFinalizer callback) {
+DART_EXPORT Dart_Handle Dart_NewExternalUTF8String(const uint8_t* utf8_array,
+                                                   intptr_t length,
+                                                   void* peer,
+                                                   Dart_PeerFinalizer cback) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  if (codepoints == NULL && length != 0) {
-    RETURN_NULL_ERROR(codepoints);
+  if (utf8_array == NULL && length != 0) {
+    RETURN_NULL_ERROR(utf8_array);
   }
   CHECK_LENGTH(length, String::kMaxElements);
-  return Api::NewHandle(
-      isolate, String::NewExternal(codepoints, length, peer, callback));
+  return Api::NewHandle(isolate,
+                        String::NewExternal(utf8_array, length, peer, cback));
 }
 
 
-DART_EXPORT Dart_Handle Dart_NewExternalString16(const uint16_t* codepoints,
-                                                 intptr_t length,
-                                                 void* peer,
-                                                 Dart_PeerFinalizer callback) {
+DART_EXPORT Dart_Handle Dart_NewExternalUTF16String(const uint16_t* utf16_array,
+                                                    intptr_t length,
+                                                    void* peer,
+                                                    Dart_PeerFinalizer cback) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  if (codepoints == NULL && length != 0) {
-    RETURN_NULL_ERROR(codepoints);
+  if (utf16_array == NULL && length != 0) {
+    RETURN_NULL_ERROR(utf16_array);
   }
   CHECK_LENGTH(length, String::kMaxElements);
-  return Api::NewHandle(
-      isolate, String::NewExternal(codepoints, length, peer, callback));
+  return Api::NewHandle(isolate,
+                        String::NewExternal(utf16_array, length, peer, cback));
 }
 
 
-DART_EXPORT Dart_Handle Dart_NewExternalString32(const uint32_t* codepoints,
-                                                 intptr_t length,
-                                                 void* peer,
-                                                 Dart_PeerFinalizer callback) {
+DART_EXPORT Dart_Handle Dart_StringToCString(Dart_Handle object,
+                                             const char** cstr) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  if (codepoints == NULL && length != 0) {
-    RETURN_NULL_ERROR(codepoints);
+  const String& str_obj = Api::UnwrapStringHandle(isolate, object);
+  if (str_obj.IsNull()) {
+    RETURN_TYPE_ERROR(isolate, object, String);
   }
-  CHECK_LENGTH(length, String::kMaxElements);
-  return Api::NewHandle(
-      isolate, String::NewExternal(codepoints, length, peer, callback));
-}
-
-
-DART_EXPORT Dart_Handle Dart_StringGet8(Dart_Handle str,
-                                        uint8_t* codepoints,
-                                        intptr_t* length) {
-  Isolate* isolate = Isolate::Current();
-  DARTSCOPE(isolate);
-  const OneByteString& str_obj = Api::UnwrapOneByteStringHandle(isolate, str);
-  if (str_obj.IsNull()) {
-    RETURN_TYPE_ERROR(isolate, str, String8);
+  intptr_t string_length = Utf8::Length(str_obj);
+  char* res = Api::TopScope(isolate)->zone()->Alloc<char>(string_length + 1);
+  if (res == NULL) {
+    return Api::NewError("Unable to allocate memory");
   }
-  intptr_t str_len = str_obj.Length();
-  intptr_t copy_len = (str_len > *length) ? *length : str_len;
-  for (intptr_t i = 0; i < copy_len; i++) {
-    codepoints[i] = static_cast<uint8_t>(str_obj.CharAt(i));
-  }
-  *length= copy_len;
+  const char* string_value = str_obj.ToCString();
+  memmove(res, string_value, string_length + 1);
+  ASSERT(res[string_length] == '\0');
+  *cstr = res;
   return Api::Success(isolate);
 }
 
 
-DART_EXPORT Dart_Handle Dart_StringGet16(Dart_Handle str,
-                                         uint16_t* codepoints,
-                                         intptr_t* length) {
+DART_EXPORT Dart_Handle Dart_StringToUTF8(Dart_Handle str,
+                                          uint8_t* utf8_array,
+                                          intptr_t* length) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const String& str_obj = Api::UnwrapStringHandle(isolate, str);
   if (str_obj.IsNull()) {
     RETURN_TYPE_ERROR(isolate, str, String);
   }
-  if (str_obj.CharSize() > String::kTwoByteChar) {
-    return Api::NewError("Object is not a String16 or String8");
+  intptr_t str_len = str_obj.Length();

[Bill Hesse, 2012/11/01 11:35:02]

This seems totally wrong, unless we restrict the function to only apply to
one-byte strings (ascii).  There is no way to get the UTF8 length from a string
except Uft8::Length, as far as I see, and this is not exposed through the API,
so the API user has no way to pass the correct size array in.

[siva, 2012/11/01 20:04:11]

Yes that should be
intptr_t str_len = Utf8::Length(str_obj);

I have uploaded a new CL for this.

On 2012/11/01 11:35:02, Bill Hesse wrote:

+  if (str_len > *length) {
+    return Api::NewError("Input array is not large enough to hold the result");
   }
-  intptr_t str_len = str_obj.Length();
-  intptr_t copy_len = (str_len > *length) ? *length : str_len;
-  for (intptr_t i = 0; i < copy_len; i++) {
-    codepoints[i] = static_cast<uint16_t>(str_obj.CharAt(i));
-  }
-  *length = copy_len;
+  str_obj.ToUTF8(utf8_array, str_len);
+  *length= str_len;
   return Api::Success(isolate);
 }
 
 
-DART_EXPORT Dart_Handle Dart_StringGet32(Dart_Handle str,
-                                         uint32_t* codepoints,
-                                         intptr_t* length) {
+DART_EXPORT Dart_Handle Dart_StringToUTF16(Dart_Handle str,
+                                           uint16_t* utf16_array,
+                                           intptr_t* length) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const String& str_obj = Api::UnwrapStringHandle(isolate, str);
   if (str_obj.IsNull()) {
     RETURN_TYPE_ERROR(isolate, str, String);
   }
   intptr_t str_len = str_obj.Length();
   intptr_t copy_len = (str_len > *length) ? *length : str_len;
   for (intptr_t i = 0; i < copy_len; i++) {
-    codepoints[i] = static_cast<uint32_t>(str_obj.CharAt(i));
+    utf16_array[i] = static_cast<uint16_t>(str_obj.CharAt(i));
   }
   *length = copy_len;
   return Api::Success(isolate);
 }
 
 
-DART_EXPORT Dart_Handle Dart_StringToCString(Dart_Handle object,
-                                             const char** result) {
-  Isolate* isolate = Isolate::Current();
-  DARTSCOPE(isolate);
-  const String& str_obj = Api::UnwrapStringHandle(isolate, object);
-  if (str_obj.IsNull()) {
-    RETURN_TYPE_ERROR(isolate, object, String);
-  }
-  intptr_t string_length = Utf8::Length(str_obj);
-  char* res = Api::TopScope(isolate)->zone()->Alloc<char>(string_length + 1);
-  if (res == NULL) {
-    return Api::NewError("Unable to allocate memory");
-  }
-  const char* string_value = str_obj.ToCString();
-  memmove(res, string_value, string_length + 1);
-  ASSERT(res[string_length] == '\0');
-  *result = res;
-  return Api::Success(isolate);
-}
-
-
-DART_EXPORT Dart_Handle Dart_StringToBytes(Dart_Handle object,
-                                           const uint8_t** bytes,
-                                           intptr_t *length) {
-  Isolate* isolate = Isolate::Current();
-  DARTSCOPE(isolate);
-  const String& str = Api::UnwrapStringHandle(isolate, object);
-  if (str.IsNull()) {
-    RETURN_TYPE_ERROR(isolate, object, String);
-  }
-  if (bytes == NULL) {
-    RETURN_NULL_ERROR(bytes);
-  }
-  if (length == NULL) {
-    RETURN_NULL_ERROR(length);
-  }
-  const char* cstring = str.ToCString();
-  *length = Utf8::Length(str);
-  uint8_t* result = Api::TopScope(isolate)->zone()->Alloc<uint8_t>(*length);
-  if (result == NULL) {
-    return Api::NewError("Unable to allocate memory");
-  }
-  memmove(result, cstring, *length);
-  *bytes = result;
-  return Api::Success(isolate);
-}
-
-
 // --- Lists ---
 
 
 static RawInstance* GetListInstance(Isolate* isolate, const Object& obj) {
   if (obj.IsInstance()) {
     const Instance& instance = Instance::Cast(obj);
     const Type& type =
         Type::Handle(isolate, isolate->object_store()->list_interface());
     Error& malformed_type_error = Error::Handle(isolate);
     if (instance.IsInstanceOf(type,
@@ skipping 2748 matching lines @@
   }
   {
     NoGCScope no_gc;
     RawObject* raw_obj = obj.raw();
     isolate->heap()->SetPeer(raw_obj, peer);
   }
   return Api::Success(isolate);
 }
 
 }  // namespace dart