Get rid of ast node ids.

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 "vm/code_generator.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
@@ skipping 175 matching lines @@
     ASSERT(!func.HasOptimizedCode());
     Code& code = Code::Handle(func.unoptimized_code());
     ASSERT(!code.IsNull());
     pc_desc_ = code.pc_descriptors();
     ASSERT(!pc_desc_.IsNull());
   }
 }
 
 
 // Compute token_pos_ and pc_desc_index_.
-intptr_t ActivationFrame::TokenIndex() {
+intptr_t ActivationFrame::TokenPos() {
   if (token_pos_ < 0) {
     GetPcDescriptors();
     for (int i = 0; i < pc_desc_.Length(); i++) {
       if (pc_desc_.PC(i) == pc_) {
         pc_desc_index_ = i;
-        token_pos_ = pc_desc_.TokenIndex(i);
+        token_pos_ = pc_desc_.TokenPos(i);
         break;
       }
     }
     ASSERT(token_pos_ >= 0);
   }
   return token_pos_;
 }
 
 
 intptr_t ActivationFrame::PcDescIndex() {
   if (pc_desc_index_ < 0) {
-    TokenIndex();
+    TokenPos();
     ASSERT(pc_desc_index_ >= 0);
   }
   return pc_desc_index_;
 }
 
 
 intptr_t ActivationFrame::LineNumber() {
   // Compute line number lazily since it causes scanning of the script.
   if (line_number_ < 0) {
     const Script& script = Script::Handle(SourceScript());
     intptr_t ignore_column;
-    script.GetTokenLocation(TokenIndex(), &line_number_, &ignore_column);
+    script.GetTokenLocation(TokenPos(), &line_number_, &ignore_column);
   }
   return line_number_;
 }
 
 
 void ActivationFrame::GetVarDescriptors() {
   if (!var_descriptors_.IsNull()) {
     return;
   }
   ASSERT(!DartFunction().HasOptimizedCode());
   const Code& code = Code::Handle(DartFunction().unoptimized_code());
   var_descriptors_ = code.var_descriptors();
   ASSERT(!var_descriptors_.IsNull());
 }
 
 
 // Calculate the context level at the current token index of the frame.
 intptr_t ActivationFrame::ContextLevel() {
   if (context_level_ < 0) {
     context_level_ = 0;
     intptr_t pc_desc_idx = PcDescIndex();
     ASSERT(!pc_desc_.IsNull());
     if (pc_desc_.DescriptorKind(pc_desc_idx) == PcDescriptors::kReturn) {
       // Special case: the context chain has already been deallocated.
       // The context level is 0.
       return context_level_;
     }
     intptr_t innermost_begin_pos = 0;
-    intptr_t activation_token_pos = TokenIndex();
+    intptr_t activation_token_pos = TokenPos();
     GetVarDescriptors();
     intptr_t var_desc_len = var_descriptors_.Length();
     for (int cur_idx = 0; cur_idx < var_desc_len; cur_idx++) {
       RawLocalVarDescriptors::VarInfo var_info;
       var_descriptors_.GetInfo(cur_idx, &var_info);
       if ((var_info.kind == RawLocalVarDescriptors::kContextLevel) &&
           (var_info.begin_pos <= activation_token_pos) &&
           (activation_token_pos < var_info.end_pos)) {
         // This var_descriptors_ entry is a context scope which is in scope
         // of the current token position. Now check whether it is shadowing
@@ skipping 25 matching lines @@
 }
 
 
 void ActivationFrame::GetDescIndices() {
   if (vars_initialized_) {
     return;
   }
   GetVarDescriptors();
   // TODO(hausner): Consider replacing this GrowableArray.
   GrowableArray<String*> var_names(8);
-  intptr_t activation_token_pos = TokenIndex();
+  intptr_t activation_token_pos = TokenPos();
   intptr_t var_desc_len = var_descriptors_.Length();
   for (int cur_idx = 0; cur_idx < var_desc_len; cur_idx++) {
     ASSERT(var_names.length() == desc_indices_.length());
     RawLocalVarDescriptors::VarInfo var_info;
     var_descriptors_.GetInfo(cur_idx, &var_info);
     if ((var_info.kind != RawLocalVarDescriptors::kStackVar) &&
         (var_info.kind != RawLocalVarDescriptors::kContextVar)) {
       continue;
     }
     if ((var_info.begin_pos <= activation_token_pos) &&
@@ skipping 142 matching lines @@
       pc_(0),
       line_number_(-1),
       is_enabled_(false),
       src_bpt_(NULL),
       next_(NULL) {
   ASSERT(!func.HasOptimizedCode());
   Code& code = Code::Handle(func.unoptimized_code());
   ASSERT(!code.IsNull());  // Function must be compiled.
   PcDescriptors& desc = PcDescriptors::Handle(code.pc_descriptors());
   ASSERT(pc_desc_index < desc.Length());
-  token_pos_ = desc.TokenIndex(pc_desc_index);
+  token_pos_ = desc.TokenPos(pc_desc_index);
   ASSERT(token_pos_ >= 0);
   pc_ = desc.PC(pc_desc_index);
   ASSERT(pc_ != 0);
   breakpoint_kind_ = desc.DescriptorKind(pc_desc_index);
   ASSERT((breakpoint_kind_ == PcDescriptors::kIcCall) ||
          (breakpoint_kind_ == PcDescriptors::kFuncCall) ||
          (breakpoint_kind_ == PcDescriptors::kReturn));
 }
 
 
@@ skipping 355 matching lines @@
   PcDescriptors& desc = PcDescriptors::Handle(code.pc_descriptors());
   // We attempt to find the PC descriptor that is closest to the
   // beginning of the token range, in terms of native code address. If we
   // don't find a PC descriptor within the given range, we pick the
   // nearest one to the beginning of the range, in terms of token position.
   intptr_t best_fit_index = -1;
   intptr_t best_fit = INT_MAX;
   uword lowest_pc = kUwordMax;
   intptr_t lowest_pc_index = -1;
   for (int i = 0; i < desc.Length(); i++) {
-    intptr_t desc_token_pos = desc.TokenIndex(i);
+    intptr_t desc_token_pos = desc.TokenPos(i);
     if (desc_token_pos < first_token_pos) {
       continue;
     }
     PcDescriptors::Kind kind = desc.DescriptorKind(i);
     if ((kind == PcDescriptors::kIcCall) ||
         (kind == PcDescriptors::kFuncCall) ||
         (kind == PcDescriptors::kReturn)) {
       if ((desc_token_pos - first_token_pos) < best_fit) {
         best_fit = desc_token_pos - first_token_pos;
         ASSERT(best_fit >= 0);
@@ skipping 717 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart