Replace intptr_t with TokenDescriptor

runtime/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 "platform/assert.h"
 #include "platform/globals.h"
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
 #include "vm/symbols.h"
 #include "vm/token.h"
 
 namespace dart {
 
 class LocalScope;
 
 
 class LocalVariable : public ZoneAllocated {
  public:
-  LocalVariable(intptr_t token_pos,
+  LocalVariable(TokenDescriptor token_pos,
                 const String& name,
                 const AbstractType& type)
     : token_pos_(token_pos),
       name_(name),
       owner_(NULL),
       type_(type),
       const_value_(NULL),
       is_final_(false),
       is_captured_(false),
       is_invisible_(false),
       is_captured_parameter_(false),
       index_(LocalVariable::kUninitializedIndex) {
     ASSERT(type.IsZoneHandle() || type.IsReadOnlyHandle());
     ASSERT(type.IsFinalized());
     ASSERT(name.IsSymbol());
   }
 
-  intptr_t token_pos() const { return token_pos_; }
+  TokenDescriptor 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 49 matching lines @@
 
   // Map the frame index to a bit-vector index.  Assumes the variable is
   // allocated to the frame.
   // var_count is the total number of stack-allocated variables including
   // all parameters.
   int BitIndexIn(intptr_t var_count) const;
 
  private:
   static const int kUninitializedIndex = INT_MIN;
 
-  const intptr_t token_pos_;
+  const TokenDescriptor token_pos_;
   const String& name_;
   LocalScope* owner_;  // Local scope declaring this variable.
 
   const AbstractType& type_;  // Declaration type of local variable.
 
   const Instance* const_value_;   // NULL or compile-time const value.
 
   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_;
   bool is_captured_parameter_;
   int index_;  // Allocation index in words relative to frame pointer (if not
                // captured), or relative to the context pointer (if captured).
 
   friend class LocalScope;
   DISALLOW_COPY_AND_ASSIGN(LocalVariable);
 };
 
 
 class NameReference : public ZoneAllocated {
  public:
-  NameReference(intptr_t token_pos, const String& name)
+  NameReference(TokenDescriptor token_pos, const String& name)
     : token_pos_(token_pos),
       name_(name) {
     ASSERT(name.IsSymbol());
   }
   const String& name() const { return name_; }
-  intptr_t token_pos() const { return token_pos_; }
-  void set_token_pos(intptr_t value) { token_pos_ = value; }
+  TokenDescriptor token_pos() const { return token_pos_; }
+  void set_token_pos(TokenDescriptor value) { token_pos_ = value; }
  private:
-  intptr_t token_pos_;
+  TokenDescriptor token_pos_;
   const String& name_;
 };
 
 
 class SourceLabel : public ZoneAllocated {
  public:
   enum Kind {
     kFor,
     kWhile,
     kDoWhile,
     kSwitch,
     kCase,
     kTry,
     kCatch,
     kForward,
     kStatement  // Any statement other than the above
   };
 
-  SourceLabel(intptr_t token_pos, const String& name, Kind kind)
+  SourceLabel(TokenDescriptor token_pos, const String& name, Kind kind)
     : token_pos_(token_pos),
       name_(name),
       owner_(NULL),
       kind_(kind) {
     ASSERT(name.IsSymbol());
   }
 
-  static SourceLabel* New(intptr_t token_pos, String* name, Kind kind) {
+  static SourceLabel* New(TokenDescriptor token_pos, String* name, Kind kind) {
     if (name != NULL) {
       return new SourceLabel(token_pos, *name, kind);
     } else {
       return new SourceLabel(token_pos,
                              Symbols::DefaultLabel(),
                              kind);
     }
   }
 
-  intptr_t token_pos() const { return token_pos_; }
+  TokenDescriptor 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_; }
 
   // 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_pos_;
+  const TokenDescriptor token_pos_;
   const String& name_;
   LocalScope* owner_;  // Local scope declaring this label.
 
   Kind kind_;
 
   DISALLOW_COPY_AND_ASSIGN(SourceLabel);
 };
 
 
 class LocalScope : public ZoneAllocated {
@@ skipping 17 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_pos() const { return begin_token_pos_; }
-  void set_begin_token_pos(intptr_t value) { begin_token_pos_ = value; }
+  TokenDescriptor begin_token_pos() const { return begin_token_pos_; }
+  void set_begin_token_pos(TokenDescriptor value) { begin_token_pos_ = value; }
 
-  intptr_t end_token_pos() const { return end_token_pos_; }
-  void set_end_token_pos(intptr_t value) { end_token_pos_ = value; }
+  TokenDescriptor end_token_pos() const { return end_token_pos_; }
+  void set_end_token_pos(TokenDescriptor 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);
 
   // Insert a formal parameter variable to the scope at the given position,
@@ skipping 45 matching lines @@
     return variables_[index];
   }
 
   // Count the captured variables belonging to outer scopes and referenced in
   // this local scope.
   int NumCapturedVariables() const;
 
   // Add a reference to the given name into this scope and the enclosing
   // scopes that do not have a local variable declaration for this name
   // already.
-  void AddReferencedName(intptr_t token_pos, const String& name);
-  intptr_t PreviousReferencePos(const String& name) const;
+  void AddReferencedName(TokenDescriptor token_pos, const String& name);
+  TokenDescriptor PreviousReferencePos(const String& name) const;
 
   // Allocate both captured and non-captured variables declared in this scope
   // and in its children scopes of the same function level. Allocating means
   // assigning a frame slot index or a context slot index.
   // Parameters to be allocated in the frame must all appear in the top scope
   // and not in its children (we do not yet handle register parameters).
   // Locals must be listed after parameters in top scope and in its children.
   // Two locals in different sibling scopes may share the same frame slot.
   // Return the index of the next available frame slot.
   int AllocateVariables(int first_parameter_index,
@@ skipping 43 matching lines @@
   NameReference* FindReference(const String& name) const;
 
   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_pos_;  // Token index of beginning of scope.
-  intptr_t end_token_pos_;    // Token index of end of scope.
+  TokenDescriptor begin_token_pos_;  // Token index of beginning of scope.
+  TokenDescriptor end_token_pos_;    // Token index of end of scope.
   GrowableArray<LocalVariable*> variables_;
   GrowableArray<SourceLabel*> labels_;
 
   // List of names referenced in this scope and its children that
   // are not resolved to local variables.
   GrowableArray<NameReference*> referenced_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_SCOPES_H_