Switch to using SourceLocation universally in service protocol.

runtime/vm/debugger.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 "vm/debugger.h"
 
 #include "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 181 matching lines @@
   jsobj.AddProperty("type", "Breakpoint");
 
   jsobj.AddFixedServiceId("breakpoints/%" Pd "", id());
   jsobj.AddProperty("breakpointNumber", id());
   jsobj.AddProperty("resolved", bpt_location_->IsResolved());
 
   Library& library = Library::Handle(isolate);
   Script& script = Script::Handle(isolate);
   intptr_t token_pos;
   bpt_location_->GetCodeLocation(&library, &script, &token_pos);
-  {
-    JSONObject location(&jsobj, "location");
-    location.AddProperty("type", "Location");
-    location.AddProperty("script", script);
-    location.AddProperty("tokenPos", token_pos);
-  }
+  jsobj.AddLocation(script, token_pos);
 }
 
 
 void CodeBreakpoint::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   visitor->VisitPointer(reinterpret_cast<RawObject**>(&code_));
 }
 
 
 ActivationFrame::ActivationFrame(
     uword pc,
@@ skipping 779 matching lines @@
                     line,
                     ctx_.ToCString(),
                     ContextLevel());
 }
 
 
 void ActivationFrame::PrintToJSONObject(JSONObject* jsobj,
                                         bool full) {
   const Script& script = Script::Handle(SourceScript());
   jsobj->AddProperty("type", "Frame");
-  jsobj->AddProperty("script", script, !full);
-  jsobj->AddProperty("tokenPos", TokenPos());
+  jsobj->AddLocation(script, TokenPos());
   jsobj->AddProperty("function", function(), !full);
   jsobj->AddProperty("code", code());
+  if (full) {
+    // TODO(cutch): The old "full" script usage no longer fits
+    // in the world where we pass the script as part of the
+    // location.
+    jsobj->AddProperty("script", script, !full);
+  }
   {
     JSONArray jsvars(jsobj, "vars");
     const int num_vars = NumLocalVariables();
     for (intptr_t v = 0; v < num_vars; v++) {
       JSONObject jsvar(&jsvars);
       String& var_name = String::Handle();
       Instance& var_value = Instance::Handle();
       intptr_t token_pos;
       intptr_t end_token_pos;
       VariableAt(v, &var_name, &token_pos, &end_token_pos, &var_value);
       jsvar.AddProperty("name", var_name.ToCString());
       jsvar.AddProperty("value", var_value, !full);
-      jsvar.AddProperty("tokenPos", token_pos);
-      jsvar.AddProperty("endTokenPos", end_token_pos);
+      // TODO(turnidge): Do we really want to provide this on every
+      // stack dump?  Should be associated with the function object, I
+      // think, and not the stack frame.
+      jsvar.AddProperty("_tokenPos", token_pos);
+      jsvar.AddProperty("_endTokenPos", end_token_pos);
     }
   }
 }
 
 
 
 void DebuggerStackTrace::AddActivation(ActivationFrame* frame) {
   if (FLAG_show_invisible_frames || frame->function().is_visible()) {
     trace_.Add(frame);
   }
@@ skipping 1890 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart