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

vm/scopes.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_SCOPES_H_
 #define VM_SCOPES_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/growable_array.h"
 
 namespace dart {
 
 class BitVector;
 class JoinEntryInstr;
 class LocalScope;
 class LocalVariable;
 class SourceLabel;
 
 
 class LocalVariable : public ZoneAllocated {
  public:
-  LocalVariable(intptr_t token_index,
+  LocalVariable(intptr_t token_pos,
                 const String& name,
                 const AbstractType& type)
-    : token_index_(token_index),
+    : token_pos_(token_pos),
       name_(name),
       owner_(NULL),
       type_(type),
       is_final_(false),
       is_captured_(false),
       is_invisible_(false),
       index_(LocalVariable::kUnitializedIndex) {
     ASSERT(type.IsZoneHandle());
     ASSERT(type.IsFinalized());
   }
 
-  intptr_t token_index() const { return token_index_; }
+  intptr_t token_pos() const { return token_pos_; }
   const String& name() const { return name_; }
   LocalScope* owner() const { return owner_; }
   void set_owner(LocalScope* owner) {
     ASSERT(owner_ == NULL);
     owner_ = owner;
   }
 
   const AbstractType& type() const { return type_; }
 
   bool is_final() const { return is_final_; }
@@ skipping 29 matching lines @@
   // all parameters.
   int BitIndexIn(intptr_t var_count) const;
 
   // Name of the internal variable that is used to save the context chain
   // on function entry.
   static const char* kSavedContextVarName;
 
  private:
   static const int kUnitializedIndex = INT_MIN;
 
-  const intptr_t token_index_;
+  const intptr_t token_pos_;
   const String& name_;
   LocalScope* owner_;  // Local scope declaring this variable.
 
   const AbstractType& type_;  // Declaration type of local variable.
 
   bool is_final_;  // If true, this variable is readonly.
   bool is_captured_;  // If true, this variable lives in the context, otherwise
                       // in the stack frame.
   bool is_invisible_;
   int index_;  // Allocation index in words relative to frame pointer (if not
@@ skipping 11 matching lines @@
     kWhile,
     kDoWhile,
     kSwitch,
     kCase,
     kTry,
     kCatch,
     kForward,
     kStatement  // Any statement other than the above
   };
 
-  SourceLabel(intptr_t token_index, const String& name, Kind kind)
-    : token_index_(token_index),
+  SourceLabel(intptr_t token_pos, const String& name, Kind kind)
+    : token_pos_(token_pos),
       name_(name),
       owner_(NULL),
       kind_(kind),
       continue_label_(),
       break_label_(),
       join_for_break_(NULL),
       join_for_continue_(NULL),
       is_continue_target_(false) {
   }
 
-  static SourceLabel* New(intptr_t token_index, String* name, Kind kind) {
+  static SourceLabel* New(intptr_t token_pos, String* name, Kind kind) {
     if (name != NULL) {
-      return new SourceLabel(token_index, *name, kind);
+      return new SourceLabel(token_pos, *name, kind);
     } else {
-      return new SourceLabel(token_index,
+      return new SourceLabel(token_pos,
                              String::ZoneHandle(String::New(kDefaultLabelName)),
                              kind);
     }
   }
 
-  intptr_t token_index() const { return token_index_; }
+  intptr_t token_pos() const { return token_pos_; }
   const String& name() const { return name_; }
   LocalScope* owner() const { return owner_; }
   void set_owner(LocalScope* owner) {
     ASSERT(owner_ == NULL);
     owner_ = owner;
   }
 
   Kind kind() const { return kind_; }
   Label* break_label() { return &break_label_; }
   Label* continue_label() { return &continue_label_; }
@@ skipping 18 matching lines @@
   JoinEntryInstr* join_for_break() const {
     return join_for_break_;
   }
 
   // Returns the function level of the scope in which the label is defined.
   int FunctionLevel() const;
 
   void ResolveForwardReference() { kind_ = kCase; }
 
  private:
-  const intptr_t token_index_;
+  const intptr_t token_pos_;
   const String& name_;
   LocalScope* owner_;  // Local scope declaring this label.
 
   Kind kind_;
   Label continue_label_;
   Label break_label_;
   JoinEntryInstr* join_for_break_;
   JoinEntryInstr* join_for_continue_;
   bool is_continue_target_;  // Needed for CaseNode.
   static const char* kDefaultLabelName;
@@ skipping 23 matching lines @@
   int context_level() const {
     ASSERT(HasContextLevel());
     return context_level_;
   }
   void set_context_level(int context_level) {
     ASSERT(!HasContextLevel());
     ASSERT(context_level != kUnitializedContextLevel);
     context_level_ = context_level;
   }
 
-  intptr_t begin_token_index() const { return begin_token_index_; }
-  void set_begin_token_index(intptr_t value) { begin_token_index_ = value; }
+  intptr_t begin_token_pos() const { return begin_token_pos_; }
+  void set_begin_token_pos(intptr_t value) { begin_token_pos_ = value; }
 
-  intptr_t end_token_index() const { return end_token_index_; }
-  void set_end_token_index(intptr_t value) { end_token_index_ = value; }
+  intptr_t end_token_pos() const { return end_token_pos_; }
+  void set_end_token_pos(intptr_t value) { end_token_pos_ = value; }
 
   // The number of variables allocated in the context and belonging to this
   // scope and to its children at the same loop level.
   int num_context_variables() const { return num_context_variables_; }
 
   // Add a variable to the scope. Returns false if a variable with the
   // same name is already present.
   bool AddVariable(LocalVariable* variable);
 
   // Add a label to the scope. Returns false if a label with the same name
@@ skipping 93 matching lines @@
   void CollectLocalVariables(GrowableArray<VarDesc>* vars, int16_t* scope_id);
 
   static const int kUnitializedContextLevel = INT_MIN;
   LocalScope* parent_;
   LocalScope* child_;
   LocalScope* sibling_;
   int function_level_;  // Reflects the nesting level of local functions.
   int loop_level_;      // Reflects the loop nesting level.
   int context_level_;   // Reflects the level of the runtime context.
   int num_context_variables_;   // Only set if this scope is a context owner.
-  intptr_t begin_token_index_;  // Token index of beginning of scope.
-  intptr_t end_token_index_;    // Token index of end of scope.
+  intptr_t begin_token_pos_;  // Token index of beginning of scope.
+  intptr_t end_token_pos_;    // Token index of end of scope.
   GrowableArray<LocalVariable*> variables_;
   GrowableArray<SourceLabel*> labels_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_SCOPES_H_