Debugger wire protocol changes

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 192 matching lines @@
     } else if (Dart_IsError(text)) {
       buf->Printf("#ERROR");
     } else {
       FormatEncodedCharsTrunc(buf, text, max_chars);
     }
   }
 }
 
 
 static void FormatValue(dart::TextBuffer* buf, Dart_Handle object) {
-  if (Dart_IsInteger(object)) {
-    buf->Printf("\"kind\":\"integer\",");
+  if (Dart_IsNumber(object)) {
+    buf->Printf("\"kind\":\"number\",");
   } else if (Dart_IsString(object)) {
     buf->Printf("\"kind\":\"string\",");
   } else if (Dart_IsBoolean(object)) {
     buf->Printf("\"kind\":\"boolean\",");
   } else if (Dart_IsList(object)) {
     intptr_t len = 0;
     Dart_Handle res = Dart_ListLength(object, &len);
     ASSERT_NOT_ERROR(res);
     buf->Printf("\"kind\":\"list\",\"length\":%"Pd",", len);
   } else {
     buf->Printf("\"kind\":\"object\",");
+    intptr_t class_id = 0;
+    Dart_Handle res = Dart_GetObjClassId(object, &class_id);
+    if (!Dart_IsError(res)) {
+      buf->Printf("\"classId\":%"Pd",", class_id);
+    }
   }
   buf->Printf("\"text\":\"");
   const intptr_t max_chars = 250;
   FormatTextualValue(buf, object, max_chars);
   buf->Printf("\"");
 }
 
 
 static void FormatValueObj(dart::TextBuffer* buf, Dart_Handle object) {
   buf->Printf("{");
@@ skipping 920 matching lines @@
 
 
 void DbgMsgQueueList::BptResolvedHandler(Dart_IsolateId isolate_id,
                                          intptr_t bp_id,
                                          const Dart_CodeLocation& location) {
   Dart_EnterScope();
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"breakpointResolved\", \"params\": {");
   msg.Printf("\"breakpointId\": %"Pd"", bp_id);
 
-  // TODO(hausner): remove url and line elements.
-  msg.Printf(", \"url\":");
-  FormatEncodedString(&msg, location.script_url);
-  int line_number = GetIntValue(Dart_GetBreakpointLine(bp_id));
-  msg.Printf(",\"line\":%d", line_number);
-
   msg.Printf(", \"isolateId\":%"Pd64"", isolate_id);
   ASSERT(!Dart_IsNull(location.script_url));
   ASSERT(Dart_IsString(location.script_url));
   msg.Printf(", \"location\":{\"url\":");
   FormatEncodedString(&msg, location.script_url);
   msg.Printf(",\"libraryId\":%d", location.library_id);
   msg.Printf(",\"tokenOffset\":%d}}}", location.token_pos);
 
   DbgMsgQueue* msg_queue = GetIsolateMsgQueue(isolate_id);
   ASSERT(msg_queue != NULL);
@@ skipping 43 matching lines @@
     msg_queue->SendIsolateEvent(isolate_id, kind);
     if (kind == kInterrupted) {
       msg_queue->HandleMessages();
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }