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

vm/debugger.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_DEBUGGER_H_
 #define VM_DEBUGGER_H_
 
 #include "include/dart_debugger_api.h"
 
 #include "vm/object.h"
 
 namespace dart {
 
 class SourceBreakpoint;
 class CodeBreakpoint;
 class Isolate;
 class ObjectPointerVisitor;
 class ActiveVariables;
 class RemoteObjectCache;
 
 // SourceBreakpoint represents a user-specified breakpoint location in
 // Dart source. There may be more than one CodeBreakpoint object per
 // SourceBreakpoint.
 class SourceBreakpoint {
  public:
-  SourceBreakpoint(intptr_t id, const Function& func, intptr_t token_index);
+  SourceBreakpoint(intptr_t id, const Function& func, intptr_t token_pos);
 
   RawFunction* function() const { return function_; }
-  intptr_t token_index() const { return token_index_; }
+  intptr_t token_pos() const { return token_pos_; }
   intptr_t id() const { return id_; }
 
   RawScript* SourceCode();
   RawString* SourceUrl();
   intptr_t LineNumber();
 
   void Enable();
   void Disable();
   bool IsEnabled() const { return is_enabled_; }
 
  private:
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
   void set_function(const Function& func);
   void set_next(SourceBreakpoint* value) { next_ = value; }
   SourceBreakpoint* next() const { return this->next_; }
 
   const intptr_t id_;
   RawFunction* function_;
-  const intptr_t token_index_;
+  const intptr_t token_pos_;
   intptr_t line_number_;
   bool is_enabled_;
 
   SourceBreakpoint* next_;
 
   friend class Debugger;
   DISALLOW_COPY_AND_ASSIGN(SourceBreakpoint);
 };
 
 
 // CodeBreakpoint represents a location in compiled code. There may be
 // more than one CodeBreakpoint for one SourceBreakpoint, e.g. when a
 // function gets compiled as a regular function and as a closure.
 class CodeBreakpoint {
  public:
   CodeBreakpoint(const Function& func, intptr_t pc_desc_index);
   ~CodeBreakpoint();
 
   RawFunction* function() const { return function_; }
   uword pc() const { return pc_; }
-  intptr_t token_index() const { return token_index_; }
+  intptr_t token_pos() const { return token_pos_; }
   bool IsInternal() const { return src_bpt_ == NULL; }
 
   RawScript* SourceCode();
   RawString* SourceUrl();
   intptr_t LineNumber();
 
   void Enable();
   void Disable();
   bool IsEnabled() const { return is_enabled_; }
 
  private:
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
   SourceBreakpoint* src_bpt() const { return src_bpt_; }
   void set_src_bpt(SourceBreakpoint* value) { src_bpt_ = value; }
 
   void set_next(CodeBreakpoint* value) { next_ = value; }
   CodeBreakpoint* next() const { return this->next_; }
   intptr_t pc_desc_index() const { return pc_desc_index_; }
 
   void PatchCode();
   void RestoreCode();
   void PatchFunctionReturn();
   void RestoreFunctionReturn();
 
   RawFunction* function_;
   intptr_t pc_desc_index_;
-  intptr_t token_index_;
+  intptr_t token_pos_;
   uword pc_;
   intptr_t line_number_;
   bool is_enabled_;
 
   SourceBreakpoint* src_bpt_;
   CodeBreakpoint* next_;
 
   PcDescriptors::Kind breakpoint_kind_;
   union {
     uword target_address_;
@@ skipping 51 matching lines @@
   RawInstance* GetInstanceCallReceiver(intptr_t num_actual_args);
 
   uword pc_;
   uword fp_;
   uword sp_;
 
   // The anchor of the context chain for this function.
   const Context& ctx_;
 
   Function& function_;
-  intptr_t token_index_;
+  intptr_t token_pos_;
   intptr_t pc_desc_index_;
   intptr_t line_number_;
   intptr_t context_level_;
 
   bool vars_initialized_;
   LocalVarDescriptors& var_descriptors_;
   ZoneGrowableArray<intptr_t> desc_indices_;
   PcDescriptors& pc_desc_;
 
   friend class Debugger;
@@ skipping 104 matching lines @@
   enum ResumeAction {
     kContinue,
     kStepOver,
     kStepInto,
     kStepOut
   };
 
   void EnsureFunctionIsDeoptimized(const Function& func);
   void InstrumentForStepping(const Function& target_function);
   SourceBreakpoint* SetBreakpoint(const Function& target_function,
-                                  intptr_t token_index);
+                                  intptr_t token_pos);
   void RemoveInternalBreakpoints();
   void UnlinkCodeBreakpoints(SourceBreakpoint* src_bpt);
   void RegisterSourceBreakpoint(SourceBreakpoint* bpt);
   void RegisterCodeBreakpoint(CodeBreakpoint* bpt);
   SourceBreakpoint* GetSourceBreakpoint(const Function& func,
-                                        intptr_t token_index);
+                                        intptr_t token_pos);
   CodeBreakpoint* MakeCodeBreakpoint(const Function& func,
-                                     intptr_t token_index);
+                                     intptr_t token_pos);
 
   // Returns NULL if no breakpoint exists for the given address.
   CodeBreakpoint* GetCodeBreakpoint(uword breakpoint_address);
 
   void SyncBreakpoint(SourceBreakpoint* bpt);
 
   DebuggerStackTrace* CollectStackTrace();
   void SignalBpResolved(SourceBreakpoint *bpt);
 
   bool IsDebuggable(const Function& func);
@@ skipping 34 matching lines @@
   intptr_t exc_pause_info_;
 
   friend class SourceBreakpoint;
   DISALLOW_COPY_AND_ASSIGN(Debugger);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_DEBUGGER_H_