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

vm/intermediate_language.cc

Index: vm/intermediate_language.cc
===================================================================
--- vm/intermediate_language.cc	(revision 9036)
+++ vm/intermediate_language.cc	(working copy)
@@ -929,7 +929,7 @@
   if (HasICData()) {
     ASSERT(original() != NULL);
     Label* deopt = compiler->AddDeoptStub(original()->cid(),
-                                          original()->token_index(),
+                                          original()->token_pos(),
                                           original()->try_index(),
                                           kDeoptInstanceGetterSameTarget,
                                           instance_reg,
@@ -957,7 +957,7 @@
 void ThrowInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   ASSERT(exception()->IsUse());
   compiler->GenerateCallRuntime(cid(),
-                                token_index(),
+                                token_pos(),
                                 try_index(),
                                 kThrowRuntimeEntry);
   __ int3();
@@ -975,7 +975,7 @@
   ASSERT(exception()->IsUse());
   ASSERT(stack_trace()->IsUse());
   compiler->GenerateCallRuntime(cid(),
-                                token_index(),
+                                token_pos(),
                                 try_index(),
                                 kReThrowRuntimeEntry);
   __ int3();
@@ -1118,7 +1118,7 @@
                                          argument_names());
   __ LoadObject(temp_reg, arguments_descriptor);
 
-  compiler->GenerateCall(token_index(),
+  compiler->GenerateCall(token_pos(),
                          try_index(),
                          &StubCode::CallClosureFunctionLabel(),
                          PcDescriptors::kOther);
@@ -1135,10 +1135,10 @@
   ASSERT(VerifyCallComputation(this));
   compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
                                  cid(),
-                                 token_index(),
+                                 token_pos(),
                                  try_index());
   compiler->GenerateInstanceCall(cid(),
-                                 token_index(),
+                                 token_pos(),
                                  try_index(),
                                  function_name(),
                                  ArgumentCount(),
@@ -1165,7 +1165,7 @@
     // Falls through to static call when operand type is not double or smi.
   }
   compiler->GenerateStaticCall(cid(),
-                               token_index(),
+                               token_pos(),
                                try_index(),
                                function(),
                                ArgumentCount(),
@@ -1186,7 +1186,7 @@
 
 void AssertAssignableComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   compiler->GenerateAssertAssignable(cid(),
-                                     token_index(),
+                                     token_pos(),
                                      try_index(),
                                      dst_type(),
                                      dst_name());
@@ -1279,7 +1279,7 @@
   const Class& cls = Class::ZoneHandle(constructor().owner());
   const Code& stub = Code::Handle(StubCode::GetAllocationStubForClass(cls));
   const ExternalLabel label(cls.ToCString(), stub.EntryPoint());
-  compiler->GenerateCall(token_index(),
+  compiler->GenerateCall(token_pos(),
                          try_index(),
                          &label,
                          PcDescriptors::kOther);
@@ -1297,7 +1297,7 @@
   const Code& stub = Code::Handle(
       StubCode::GetAllocationStubForClosure(closure_function));
   const ExternalLabel label(closure_function.ToCString(), stub.EntryPoint());
-  compiler->GenerateCall(token_index(), try_index(), &label,
+  compiler->GenerateCall(token_pos(), try_index(), &label,
                          PcDescriptors::kOther);
   __ Drop(2);  // Discard type arguments and receiver.
 }