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

runtime/bin/dbg_message.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 "bin/dbg_connection.h"
 #include "bin/dbg_message.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 91 matching lines @@
   pr.GetValueChars(param_chars, buflen);
   // TODO(hausner): Decode escape sequences.
   return param_chars;
 }
 
 
 static void FormatEncodedString(dart::TextBuffer* buf, Dart_Handle str) {
   intptr_t str_len = 0;
   Dart_Handle res = Dart_StringLength(str, &str_len);
   ASSERT_NOT_ERROR(res);
-  uint32_t* codepoints =
-      reinterpret_cast<uint32_t*>(malloc(str_len * sizeof(uint32_t)));
+  uint16_t* codepoints =
+      reinterpret_cast<uint16_t*>(malloc(str_len * sizeof(uint16_t)));
   ASSERT(codepoints != NULL);
   intptr_t actual_len = str_len;
-  res = Dart_StringGet32(str, codepoints, &actual_len);
+  res = Dart_StringToUTF16(str, codepoints, &actual_len);
   ASSERT_NOT_ERROR(res);
   ASSERT(str_len == actual_len);
   buf->AddChar('\"');
   for (int i = 0; i < str_len; i++) {
     buf->AddEscapedChar(codepoints[i]);
   }
   buf->AddChar('\"');
   free(codepoints);
 }
 
@@ skipping 558 matching lines @@
 
 
 bool DbgMessage::HandleGetSourceCmd(DbgMessage* in_msg) {
   ASSERT(in_msg != NULL);
   MessageParser msg_parser(in_msg->buffer(), in_msg->buffer_len());
   int msg_id = msg_parser.MessageId();
   dart::TextBuffer msg(64);
   intptr_t lib_id = msg_parser.GetIntParam("libraryId");
   char* url_chars = msg_parser.GetStringParam("url");
   ASSERT(url_chars != NULL);
-  Dart_Handle url = Dart_NewString(url_chars);
+  Dart_Handle url = DartUtils::NewString(url_chars);
   ASSERT_NOT_ERROR(url);
   free(url_chars);
   url_chars = NULL;
   Dart_Handle source = Dart_ScriptGetSource(lib_id, url);
   if (Dart_IsError(source)) {
     in_msg->SendErrorReply(msg_id, Dart_GetError(source));
     return false;
   }
   msg.Printf("{ \"id\": %d, ", msg_id);
   msg.Printf("\"result\": { \"text\": ");
@@ skipping 19 matching lines @@
   return false;
 }
 
 
 bool DbgMessage::HandleSetBpCmd(DbgMessage* in_msg) {
   ASSERT(in_msg != NULL);
   MessageParser msg_parser(in_msg->buffer(), in_msg->buffer_len());
   int msg_id = msg_parser.MessageId();
   char* url_chars = msg_parser.GetStringParam("url");
   ASSERT(url_chars != NULL);
-  Dart_Handle url = Dart_NewString(url_chars);
+  Dart_Handle url = DartUtils::NewString(url_chars);
   ASSERT_NOT_ERROR(url);
   free(url_chars);
   url_chars = NULL;
   intptr_t line_number = msg_parser.GetIntParam("line");
   Dart_Handle bp_id = Dart_SetBreakpoint(url, line_number);
   if (Dart_IsError(bp_id)) {
     in_msg->SendErrorReply(msg_id, Dart_GetError(bp_id));
     return false;
   }
   ASSERT(Dart_IsInteger(bp_id));
@@ skipping 346 matching lines @@
     msg_queue->SendIsolateEvent(isolate_id, kind);
     if (kind == kInterrupted) {
       msg_queue->HandleMessages();
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }