Better breakpoint management

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/bigint_operations.h"
@@ skipping 5082 matching lines @@
   intptr_t src_pos = tkns.ComputeSourcePosition(token_pos);
   Scanner scanner(src, dummy_key);
   scanner.ScanTo(src_pos);
   *line = scanner.CurrentPosition().line;
   *column = scanner.CurrentPosition().column;
 }
 
 
 void Script::TokenRangeAtLine(intptr_t line_number,
                               intptr_t* first_token_index,
                               intptr_t* last_token_index) const {

[siva, 2012/07/30 22:17:15]

Something to consider for later, not this CL:

we should agree on what token_index and token_pos mean and use these names
consistently everywhere.
I have always thought of token_index as something which represents an index into
the token stream object for the token and token_pos to mean the position of the
token in the source (we could also call it token_src_pos).
In this scheme the signature of scanner.TokenRangeAtLine would document the
paramters as first_token_pos and last_token_pos.
 

[hausner, 2012/07/30 22:36:57]

I agree. I was confused too and didn't realize that the token_index_ in
PCDescriptors is now actually an offset into the token "blob."

I would suggest to consistently use "index" for the token number in the source,
and pos for the offset into the token blob. The textual position (line, col, or
character index in the text) is also a pos, but token_pos is not the same as
text_pos. Am I making it confusing enough?

Definitely separate change.

 

On 2012/07/30 22:17:15, asiva wrote:

-  intptr_t first_src_pos;
-  intptr_t last_src_pos;
   const String& src = String::Handle(Source());
   const String& dummy_key = String::Handle(Symbols::Empty());
   const TokenStream& tkns = TokenStream::Handle(tokens());
   Scanner scanner(src, dummy_key);
-  scanner.TokenRangeAtLine(line_number, &first_src_pos, &last_src_pos);
-  *first_token_index = tkns.ComputeTokenPosition(first_src_pos);
-  *last_token_index = tkns.ComputeTokenPosition(last_src_pos);
+  scanner.TokenRangeAtLine(line_number, first_token_index, last_token_index);
+  if (*first_token_index >= 0) {
+    *first_token_index = tkns.ComputeTokenPosition(*first_token_index);
+  }
+  if (*last_token_index >= 0) {
+    *last_token_index = tkns.ComputeTokenPosition(*last_token_index);
+  }
 }
 
 
 RawString* Script::GetLine(intptr_t line_number) const {
   const String& src = String::Handle(Source());
   intptr_t current_line = 1;
   intptr_t line_start = -1;
   intptr_t last_char = -1;
   for (intptr_t ix = 0;
        (ix < src.Length()) && (current_line <= line_number);
@@ skipping 5728 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart