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

vm/flow_graph_builder.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_BUILDER_H_
 #define VM_FLOW_GRAPH_BUILDER_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 119 matching lines @@
   Computation* BuildLoadLocal(const LocalVariable& local);
 
   // Helpers for translating parts of the AST.
   void TranslateArgumentList(const ArgumentListNode& node,
                              ZoneGrowableArray<Value*>* values);
 
   // Creates an instantiated type argument vector used in preparation of an
   // allocation call.
   // May be called only if allocating an object of a parameterized class.
   BindInstr* BuildInstantiatedTypeArguments(
-      intptr_t token_index,
+      intptr_t token_pos,
       const AbstractTypeArguments& type_arguments);
 
   // Creates a possibly uninstantiated type argument vector and the type
   // argument vector of the instantiator (two values in 'args') used in
   // preparation of a constructor call.
   // May be called only if allocating an object of a parameterized class.
   void BuildConstructorTypeArguments(ConstructorCallNode* node,
                                      ZoneGrowableArray<Value*>* args);
 
-  void BuildTypecheckArguments(intptr_t token_index,
+  void BuildTypecheckArguments(intptr_t token_pos,
                                Value** instantiator,
                                Value** instantiator_type_arguments);
   Value* BuildInstantiator();
-  Value* BuildInstantiatorTypeArguments(intptr_t token_index,
+  Value* BuildInstantiatorTypeArguments(intptr_t token_pos,
                                         Value* instantiator);
 
   // Perform a type check on the given value.
-  AssertAssignableComp* BuildAssertAssignable(intptr_t token_index,
+  AssertAssignableComp* BuildAssertAssignable(intptr_t token_pos,
                                               Value* value,
                                               const AbstractType& dst_type,
                                               const String& dst_name);
 
   // Perform a type check on the given value and return it.
-  Value* BuildAssignableValue(intptr_t token_index,
+  Value* BuildAssignableValue(intptr_t token_pos,
                               Value* value,
                               const AbstractType& dst_type,
                               const String& dst_name);
 
   void BuildStoreIndexedValues(StoreIndexedNode* node,
                                Value** array,
                                Value** index,
                                Value** value);
   void BuildInstanceSetterValues(InstanceSetterNode* node,
                                  Value** receiver,
@@ skipping 107 matching lines @@
 //
 // To distinguish between the graphs with only nonlocal exits and graphs
 // with both true and false exits, there are a pair of TargetEntryInstr**:
 //
 //   - Both NULL: only non-local exits, truly closed
 //   - Neither NULL: true and false successors at the given addresses
 //
 // We expect that AstNode in test contexts either have only nonlocal exits
 // or else control flow has both true and false successors.
 //
-// The cis and token_index are used in checked mode to verify that the
+// The cis and token_pos are used in checked mode to verify that the
 // condition of the test is of type bool.
 class TestGraphVisitor : public ValueGraphVisitor {
  public:
   TestGraphVisitor(FlowGraphBuilder* owner,
                    intptr_t temp_index,
-                   intptr_t condition_token_index)
+                   intptr_t condition_token_pos)
       : ValueGraphVisitor(owner, temp_index),
         true_successor_address_(NULL),
         false_successor_address_(NULL),
-        condition_token_index_(condition_token_index) {
+        condition_token_pos_(condition_token_pos) {
   }
 
   TargetEntryInstr** true_successor_address() const {
     ASSERT(true_successor_address_ != NULL);
     return true_successor_address_;
   }
   TargetEntryInstr** false_successor_address() const {
     ASSERT(false_successor_address_ != NULL);
     return false_successor_address_;
   }
 
-  intptr_t condition_token_index() const { return condition_token_index_; }
+  intptr_t condition_token_pos() const { return condition_token_pos_; }
 
  private:
   // Construct and concatenate a Branch instruction to this graph fragment.
   // Closes the fragment and sets the output parameters.
   virtual void ReturnValue(Value* value);
 
   // Output parameters.
   TargetEntryInstr** true_successor_address_;
   TargetEntryInstr** false_successor_address_;
 
-  intptr_t condition_token_index_;
+  intptr_t condition_token_pos_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_