Add multibyte string support to debugger

runtime/bin/dbg_connection.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/dartutils.h"
 #include "bin/socket.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 305 matching lines @@
 }
 
 
 void DebuggerConnectionHandler::HandleStepOverCmd(const char* json_msg) {
   Dart_Handle res = Dart_SetStepOver();
   ASSERT_NOT_ERROR(res);
   HandleResumeCmd(json_msg);
 }
 
 
+static void FormatEncodedString32(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)));
+  ASSERT(codepoints != NULL);
+  intptr_t actual_len = str_len;
+  res = Dart_StringGet32(str, codepoints, &actual_len);

[siva, 2012/07/18 17:11:31]

ASSERT_NOT_ERROR(res);

[hausner, 2012/07/18 22:20:36]

Done.

+  ASSERT(str_len == actual_len);
+  buf->Printf("\"");
+  buf->PrintJsonString32(codepoints, str_len);
+  buf->Printf("\"");
+  free(codepoints);
+}
+
+
 static void FormatEncodedString(dart::TextBuffer* buf, Dart_Handle str) {
+  if (!Dart_IsString8(str)) {
+    return FormatEncodedString32(buf, str);
+  }
   ASSERT(Dart_IsString8(str));
   intptr_t str_len = 0;
   Dart_Handle res = Dart_StringLength(str, &str_len);
   ASSERT_NOT_ERROR(res);
   uint8_t* codepoints = reinterpret_cast<uint8_t*>(malloc(str_len));
   ASSERT(codepoints != NULL);
   intptr_t actual_len = str_len;
   res = Dart_StringGet8(str, codepoints, &actual_len);
   ASSERT(str_len == actual_len);
   buf->Printf("\"");
@@ skipping 687 matching lines @@
   DebuggerConnectionImpl::StartHandler(port_number);
   Dart_SetBreakpointHandler(BreakpointHandler);
   Dart_SetBreakpointResolvedHandler(BptResolvedHandler);
   Dart_SetExceptionThrownHandler(ExceptionThrownHandler);
 }
 
 
 DebuggerConnectionHandler::~DebuggerConnectionHandler() {
   CloseDbgConnection();
 }