Make the parser agnostic to the TokenStream implementation. This is the first step towards compacti…

vm/scopes.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/scopes.h"
 
 #include "vm/ast.h"
 #include "vm/bit_vector.h"
 #include "vm/object.h"
 #include "vm/parser.h"
@@ skipping 12 matching lines @@
 
 
 LocalScope::LocalScope(LocalScope* parent, int function_level, int loop_level)
     : parent_(parent),
       child_(NULL),
       sibling_(NULL),
       function_level_(function_level),
       loop_level_(loop_level),
       context_level_(LocalScope::kUnitializedContextLevel),
       num_context_variables_(0),
-      begin_token_index_(0),
-      end_token_index_(0),
+      begin_token_pos_(0),
+      end_token_pos_(0),
       variables_(),
       labels_() {
   // Hook this node into the children of the parent, unless the parent has a
   // different function_level, since the local scope of a nested function can
   // be discarded after it has been parsed.
   if ((parent != NULL) && (parent->function_level() == function_level)) {
     sibling_ = parent->child_;
     parent->child_ = this;
   }
 }
@@ skipping 143 matching lines @@
   // First enter all variables from scopes of outer functions.
   const ContextScope& context_scope =
       ContextScope::Handle(func.context_scope());
   if (!context_scope.IsNull()) {
     ASSERT(func.IsLocalFunction());
     for (int i = 0; i < context_scope.num_variables(); i++) {
       VarDesc desc;
       desc.name = &String::Handle(context_scope.NameAt(i));
       desc.info.kind =  RawLocalVarDescriptors::kContextVar;
       desc.info.scope_id = context_scope.ContextLevelAt(i);
-      desc.info.begin_pos = begin_token_index();
-      desc.info.end_pos = end_token_index();
+      desc.info.begin_pos = begin_token_pos();
+      desc.info.end_pos = end_token_pos();
       desc.info.index = context_scope.ContextIndexAt(i);
       vars.Add(desc);
     }
   }
   // Now collect all variables from local scopes.
   int16_t scope_id = 0;
   CollectLocalVariables(&vars, &scope_id);
 
   const LocalVarDescriptors& var_desc =
       LocalVarDescriptors::Handle(LocalVarDescriptors::New(vars.length()));
@@ skipping 12 matching lines @@
   if (HasContextLevel() &&
       ((parent() == NULL) ||
       (!parent()->HasContextLevel()) ||
       (parent()->context_level() != context_level()))) {
     // This is the outermost scope with a context level or this scope's
     // context level differes from its parent's level.
     VarDesc desc;
     desc.name = &String::Handle();  // No name.
     desc.info.kind =  RawLocalVarDescriptors::kContextLevel;
     desc.info.scope_id = *scope_id;
-    desc.info.begin_pos = begin_token_index();
-    desc.info.end_pos = end_token_index();
+    desc.info.begin_pos = begin_token_pos();
+    desc.info.end_pos = end_token_pos();
     desc.info.index = context_level();
     vars->Add(desc);
   }
   for (int i = 0; i < this->variables_.length(); i++) {
     LocalVariable* var = variables_[i];
     if (var->owner() == this) {
       if (Scanner::IsIdent(var->name())) {
         // This is a regular Dart variable, either stack-based or captured.
         VarDesc desc;
         desc.name = &var->name();
         if (var->is_captured()) {
           desc.info.kind = RawLocalVarDescriptors::kContextVar;
           ASSERT(var->owner() != NULL);
           ASSERT(var->owner()->context_level() >= 0);
           desc.info.scope_id = var->owner()->context_level();
         } else {
           desc.info.kind = RawLocalVarDescriptors::kStackVar;
           desc.info.scope_id = *scope_id;
         }
-        desc.info.begin_pos = var->token_index();
-        desc.info.end_pos = var->owner()->end_token_index();
+        desc.info.begin_pos = var->token_pos();
+        desc.info.end_pos = var->owner()->end_token_pos();
         desc.info.index = var->index();
         vars->Add(desc);
       } else if (var->name().Equals(LocalVariable::kSavedContextVarName)) {
         // This is the local variable in which the function saves the
         // caller's chain of closure contexts (caller's CTX register).
         VarDesc desc;
         desc.name = &var->name();
         desc.info.kind = RawLocalVarDescriptors::kContextChain;
         desc.info.scope_id = 0;
         desc.info.begin_pos = 0;
@@ skipping 179 matching lines @@
   const ContextScope& context_scope =
       ContextScope::Handle(ContextScope::New(num_captured_vars));
 
   // Create a descriptor for each referenced captured variable of enclosing
   // functions to preserve its name and its context allocation information.
   int captured_idx = 0;
   for (int i = 0; i < num_variables(); i++) {
     LocalVariable* variable = VariableAt(i);
     // Preserve the aliases of captured variables belonging to outer scopes.
     if (variable->owner()->function_level() != 1) {
-      context_scope.SetTokenIndexAt(captured_idx, variable->token_index());
+      context_scope.SetTokenIndexAt(captured_idx, variable->token_pos());
       context_scope.SetNameAt(captured_idx, variable->name());
       context_scope.SetIsFinalAt(captured_idx, variable->is_final());
       context_scope.SetTypeAt(captured_idx, variable->type());
       context_scope.SetContextIndexAt(captured_idx, variable->index());
       // Adjust the context level relative to the current context level,
       // since the context of the current scope will be at level 0 when
       // compiling the nested function.
       int adjusted_context_level =
           variable->owner()->context_level() - current_context_level;
       context_scope.SetContextLevelAt(captured_idx, adjusted_context_level);
@@ skipping 33 matching lines @@
 
 RawContextScope* LocalScope::CreateImplicitClosureScope(const Function& func) {
   static const intptr_t kNumCapturedVars = 1;
 
   // Create a ContextScope with space for kNumCapturedVars descriptors.
   const ContextScope& context_scope =
       ContextScope::Handle(ContextScope::New(kNumCapturedVars));
 
   // Create a descriptor for 'this' variable.
   const String& name = String::Handle(String::NewSymbol("this"));
-  context_scope.SetTokenIndexAt(0, func.token_index());
+  context_scope.SetTokenIndexAt(0, func.token_pos());
   context_scope.SetNameAt(0, name);
   context_scope.SetIsFinalAt(0, true);
   const AbstractType& type = AbstractType::Handle(func.ParameterTypeAt(0));
   context_scope.SetTypeAt(0, type);
   context_scope.SetContextIndexAt(0, 0);
   context_scope.SetContextLevelAt(0, 0);
   ASSERT(context_scope.num_variables() == kNumCapturedVars);  // Verify count.
   return context_scope.raw();
 }
 
@@ skipping 25 matching lines @@
   } else {
     // Shift negative indexes so that the lowest one is 0 (they are still
     // non-positive) and index them backward from the end of the vector.
     return (var_count - 1) +
         (index() - ParsedFunction::kFirstLocalSlotIndex);
   }
 }
 
 
 }  // namespace dart