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

vm/ast_printer.cc

 // Copyright (c) 2011, 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/ast_printer.h"
 
 #include "vm/handles.h"
 #include "vm/object.h"
 #include "vm/os.h"
 #include "vm/parser.h"
@@ skipping 384 matching lines @@
       OS::Print(" alias");
     }
     if (var->HasIndex()) {
       OS::Print(" @%d", var->index());
       if (var->is_captured()) {
         OS::Print(" ctx %d", var->owner()->context_level());
       }
     } else if (var->owner()->function_level() != 0) {
       OS::Print(" lev %d", var->owner()->function_level());
     }
-    OS::Print(" valid %d-%d)", var->token_index(), scope->end_token_index());
+    OS::Print(" valid %d-%d)", var->token_pos(), scope->end_token_pos());
   }
   const LocalScope* child = scope->child();
   while (child != NULL) {
     OS::Print("{scope 0x%x ", child);
     if (child->HasContextLevel()) {
       OS::Print("ctx %d numctxvar %d ",
                 child->context_level(),
                 child->num_context_variables());
     }
     OS::Print("llev %d ", child->loop_level());
@@ skipping 39 matching lines @@
       const Object& default_parameter_value = Object::Handle(
           default_parameter_values.At(pos - num_fixed_params));
       OS::Print(" =%s", default_parameter_value.ToCString());
     }
     if (param->HasIndex()) {
       OS::Print(" @%d", param->index());
       if (param->is_captured()) {
         OS::Print(" ctx %d", param->owner()->context_level());
       }
     }
-    OS::Print(" valid %d-%d)", param->token_index(), scope->end_token_index());
+    OS::Print(" valid %d-%d)", param->token_pos(), scope->end_token_pos());
     pos++;
   }
   // Visit remaining non-parameter variables and children scopes.
   PrintLocalScope(scope, pos);
   OS::Print("}\n");
 }
 
 
 void AstPrinter::PrintFunctionNodes(const ParsedFunction& parsed_function) {
   HANDLESCOPE(Isolate::Current());
   SequenceNode* node_sequence = parsed_function.node_sequence();
   ASSERT(node_sequence != NULL);
   AstPrinter ast_printer;
   const char* function_name =
       parsed_function.function().ToFullyQualifiedCString();
   OS::Print("Ast for function '%s' {\n", function_name);
   node_sequence->Visit(&ast_printer);
   OS::Print("}\n");
 }
 
 }  // namespace dart