Implement external strings.

runtime/vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 773 matching lines @@
 
 DART_EXPORT Dart_Handle Dart_NewString32(const uint32_t* codepoints,
                                          intptr_t length) {
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
   const String& obj = String::Handle(String::New(codepoints, length));
   return Api::NewLocalHandle(obj);
 }
 
 
+DART_EXPORT Dart_Handle Dart_NewExternalString8(uint8_t* codepoints,
+                                                intptr_t length,
+                                                void* peer,
+                                                Dart_PeerFinalizer callback) {
+  Zone zone;  // Setup a VM zone as we are creating some handles.
+  HandleScope scope;  // Setup a VM handle scope.

[siva, 2011/11/18 23:26:09]

When you sync up these two lines will be replaced by
DART_SCOPE(Isolate::Current());

[cshapiro, 2011/11/19 01:08:29]

Thanks for pointing this out.  I discovered the change after I resolved the
merge conflicts and tried to build for the first time.

+  const String& obj =
+      String::Handle(String::NewExternal(codepoints, length, peer, callback));
+  return Api::NewLocalHandle(obj);
+}
+
+
+DART_EXPORT Dart_Handle Dart_NewExternalString16(uint16_t* codepoints,
+                                                 intptr_t length,
+                                                 void* peer,
+                                                 Dart_PeerFinalizer callback) {
+  Zone zone;  // Setup a VM zone as we are creating some handles.
+  HandleScope scope;  // Setup a VM handle scope.
+  const String& obj =
+      String::Handle(String::NewExternal(codepoints, length, peer, callback));
+  return Api::NewLocalHandle(obj);
+}
+
+
+DART_EXPORT Dart_Handle Dart_NewExternalString32(uint32_t* codepoints,
+                                                 intptr_t length,
+                                                 void* peer,
+                                                 Dart_PeerFinalizer callback) {
+  Zone zone;  // Setup a VM zone as we are creating some handles.
+  HandleScope scope;  // Setup a VM handle scope.
+  const String& obj =
+      String::Handle(String::NewExternal(codepoints, length, peer, callback));
+  return Api::NewLocalHandle(obj);
+}
+
+
 DART_EXPORT bool Dart_IsString8(Dart_Handle object) {
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
   const Object& obj = Object::Handle(Api::UnwrapHandle(object));
-  return obj.IsOneByteString();
+  return obj.IsOneByteString() || obj.IsExternalOneByteString();
 }
 
 
 DART_EXPORT bool Dart_IsString16(Dart_Handle object) {
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
   const Object& obj = Object::Handle(Api::UnwrapHandle(object));
-  return obj.IsOneByteString() || obj.IsTwoByteString();
+  return (obj.IsOneByteString() || obj.IsExternalOneByteString() ||
+          obj.IsTwoByteString() || obj.IsExternalOneByteString());

[Ivan Posva, 2011/11/18 19:36:44]

obj.IsExternalOneByteString() -> obj.IsExternalTwoByteString()

Missing test?

[cshapiro, 2011/11/19 01:08:29]

Fixed.  I could not find any tests for this function.  I'll put something
together in a follow-up change.

 }
 
 
 DART_EXPORT Dart_Handle Dart_StringGet8(Dart_Handle str,
                                         uint8_t* codepoints,
                                         intptr_t* length) {
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
   const Object& obj = Object::Handle(Api::UnwrapHandle(str));
-  if (obj.IsOneByteString()) {
-    OneByteString& string_obj = OneByteString::Handle();
+  if (obj.IsString()) {
+    String& string_obj = String::Handle();

[siva, 2011/11/18 23:26:09]

If you manage to get your change in before Todd then you are ok :-) otherwise
there is a synch up here too, I beleive he has a Api::UnwrapStringHandle(..)
method.

     string_obj ^= obj.raw();
-    intptr_t str_len = string_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>(string_obj.CharAt(i));
+    if (string_obj.CharSize() == String::kOneByteChar) {
+      intptr_t str_len = string_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>(string_obj.CharAt(i));
+      }
+      *length= copy_len;
+      return Api::Success();
     }
-    *length= copy_len;
-    return Api::Success();
   }
   return Api::Error(obj.IsString()
                     ? "Object is not a String8"
                     : "Object is not a String");
 }
 
 
 DART_EXPORT Dart_Handle Dart_StringGet16(Dart_Handle str,
                                          uint16_t* codepoints,
                                          intptr_t* length) {
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
   const Object& obj = Object::Handle(Api::UnwrapHandle(str));
-  if (obj.IsOneByteString() || obj.IsTwoByteString()) {
+  if (obj.IsString()) {
     String& string_obj = String::Handle();
     string_obj ^= obj.raw();
-    intptr_t str_len = string_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>(string_obj.CharAt(i));
+    if (string_obj.CharSize() <= String::kTwoByteChar) {
+      intptr_t str_len = string_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>(string_obj.CharAt(i));
+      }
+      *length = copy_len;
+      return Api::Success();
     }
-    *length = copy_len;
-    return Api::Success();
   }
   return Api::Error(obj.IsString()
                     ? "Object is not a String16"
                     : "Object is not a String");
 }
 
 
 DART_EXPORT Dart_Handle Dart_StringGet32(Dart_Handle str,
                                          uint32_t* codepoints,
                                          intptr_t* length) {
@@ skipping 1224 matching lines @@
   ASSERT(isolate != NULL);
   ApiState* state = isolate->api_state();
   ASSERT(state != NULL);
   ApiLocalScope* scope = state->top_scope();
   ASSERT(scope != NULL);
   return scope->zone().Reallocate(ptr, old_size, new_size);
 }
 
 
 }  // namespace dart