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

vm/flow_graph_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/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/debugger.h"
 #include "vm/il_printer.h"
@@ skipping 130 matching lines @@
 
 void FlowGraphCompiler::AddExceptionHandler(intptr_t try_index,
                                             intptr_t pc_offset) {
   exception_handlers_list_->AddHandler(try_index, pc_offset);
 }
 
 
 // Uses current pc position and try-index.
 void FlowGraphCompiler::AddCurrentDescriptor(PcDescriptors::Kind kind,
                                              intptr_t cid,
-                                             intptr_t token_index,
+                                             intptr_t token_pos,
                                              intptr_t try_index) {
   ASSERT((kind != PcDescriptors::kDeopt) ||
          frame_register_allocator()->IsSpilled());
   pc_descriptors_list()->AddDescriptor(kind,
                                        assembler()->CodeSize(),
                                        cid,
-                                       token_index,
+                                       token_pos,
                                        try_index);
 }
 
 
 Label* FlowGraphCompiler::AddDeoptStub(intptr_t deopt_id,
-                                       intptr_t deopt_token_index,
+                                       intptr_t deopt_token_pos,
                                        intptr_t try_index,
                                        DeoptReasonId reason,
                                        Register reg1,
                                        Register reg2,
                                        Register reg3) {
   DeoptimizationStub* stub =
-      new DeoptimizationStub(deopt_id, deopt_token_index, try_index, reason);
+      new DeoptimizationStub(deopt_id, deopt_token_pos, try_index, reason);
   frame_register_allocator()->SpillInDeoptStub(stub);
   if (reg1 != kNoRegister) stub->Push(reg1);
   if (reg2 != kNoRegister) stub->Push(reg2);
   if (reg3 != kNoRegister) stub->Push(reg3);
   deopt_stubs_.Add(stub);
   return stub->entry_label();
 }
 
 
 void FlowGraphCompiler::FinalizeExceptionHandlers(const Code& code) {
@@ skipping 81 matching lines @@
   // generated, it may fall through to the non-intrinsified method body.
   if (!FLAG_trace_functions) {
     return Intrinsifier::Intrinsify(parsed_function().function(), assembler());
   }
   return false;
 }
 
 
 void FlowGraphCompiler::GenerateInstanceCall(
     intptr_t cid,
-    intptr_t token_index,
+    intptr_t token_pos,
     intptr_t try_index,
     const String& function_name,
     intptr_t argument_count,
     const Array& argument_names,
     intptr_t checked_argument_count) {
   ASSERT(frame_register_allocator()->IsSpilled());
   ICData& ic_data =
       ICData::ZoneHandle(ICData::New(parsed_function().function(),
                                      function_name,
                                      cid,
@@ skipping 13 matching lines @@
   }
   ExternalLabel target_label("InlineCache", label_address);
 
   const intptr_t descr_offset = EmitInstanceCall(&target_label,
                                                  ic_data,
                                                  arguments_descriptor,
                                                  argument_count);
   pc_descriptors_list()->AddDescriptor(PcDescriptors::kIcCall,
                                        descr_offset,
                                        cid,
-                                       token_index,
+                                       token_pos,
                                        try_index);
 }
 
 
 void FlowGraphCompiler::GenerateStaticCall(intptr_t cid,
-                                           intptr_t token_index,
+                                           intptr_t token_pos,
                                            intptr_t try_index,
                                            const Function& function,
                                            intptr_t argument_count,
                                            const Array& argument_names) {
   ASSERT(frame_register_allocator()->IsSpilled());
 
   const Array& arguments_descriptor =
       CodeGenerator::ArgumentsDescriptor(argument_count, argument_names);
   const intptr_t descr_offset = EmitStaticCall(function,
                                                arguments_descriptor,
                                                argument_count);
   pc_descriptors_list()->AddDescriptor(PcDescriptors::kFuncCall,
                                        descr_offset,
                                        cid,
-                                       token_index,
+                                       token_pos,
                                        try_index);
 }
 
 
 void FlowGraphCompiler::GenerateNumberTypeCheck(Register kClassIdReg,
                                                 const AbstractType& type,
                                                 Label* is_instance_lbl,
                                                 Label* is_not_instance_lbl) {
   GrowableArray<intptr_t> args;
   if (type.IsNumberInterface()) {
@@ skipping 43 matching lines @@
   assembler()->Comment("@%d: %s", instr->cid(), buffer);
 }
 
 
 void FlowGraphCompiler::EmitLoadIndexedGeneric(LoadIndexedComp* comp) {
   const String& function_name =
       String::ZoneHandle(String::NewSymbol(Token::Str(Token::kINDEX)));
 
   AddCurrentDescriptor(PcDescriptors::kDeopt,
                        comp->cid(),
-                       comp->token_index(),
+                       comp->token_pos(),
                        comp->try_index());
 
   const intptr_t kNumArguments = 2;
   const intptr_t kNumArgsChecked = 1;  // Type-feedback.
   GenerateInstanceCall(comp->cid(),
-                       comp->token_index(),
+                       comp->token_pos(),
                        comp->try_index(),
                        function_name,
                        kNumArguments,
                        Array::ZoneHandle(),  // No optional arguments.
                        kNumArgsChecked);
 }
 
 
 void FlowGraphCompiler::EmitTestAndCall(const ICData& ic_data,
                                         Register class_id_reg,
@@ skipping 200 matching lines @@
 
 
 void FrameRegisterAllocator::SpillInDeoptStub(DeoptimizationStub* stub) {
   for (int i = 0; i < stack_.length(); i++) {
     stub->Push(stack_[i]);
   }
 }
 
 
 }  // namespace dart