Support column-based breakpoints in the VM and Observatory.

runtime/vm/json_stream.cc

 // Copyright (c) 2013, 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 "platform/assert.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/json_stream.h"
 #include "vm/message.h"
@@ skipping 668 matching lines @@
   ASSERT(len == len2);
   stream_->buffer_.AddChar('"');
   stream_->AddEscapedUTF8String(p);
   stream_->buffer_.AddChar('"');
   free(p);
 }
 
 
 void JSONObject::AddLocation(const Script& script,
                              intptr_t token_pos,
-                             intptr_t end_token_pos) {
+                             intptr_t end_token_pos) const {
   JSONObject location(this, "location");
   location.AddProperty("type", "SourceLocation");
   location.AddProperty("script", script);
   location.AddProperty("tokenPos", token_pos);
   if (end_token_pos >= 0) {
     location.AddProperty("endTokenPos", end_token_pos);
   }
 }
 
 
+void JSONObject::AddLocation(const BreakpointLocation* bpt_loc) const {
+  ASSERT(bpt_loc->IsResolved());
+
+  Isolate* isolate = Isolate::Current();
+  Library& library = Library::Handle(isolate);
+  Script& script = Script::Handle(isolate);
+  intptr_t token_pos;
+  bpt_loc->GetCodeLocation(&library, &script, &token_pos);
+  AddLocation(script, token_pos);
+}
+
+
+void JSONObject::AddUnresolvedLocation(
+    const BreakpointLocation* bpt_loc) const {
+  ASSERT(!bpt_loc->IsResolved());
+
+  Isolate* isolate = Isolate::Current();
+  Library& library = Library::Handle(isolate);
+  Script& script = Script::Handle(isolate);
+  intptr_t token_pos;
+  bpt_loc->GetCodeLocation(&library, &script, &token_pos);
+
+  JSONObject location(this, "location");
+  location.AddProperty("type", "UnresolvedSourceLocation");
+  if (!script.IsNull()) {
+    location.AddProperty("script", script);
+  } else {
+    const String& scriptUri = String::Handle(isolate, bpt_loc->url());
+    location.AddPropertyStr("scriptUri", scriptUri);
+  }
+  if (bpt_loc->requested_line_number() >= 0) {
+    // This unresolved breakpoint was specified at a particular line.
+    location.AddProperty("line", bpt_loc->requested_line_number());
+    if (bpt_loc->requested_column_number() >= 0) {
+      location.AddProperty("column",
+                           bpt_loc->requested_column_number());
+    }
+  } else {
+    // This unresolved breakpoint was requested at some function entry.
+    location.AddProperty("tokenPos", token_pos);
+  }
+}
+
 
 void JSONObject::AddPropertyF(const char* name,
                               const char* format, ...) const {
   stream_->PrintPropertyName(name);
   va_list args;
   va_start(args, format);
   intptr_t len = OS::VSNPrint(NULL, 0, format, args);
   va_end(args);
   char* p = reinterpret_cast<char*>(malloc(len+1));
   va_start(args, format);
@@ skipping 18 matching lines @@
   intptr_t len2 = OS::VSNPrint(p, len+1, format, args);
   va_end(args);
   ASSERT(len == len2);
   stream_->buffer_.AddChar('"');
   stream_->AddEscapedUTF8String(p);
   stream_->buffer_.AddChar('"');
   free(p);
 }
 
 }  // namespace dart