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

vm/compiler.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/compiler.h"
 
 #include "vm/assembler.h"
 #include "vm/ast_printer.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 355 matching lines @@
     isolate->set_long_jump_base(base);
     return Error::null();
   }
   if (setjmp(*jump.Set()) == 0) {
     TIMERSCOPE(time_compilation);
     ParsedFunction parsed_function(function);
     if (FLAG_trace_compiler) {
       OS::Print("Compiling %sfunction: '%s' @ token %d\n",
                 (optimized ? "optimized " : ""),
                 function.ToFullyQualifiedCString(),
-                function.token_index());
+                function.token_pos());
     }
     Parser::ParseFunction(&parsed_function);
     parsed_function.AllocateVariables();
 
     CompileParsedFunctionHelper(parsed_function, optimized);
 
     if (FLAG_trace_compiler) {
       OS::Print("--> '%s' entry: 0x%x\n",
                 function.ToFullyQualifiedCString(),
                 Code::Handle(function.CurrentCode()).EntryPoint());
@@ skipping 147 matching lines @@
       AstPrinter::PrintNode(fragment);
     }
 
     // Create a dummy function object for the code generator.
     const char* kEvalConst = "eval_const";
     const Function& func = Function::Handle(Function::New(
         String::Handle(String::NewSymbol(kEvalConst)),
         RawFunction::kConstImplicitGetter,
         true,  // static function.
         false,  // not const function.
-        fragment->token_index()));
+        fragment->token_pos()));
 
     func.set_result_type(Type::Handle(Type::DynamicType()));
     func.set_num_fixed_parameters(0);
     func.set_num_optional_parameters(0);
 
     // The function needs to be associated with a named Class: the interface
     // Function fits the bill.
     func.set_owner(Class::Handle(
         Type::Handle(Type::FunctionInterface()).type_class()));
 
@@ skipping 24 matching lines @@
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 
 }  // namespace dart