Use tokenPos instead of line/col in the vm service.

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 3843 matching lines @@
   jsobj.AddProperty("patch", is_patch());
   jsobj.AddProperty("finalized", is_finalized());
   jsobj.AddProperty("const", is_const());
   const Class& superClass = Class::Handle(SuperClass());
   if (!superClass.IsNull()) {
     jsobj.AddProperty("super", superClass);
   }
   jsobj.AddProperty("library", Object::Handle(library()));
   const Script& script = Script::Handle(this->script());
   if (!script.IsNull()) {
-    intptr_t line_number = 0;
-    intptr_t column_number = 0;
-    script.GetTokenLocation(token_pos(), &line_number, &column_number);
     jsobj.AddProperty("script", script);
-    jsobj.AddProperty("line", line_number);
-    jsobj.AddProperty("col", column_number);
+    jsobj.AddProperty("tokenPos", token_pos());
   }
   {
     JSONArray interfaces_array(&jsobj, "interfaces");
     const Array& interface_array = Array::Handle(interfaces());
     Type& interface_type = Type::Handle();
     Class& interface_cls = Class::Handle();
     if (!interface_array.IsNull()) {
       for (intptr_t i = 0; i < interface_array.Length(); ++i) {
         // TODO(turnidge): Use the Type directly once regis has added
         // types to the vmservice.
@@ skipping 2531 matching lines @@
   jsobj.AddProperty("unoptimized_code", Object::Handle(unoptimized_code()));
   jsobj.AddProperty("usage_counter", usage_counter());
   jsobj.AddProperty("optimized_call_site_count", optimized_call_site_count());
   jsobj.AddProperty("code", Object::Handle(CurrentCode()));
   jsobj.AddProperty("deoptimizations",
                     static_cast<intptr_t>(deoptimization_counter()));
 
   const Script& script = Script::Handle(this->script());
   if (!script.IsNull()) {
     jsobj.AddProperty("script", script);
-    jsobj.AddProperty("token_pos", token_pos());
-    jsobj.AddProperty("end_token_pos", end_token_pos());
+    jsobj.AddProperty("tokenPos", token_pos());
+    jsobj.AddProperty("endTokenPos", end_token_pos());
   }
 }
 
 
 void ClosureData::set_context_scope(const ContextScope& value) const {
   StorePointer(&raw_ptr()->context_scope_, value.raw());
 }
 
 
 void ClosureData::set_implicit_static_closure(const Instance& closure) const {
@@ skipping 1404 matching lines @@
   result.SetLocationOffset(0, 0);
   return result.raw();
 }
 
 
 const char* Script::ToCString() const {
   return "Script";
 }
 
 
+// See also Dart_ScriptGetTokenInfo.
 void Script::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", JSONType(ref));
   const String& name = String::Handle(url());
   ASSERT(!name.IsNull());
   const String& encoded_url = String::Handle(String::EncodeURI(name));
   ASSERT(!encoded_url.IsNull());
   jsobj.AddPropertyF("id", "scripts/%s", encoded_url.ToCString());
   jsobj.AddProperty("name", name.ToCString());
   jsobj.AddProperty("user_name", name.ToCString());
   jsobj.AddProperty("kind", GetKindAsCString());
   if (ref) {
     return;
   }
   const String& source = String::Handle(Source());
   jsobj.AddProperty("source", source.ToCString());
+
+  // Print the line number table
+  {
+    JSONArray tokenPosTable(&jsobj, "tokenPosTable");
+
+    const TokenStream& tokenStream = TokenStream::Handle(tokens());
+    ASSERT(!tokenStream.IsNull());
+    TokenStream::Iterator tokens(tokenStream, 0);
+
+    const String& key = Symbols::Empty();
+    Scanner scanner(source, key);
+    scanner.Scan();
+    while (scanner.current_token().kind != Token::kEOS) {
+      ASSERT(tokens.IsValid());
+      ASSERT(scanner.current_token().kind == tokens.CurrentTokenKind());
+      int current_line = scanner.current_token().position.line;
+
+      // Each entry begins with a line number...
+      JSONArray lineInfo(&tokenPosTable);
+      lineInfo.AddValue(current_line + line_offset());
+
+      // ...and is followed by (token offset, col number) pairs.
+      //
+      // TODO(hausner): Could optimize here by not reporting tokens
+      // that will never be a location used by the debugger, e.g.
+      // braces, semicolons, most keywords etc.
+      while (scanner.current_token().kind != Token::kEOS) {
+        ASSERT(tokens.IsValid());
+        ASSERT(scanner.current_token().kind == tokens.CurrentTokenKind());
+
+        int token_line = scanner.current_token().position.line;
+        if (token_line != current_line) {
+          // We have hit a new line.  Break to the outer loop.
+          break;
+        }
+        lineInfo.AddValue(tokens.CurrentPosition());
+
+        intptr_t column = scanner.current_token().position.column;
+        if (token_line == 1) {
+          // On the first line of the script we must add the column offset.
+          column += col_offset();
+        }
+        lineInfo.AddValue(column);
+        scanner.Scan();
+        tokens.Advance();
+      }
+    }
+  }
 }
 
 
 DictionaryIterator::DictionaryIterator(const Library& library)
     : array_(Array::Handle(library.dictionary())),
       // Last element in array is a Smi indicating the number of entries used.
       size_(Array::Handle(library.dictionary()).Length() - 1),
       next_ix_(0) {
   MoveToNextObject();
 }
@@ skipping 10344 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   Instance::PrintToJSONStream(stream, ref);
 }
 
 
 }  // namespace dart