Better breakpoint placement

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 "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 4510 matching lines @@
                               intptr_t* column) const {
   const String& src = String::Handle(source());
   const String& dummy_key = String::Handle(String::New(""));
   Scanner scanner(src, dummy_key);
   scanner.ScanTo(token_pos);
   *line = scanner.CurrentPosition().line;
   *column = scanner.CurrentPosition().column;
 }
 
 
-intptr_t Script::TokenIndexAtLine(intptr_t line_number) const {
+void Script::TokenRangeAtLine(intptr_t line_number,
+                              intptr_t* first_token_index,
+                              intptr_t* last_token_index) const {
   const String& src = String::Handle(source());
   const String& dummy_key = String::Handle(String::New(""));
   Scanner scanner(src, dummy_key);
-  return scanner.TokenIndexAtLine(line_number);
+  scanner.TokenRangeAtLine(line_number, first_token_index, 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 141 matching lines @@
   Object& obj = Object::Handle(array_.At(next_ix_));
   while (!obj.IsClass() && HasNext()) {
     next_ix_++;
     obj = array_.At(next_ix_);
   }
 }
 
 
 LibraryPrefixIterator::LibraryPrefixIterator(const Library& library)
     : DictionaryIterator(library) {
-  MoveToNext();
+  Advance();
 }
 
 
 RawLibraryPrefix* LibraryPrefixIterator::GetNext() {
   ASSERT(HasNext());
   int ix = next_ix_++;
   Object& obj = Object::Handle(array_.At(ix));
-  MoveToNext();
+  Advance();
   LibraryPrefix& prefix = LibraryPrefix::Handle();
   prefix ^= obj.raw();
   return prefix.raw();
 }
 
 
-void LibraryPrefixIterator::MoveToNext() {
+void LibraryPrefixIterator::Advance() {
   Object& obj = Object::Handle(array_.At(next_ix_));
   while (!obj.IsLibraryPrefix() && HasNext()) {
     next_ix_++;
     obj = array_.At(next_ix_);
   }
 }
 
 
 void Library::SetName(const String& name) const {
   // Only set name once.
@@ skipping 196 matching lines @@
 
 RawFunction* Library::LookupFunctionInSource(const String& script_url,
                                              intptr_t line_number) const {
   Script& script = Script::Handle(LookupScript(script_url));
   if (script.IsNull()) {
     // The given script url is not loaded into this library.
     return Function::null();
   }
 
   // Determine token position at given line number.
-  intptr_t token_pos_at_line = script.TokenIndexAtLine(line_number);
-  if (token_pos_at_line < 0) {
+  intptr_t first_token_pos, last_token_pos;
+  script.TokenRangeAtLine(line_number, &first_token_pos, &last_token_pos);
+  if (first_token_pos < 0) {
     // Script does not contain the given line number.
     return Function::null();
   }
-
-  return LookupFunctionInScript(script, token_pos_at_line);
+  return LookupFunctionInScript(script, first_token_pos);
 }
 
 
 RawFunction* Library::LookupFunctionInScript(const Script& script,
                                              intptr_t token_pos) const {
   Class& cls = Class::Handle();
   Function& func = Function::Handle();
   ClassDictionaryIterator it(*this);
   while (it.HasNext()) {
     cls = it.GetNextClass();
@@ skipping 5296 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