Replace intptr_t with TokenDescriptor

runtime/vm/scopes.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/scopes.h"
 
 #include "vm/object.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 
@@ skipping 11 matching lines @@
 
 
 LocalScope::LocalScope(LocalScope* parent, int function_level, int loop_level)
     : parent_(parent),
       child_(NULL),
       sibling_(NULL),
       function_level_(function_level),
       loop_level_(loop_level),
       context_level_(LocalScope::kUnitializedContextLevel),
       num_context_variables_(0),
-      begin_token_pos_(Token::kNoSourcePos),
-      end_token_pos_(Token::kNoSourcePos),
+      begin_token_pos_(TokenDescriptor::kNoSourcePos),
+      end_token_pos_(TokenDescriptor::kNoSourcePos),
       variables_(),
       labels_(),
       referenced_() {
   // Hook this node into the children of the parent, unless the parent has a
   // different function_level, since the local scope of a nested function can
   // be discarded after it has been parsed.
   if ((parent != NULL) && (parent->function_level() == function_level)) {
     sibling_ = parent->child_;
     parent->child_ = this;
   }
@@ skipping 59 matching lines @@
   intptr_t num_references = referenced_.length();
   for (intptr_t i = 0; i < num_references; i++) {
     if (name.raw() == referenced_[i]->name().raw()) {
       return referenced_[i];
     }
   }
   return NULL;
 }
 
 
-void LocalScope::AddReferencedName(intptr_t token_pos,
+void LocalScope::AddReferencedName(TokenDescriptor token_pos,
                                    const String& name) {
   if (LocalLookupVariable(name) != NULL) {
     return;
   }
   NameReference* ref = FindReference(name);
   if (ref != NULL) {
     ref->set_token_pos(token_pos);
     return;
   }
   ref = new NameReference(token_pos, name);
   referenced_.Add(ref);
   // Add name reference in innermost enclosing scopes that do not
   // define a local variable with this name.
   LocalScope* scope = this->parent();
   while (scope != NULL && (scope->LocalLookupVariable(name) == NULL)) {
     scope->referenced_.Add(ref);
     scope = scope->parent();
   }
 }
 
 
-intptr_t LocalScope::PreviousReferencePos(const String& name) const {
+TokenDescriptor LocalScope::PreviousReferencePos(const String& name) const {
   NameReference* ref = FindReference(name);
   if (ref != NULL) {
     return ref->token_pos();
   }
-  return -1;
+  return TokenDescriptor::kNoSource;
 }
 
 
 void LocalScope::AllocateContextVariable(LocalVariable* variable,
                                          LocalScope** context_owner) {
   ASSERT(variable->is_captured());
   ASSERT(variable->owner() == this);
   // The context level in the owner scope of a captured variable indicates at
   // code generation time how far to walk up the context chain in order to
   // access the variable from the current context level.
@@ skipping 170 matching lines @@
   for (int i = 0; i < this->variables_.length(); i++) {
     LocalVariable* var = variables_[i];
     if ((var->owner() == this) && !var->is_invisible()) {
       if (var->name().raw() == Symbols::CurrentContextVar().raw()) {
         // This is the local variable in which the function saves its
         // own context before calling a closure function.
         VarDesc desc;
         desc.name = &var->name();
         desc.info.set_kind(RawLocalVarDescriptors::kSavedCurrentContext);
         desc.info.scope_id = 0;
-        desc.info.begin_pos = 0;
-        desc.info.end_pos = 0;
+        desc.info.begin_pos = TokenDescriptor::kMinSource;
+        desc.info.end_pos = TokenDescriptor::kMinSource;
         desc.info.set_index(var->index());
         vars->Add(desc);
       } else if (!IsFilteredIdentifier(var->name())) {
         // This is a regular Dart variable, either stack-based or captured.
         VarDesc desc;
         desc.name = &var->name();
         if (var->is_captured()) {
           desc.info.set_kind(RawLocalVarDescriptors::kContextVar);
           ASSERT(var->owner() != NULL);
           ASSERT(var->owner()->context_level() >= 0);
@@ skipping 325 matching lines @@
     return fixed_parameter_count - (index() - kParamEndSlotFromFp);
   } else {
     // Shift negative indexes so that the lowest one is 0 (they are still
     // non-positive).
     return fixed_parameter_count - (index() - kFirstLocalSlotFromFp);
   }
 }
 
 
 }  // namespace dart