runtime/vm/debugger.cc - Issue 216883008: Use tokenPos instead of line/col in the vm service.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: runtime/vm/debugger.cc

Issue 216883008: Use tokenPos instead of line/col in the vm service. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« runtime/bin/vmservice/client/lib/src/elements/script_ref.dart ('K') | « runtime/bin/vmservice/client/lib/src/service/object.dart ('k') | runtime/vm/object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: runtime/vm/debugger.cc

diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc

index 00ea8f8211b62097423e95146c4e531a864dd98a..3d487b22b7021c0fd480252d57296005f6a8abcc 100644

--- a/runtime/vm/debugger.cc

+++ b/runtime/vm/debugger.cc

@@ -710,18 +710,11 @@ const char* ActivationFrame::ToCString() {

void ActivationFrame::PrintToJSONObject(JSONObject* jsobj) {

- intptr_t line = LineNumber();

const Script& script = Script::Handle(SourceScript());

jsobj->AddProperty("script", script);

- jsobj->AddProperty("line", line);

- jsobj->AddProperty("col", ColumnNumber());

+ jsobj->AddProperty("tokenPos", TokenPos());

jsobj->AddProperty("function", function());

jsobj->AddProperty("code", code());

- // TODO(turnidge): Consider dropping lineString from the frame.

- String& line_string = String::Handle(script.GetLine(line));

- jsobj->AddProperty("lineString", line_string.ToCString());

{

JSONArray jsvars(jsobj, "vars");

const int num_vars = NumLocalVariables();