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

vm/object.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/object.h"
 
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 1020 matching lines @@
   // way as the owner class of its non-static signature function.
   // It is not type parameterized if its signature function is static.
   // See Class::NewSignatureClass() for the setup of its type parameters.
   // During type finalization, the type arguments of the super class of the
   // owner class of its signature function will be prepended to the type
   // argument vector. Therefore, we only need to set the type arguments
   // matching the type parameters here.
   const TypeArguments& signature_type_arguments =
       TypeArguments::Handle(type_parameters());
   const Type& signature_type = Type::Handle(
-      Type::New(*this, signature_type_arguments, token_index()));
+      Type::New(*this, signature_type_arguments, token_pos()));
 
   // Return the still unfinalized signature type.
   ASSERT(!signature_type.IsFinalized());
   return signature_type.raw();
 }
 
 
 template <class FakeObject>
 RawClass* Class::New() {
   Class& class_class = Class::Handle(Object::class_class());
@@ skipping 12 matching lines @@
   result.set_instance_kind(FakeObject::kInstanceKind);
   result.set_id((FakeObject::kInstanceKind != kInstance) ?
                 FakeObject::kInstanceKind : kIllegalObjectKind);
   result.raw_ptr()->is_const_ = false;
   result.raw_ptr()->is_interface_ = false;
   // VM backed classes are almost ready: run checks and resolve class
   // references, but do not recompute size.
   result.raw_ptr()->class_state_ = RawClass::kPreFinalized;
   result.raw_ptr()->type_arguments_instance_field_offset_ = kNoTypeArguments;
   result.raw_ptr()->num_native_fields_ = 0;
-  result.raw_ptr()->token_index_ = Scanner::kDummyTokenIndex;
+  result.raw_ptr()->token_pos_ = Scanner::kDummyTokenIndex;
   result.InitEmptyFields();
   Isolate::Current()->class_table()->Register(result);
   return result.raw();
 }
 
 
 // Initialize class fields of type Array with empty array.
 void Class::InitEmptyFields() {
   const Array& empty_array = Array::Handle(Array::Empty());
   if (empty_array.IsNull()) {
@@ skipping 42 matching lines @@
       GrowableObjectArray::Handle(raw_ptr()->closure_functions_);
   if (closures.IsNull()) {
     closures = GrowableObjectArray::New(4);
     StorePointer(&raw_ptr()->closure_functions_, closures.raw());
   }
   ASSERT(function.IsNonImplicitClosureFunction());
   closures.Add(function);
 }
 
 
-// Lookup the innermost closure function that contains token at token_index.
-RawFunction* Class::LookupClosureFunction(intptr_t token_index) const {
+// Lookup the innermost closure function that contains token at token_pos.
+RawFunction* Class::LookupClosureFunction(intptr_t token_pos) const {
   if (raw_ptr()->closure_functions_ == GrowableObjectArray::null()) {
     return Function::null();
   }
   const GrowableObjectArray& closures =
       GrowableObjectArray::Handle(raw_ptr()->closure_functions_);
   Function& closure = Function::Handle();
   intptr_t num_closures = closures.Length();
-  intptr_t best_fit_token_index = -1;
+  intptr_t best_fit_token_pos = -1;
   intptr_t best_fit_index = -1;
   for (intptr_t i = 0; i < num_closures; i++) {
     closure ^= closures.At(i);
     ASSERT(!closure.IsNull());
-    if ((closure.token_index() <= token_index) &&
-        (token_index < closure.end_token_index()) &&
-        (best_fit_token_index < closure.token_index())) {
+    if ((closure.token_pos() <= token_pos) &&
+        (token_pos < closure.end_token_pos()) &&
+        (best_fit_token_pos < closure.token_pos())) {
       best_fit_index = i;
-      best_fit_token_index = closure.token_index();
+      best_fit_token_pos = closure.token_pos();
     }
   }
   closure = Function::null();
   if (best_fit_index >= 0) {
     closure ^= closures.At(best_fit_index);
   }
   return closure.raw();
 }
 
 
@@ skipping 112 matching lines @@
 
 
 void Class::set_factory_class(const Object& value) const {
   StorePointer(&raw_ptr()->factory_class_, value.raw());
 }
 
 
 // Return a TypeParameter if the type_name is a type parameter of this class.
 // Return null otherwise.
 RawTypeParameter* Class::LookupTypeParameter(const String& type_name,
-                                             intptr_t token_index) const {
+                                             intptr_t token_pos) const {
   ASSERT(!type_name.IsNull());
   const TypeArguments& type_params = TypeArguments::Handle(type_parameters());
   if (!type_params.IsNull()) {
     intptr_t num_type_params = type_params.Length();
     TypeParameter& type_param = TypeParameter::Handle();
     String& type_param_name = String::Handle();
     for (intptr_t i = 0; i < num_type_params; i++) {
       type_param ^= type_params.TypeAt(i);
       type_param_name = type_param.Name();
       if (type_param_name.Equals(type_name)) {
         intptr_t index = type_param.Index();
-        // Create a non-finalized new TypeParameter with the given token_index.
+        // Create a non-finalized new TypeParameter with the given token_pos.
         if (type_param.IsFinalized()) {
           // The index was adjusted during finalization. Revert.
           index -= NumTypeArguments() - num_type_params;
         } else {
           ASSERT(type_param.Index() == i);
         }
-        return TypeParameter::New(*this, index, type_name, token_index);
+        return TypeParameter::New(*this, index, type_name, token_pos);
       }
     }
   }
   return TypeParameter::null();
 }
 
 
 void Class::CalculateFieldOffsets() const {
   Array& flds = Array::Handle(fields());
   const Class& super = Class::Handle(SuperClass());
@@ skipping 91 matching lines @@
   result.raw_ptr()->num_native_fields_ = 0;
   result.InitEmptyFields();
   Isolate::Current()->class_table()->Register(result);
   return result.raw();
 }
 
 
 template <class FakeInstance>
 RawClass* Class::New(const String& name,
                      const Script& script,
-                     intptr_t token_index) {
+                     intptr_t token_pos) {
   Class& result = Class::Handle(New<FakeInstance>(kIllegalObjectKind));
   result.set_name(name);
   result.set_script(script);
-  result.set_token_index(token_index);
+  result.set_token_pos(token_pos);
   return result.raw();
 }
 
 
 RawClass* Class::New(const String& name,
                      const Script& script,
-                     intptr_t token_index) {
-  Class& result = Class::Handle(New<Instance>(name, script, token_index));
+                     intptr_t token_pos) {
+  Class& result = Class::Handle(New<Instance>(name, script, token_pos));
   return result.raw();
 }
 
 
 RawClass* Class::NewInterface(const String& name,
                               const Script& script,
-                              intptr_t token_index) {
-  Class& result = Class::Handle(New<Instance>(name, script, token_index));
+                              intptr_t token_pos) {
+  Class& result = Class::Handle(New<Instance>(name, script, token_pos));
   result.set_is_interface();
   return result.raw();
 }
 
 
 RawClass* Class::NewSignatureClass(const String& name,
                                    const Function& signature_function,
                                    const Script& script) {
   ASSERT(!signature_function.IsNull());
   const Class& owner_class = Class::Handle(signature_function.owner());
   ASSERT(!owner_class.IsNull());
   TypeArguments& type_parameters = TypeArguments::Handle();
   TypeArguments& type_parameter_bounds = TypeArguments::Handle();
   // A signature class extends class Instance and is parameterized in the same
   // way as the owner class of its non-static signature function.
   // It is not type parameterized if its signature function is static.
   if (!signature_function.is_static()) {
     if ((owner_class.NumTypeParameters() > 0) &&
         !signature_function.HasInstantiatedSignature()) {
       type_parameters = owner_class.type_parameters();
       type_parameter_bounds = owner_class.type_parameter_bounds();
     }
   }
-  const intptr_t token_index = signature_function.token_index();
-  Class& result = Class::Handle(New<Closure>(name, script, token_index));
+  const intptr_t token_pos = signature_function.token_pos();
+  Class& result = Class::Handle(New<Closure>(name, script, token_pos));
   const Type& super_type = Type::Handle(Type::ObjectType());
   ASSERT(!super_type.IsNull());
   result.set_super_type(super_type);
   result.set_signature_function(signature_function);
   result.set_type_parameters(type_parameters);
   result.set_type_parameter_bounds(type_parameter_bounds);
   result.SetFields(Array::Handle(Array::Empty()));
   result.SetFunctions(Array::Handle(Array::Empty()));
   result.set_type_arguments_instance_field_offset(
       Closure::type_arguments_offset());
@@ skipping 178 matching lines @@
   ASSERT(value.IsSymbol());
   StorePointer(&raw_ptr()->name_, value.raw());
 }
 
 
 void Class::set_script(const Script& value) const {
   StorePointer(&raw_ptr()->script_, value.raw());
 }
 
 
-void Class::set_token_index(intptr_t token_index) const {
-  ASSERT(token_index >= 0);
-  raw_ptr()->token_index_ = token_index;
+void Class::set_token_pos(intptr_t token_pos) const {
+  ASSERT(token_pos >= 0);
+  raw_ptr()->token_pos_ = token_pos;
 }
 
 
 void Class::set_is_interface() const {
   raw_ptr()->is_interface_ = true;
 }
 
 
 void Class::set_is_const() const {
   raw_ptr()->is_const_ = true;
@@ skipping 321 matching lines @@
     if (MatchesAccessorName(function_name, prefix, prefix_length, name)) {
       return function.raw();
     }
   }
 
   // No function found.
   return Function::null();
 }
 
 
-RawFunction* Class::LookupFunctionAtToken(intptr_t token_index) const {
+RawFunction* Class::LookupFunctionAtToken(intptr_t token_pos) const {
   // TODO(hausner): we can shortcut the negative case if we knew the
   // beginning and end token position of the class.
   Function& func = Function::Handle();
-  func = LookupClosureFunction(token_index);
+  func = LookupClosureFunction(token_pos);
   if (!func.IsNull()) {
     return func.raw();
   }
   Array& funcs = Array::Handle(functions());
   intptr_t len = funcs.Length();
   for (intptr_t i = 0; i < len; i++) {
     func ^= funcs.At(i);
-    if ((func.token_index() <= token_index) &&
-        (token_index < func.end_token_index())) {
+    if ((func.token_pos() <= token_pos) &&
+        (token_pos < func.end_token_pos())) {
       return func.raw();
     }
   }
   // No function found.
   return Function::null();
 }
 
 
 RawField* Class::LookupInstanceField(const String& name) const {
   ASSERT(is_finalized());
@@ skipping 84 matching lines @@
     set_constants(new_canonical_list);
     new_canonical_list.SetAt(index, constant);
   } else {
     canonical_list.SetAt(index, constant);
   }
 }
 
 
 RawUnresolvedClass* UnresolvedClass::New(const LibraryPrefix& library_prefix,
                                          const String& ident,
-                                         intptr_t token_index) {
+                                         intptr_t token_pos) {
   const UnresolvedClass& type = UnresolvedClass::Handle(UnresolvedClass::New());
   type.set_library_prefix(library_prefix);
   type.set_ident(ident);
-  type.set_token_index(token_index);
+  type.set_token_pos(token_pos);
   return type.raw();
 }
 
 
 RawUnresolvedClass* UnresolvedClass::New() {
   const Class& unresolved_class_class =
       Class::Handle(Object::unresolved_class_class());
   RawObject* raw = Object::Allocate(unresolved_class_class,
                                     UnresolvedClass::InstanceSize(),
                                     Heap::kNew);
   return reinterpret_cast<RawUnresolvedClass*>(raw);
 }
 
 
-void UnresolvedClass::set_token_index(intptr_t token_index) const {
-  ASSERT(token_index >= 0);
-  raw_ptr()->token_index_ = token_index;
+void UnresolvedClass::set_token_pos(intptr_t token_pos) const {
+  ASSERT(token_pos >= 0);
+  raw_ptr()->token_pos_ = token_pos;
 }
 
 
 void UnresolvedClass::set_ident(const String& ident) const {
   StorePointer(&raw_ptr()->ident_, ident.raw());
 }
 
 
 void UnresolvedClass::set_library_prefix(
     const LibraryPrefix& library_prefix) const {
@@ skipping 56 matching lines @@
 }
 
 
 RawAbstractTypeArguments* AbstractType::arguments() const  {
   // AbstractType is an abstract class.
   UNREACHABLE();
   return NULL;
 }
 
 
-intptr_t AbstractType::token_index() const {
+intptr_t AbstractType::token_pos() const {
   // AbstractType is an abstract class.
   UNREACHABLE();
   return -1;
 }
 
 
 bool AbstractType::IsInstantiated() const {
   // AbstractType is an abstract class.
   UNREACHABLE();
   return false;
@@ skipping 419 matching lines @@
 RawAbstractType* Type::InstantiateFrom(
     const AbstractTypeArguments& instantiator_type_arguments) const {
   ASSERT(IsFinalized());
   ASSERT(!IsInstantiated());
   AbstractTypeArguments& type_arguments =
       AbstractTypeArguments::Handle(arguments());
   type_arguments = type_arguments.InstantiateFrom(instantiator_type_arguments);
   const Class& cls = Class::Handle(type_class());
   ASSERT(cls.is_finalized());
   Type& instantiated_type = Type::Handle(
-      Type::New(cls, type_arguments, token_index()));
+      Type::New(cls, type_arguments, token_pos()));
   ASSERT(type_arguments.IsNull() ||
          (type_arguments.Length() == cls.NumTypeArguments()));
   instantiated_type.set_is_finalized_instantiated();
   return instantiated_type.raw();
 }
 
 
 bool Type::Equals(const AbstractType& other) const {
   ASSERT(IsFinalized() && other.IsFinalized());
   if (raw() == other.raw()) {
@@ skipping 95 matching lines @@
   const Class& type_class = Class::Handle(Object::type_class());
   RawObject* raw = Object::Allocate(type_class,
                                     Type::InstanceSize(),
                                     Heap::kOld);
   return reinterpret_cast<RawType*>(raw);
 }
 
 
 RawType* Type::New(const Object& clazz,
                    const AbstractTypeArguments& arguments,
-                   intptr_t token_index) {
+                   intptr_t token_pos) {
   const Type& result = Type::Handle(Type::New());
   result.set_type_class(clazz);
   result.set_arguments(arguments);
-  result.set_token_index(token_index);
+  result.set_token_pos(token_pos);
   result.raw_ptr()->type_state_ = RawType::kAllocated;
   return result.raw();
 }
 
 
-void Type::set_token_index(intptr_t token_index) const {
-  ASSERT(token_index >= 0);
-  raw_ptr()->token_index_ = token_index;
+void Type::set_token_pos(intptr_t token_pos) const {
+  ASSERT(token_pos >= 0);
+  raw_ptr()->token_pos_ = token_pos;
 }
 
 
 void Type::set_type_state(int8_t state) const {
   ASSERT((state == RawType::kAllocated) ||
          (state == RawType::kBeingFinalized) ||
          (state == RawType::kFinalizedInstantiated) ||
          (state == RawType::kFinalizedUninstantiated));
   raw_ptr()->type_state_ = state;
 }
@@ skipping 115 matching lines @@
   RawObject* raw = Object::Allocate(type_parameter_class,
                                     TypeParameter::InstanceSize(),
                                     Heap::kOld);
   return reinterpret_cast<RawTypeParameter*>(raw);
 }
 
 
 RawTypeParameter* TypeParameter::New(const Class& parameterized_class,
                                      intptr_t index,
                                      const String& name,
-                                     intptr_t token_index) {
+                                     intptr_t token_pos) {
   const TypeParameter& result = TypeParameter::Handle(TypeParameter::New());
   result.set_parameterized_class(parameterized_class);
   result.set_index(index);
   result.set_name(name);
-  result.set_token_index(token_index);
+  result.set_token_pos(token_pos);
   result.raw_ptr()->type_state_ = RawTypeParameter::kAllocated;
   return result.raw();
 }
 
 
-void TypeParameter::set_token_index(intptr_t token_index) const {
-  ASSERT(token_index >= 0);
-  raw_ptr()->token_index_ = token_index;
+void TypeParameter::set_token_pos(intptr_t token_pos) const {
+  ASSERT(token_pos >= 0);
+  raw_ptr()->token_pos_ = token_pos;
 }
 
 
 void TypeParameter::set_type_state(int8_t state) const {
   ASSERT((state == RawTypeParameter::kAllocated) ||
          (state == RawTypeParameter::kBeingFinalized) ||
          (state == RawTypeParameter::kFinalizedUninstantiated));
   raw_ptr()->type_state_ = state;
 }
 
@@ skipping 173 matching lines @@
     if (!type_class.IsDynamicClass()) {
       return false;
     }
   }
   return true;
 }
 
 
 static RawError* FormatError(const Error& prev_error,
                              const Script& script,
-                             intptr_t token_index,
+                             intptr_t token_pos,
                              const char* format, ...) {
   va_list args;
   va_start(args, format);
   if (prev_error.IsNull()) {
-    return Parser::FormatError(script, token_index, "Error", format, args);
+    return Parser::FormatError(script, token_pos, "Error", format, args);
   } else {
-    return Parser::FormatErrorWithAppend(prev_error, script, token_index,
+    return Parser::FormatErrorWithAppend(prev_error, script, token_pos,
                                          "Error", format, args);
   }
 }
 
 
 bool AbstractTypeArguments::IsWithinBoundsOf(
     const Class& cls,
     const AbstractTypeArguments& bounds_instantiator,
     Error* malformed_error) const {
   ASSERT(FLAG_enable_type_checks);
@@ skipping 27 matching lines @@
           const String& type_argument_name = String::Handle(type.Name());
           const String& class_name = String::Handle(cls.Name());
           const String& bound_name = String::Handle(bound.Name());
           const Script& script = Script::Handle(cls.script());
           // Since the bound was canonicalized, its token index was lost,
           // therefore, use the token index of the corresponding type parameter.
           const TypeArguments& type_parameters =
               TypeArguments::Handle(cls.type_parameters());
           type = type_parameters.TypeAt(i);
           *malformed_error ^= FormatError(malformed_bound_error,
-                                          script, type.token_index(),
+                                          script, type.token_pos(),
                                           "type argument '%s' does not "
                                           "extend bound '%s' of '%s'\n",
                                           type_argument_name.ToCString(),
                                           bound_name.ToCString(),
                                           class_name.ToCString());
         }
         return false;
       }
     }
   }
@@ skipping 404 matching lines @@
 void Function::set_is_static(bool is_static) const {
   raw_ptr()->is_static_ = is_static;
 }
 
 
 void Function::set_is_const(bool is_const) const {
   raw_ptr()->is_const_ = is_const;
 }
 
 
-void Function::set_token_index(intptr_t pos) const {
+void Function::set_token_pos(intptr_t pos) const {
   ASSERT(pos >= 0);
-  raw_ptr()->token_index_ = pos;
+  raw_ptr()->token_pos_ = pos;
 }
 
 
 void Function::set_num_fixed_parameters(intptr_t n) const {
   ASSERT(n >= 0);
   raw_ptr()->num_fixed_parameters_ = n;
 }
 
 
 void Function::set_num_optional_parameters(intptr_t n) const {
@@ skipping 275 matching lines @@
                                     Function::InstanceSize(),
                                     Heap::kOld);
   return reinterpret_cast<RawFunction*>(raw);
 }
 
 
 RawFunction* Function::New(const String& name,
                            RawFunction::Kind kind,
                            bool is_static,
                            bool is_const,
-                           intptr_t token_index) {
+                           intptr_t token_pos) {
   const Function& result = Function::Handle(Function::New());
   result.set_parameter_types(Array::Handle(Array::Empty()));
   result.set_parameter_names(Array::Handle(Array::Empty()));
   result.set_name(name);
   result.set_kind(kind);
   result.set_is_static(is_static);
   result.set_is_const(is_const);
-  result.set_token_index(token_index);
-  result.set_end_token_index(token_index);
+  result.set_token_pos(token_pos);
+  result.set_end_token_pos(token_pos);
   result.set_num_fixed_parameters(0);
   result.set_num_optional_parameters(0);
   result.set_usage_counter(0);
   result.set_deoptimization_counter(0);
   result.set_is_optimizable(true);
   result.set_is_native(false);
   return result.raw();
 }
 
 
 RawFunction* Function::NewClosureFunction(const String& name,
                                           const Function& parent,
-                                          intptr_t token_index) {
+                                          intptr_t token_pos) {
   ASSERT(!parent.IsNull());
   const Class& parent_class = Class::Handle(parent.owner());
   ASSERT(!parent_class.IsNull());
   const Function& result = Function::Handle(
       Function::New(name,
                     RawFunction::kClosureFunction,
                     /* is_static = */ parent.is_static(),
                     /* is_const = */ false,
-                    token_index));
+                    token_pos));
   result.set_parent_function(parent);
   result.set_owner(parent_class);
   return result.raw();
 }
 
 
 RawFunction* Function::ImplicitClosureFunction() const {
   // Return the existing implicit closure function if any.
   if (raw_ptr()->implicit_closure_function_ != Function::null()) {
     return raw_ptr()->implicit_closure_function_;
   }
   ASSERT(!IsSignatureFunction() && !IsClosureFunction());
   // Create closure function.
   const String& closure_name = String::Handle(name());
   const Function& closure_function = Function::Handle(
-      NewClosureFunction(closure_name, *this, token_index()));
+      NewClosureFunction(closure_name, *this, token_pos()));
 
   // Set closure function's context scope.
   ContextScope& context_scope = ContextScope::Handle();
   if (is_static()) {
     context_scope ^= ContextScope::New(0);
   } else {
     context_scope ^= LocalScope::CreateImplicitClosureScope(*this);
   }
   closure_function.set_context_scope(context_scope);
 
@@ skipping 291 matching lines @@
   RawObject* raw = Object::Allocate(field_class,
                                     Field::InstanceSize(),
                                     Heap::kOld);
   return reinterpret_cast<RawField*>(raw);
 }
 
 
 RawField* Field::New(const String& name,
                      bool is_static,
                      bool is_final,
-                     intptr_t token_index) {
+                     intptr_t token_pos) {
   const Field& result = Field::Handle(Field::New());
   result.set_name(name);
   result.set_is_static(is_static);
   if (is_static) {
     result.set_value(Instance::Handle());
   } else {
     result.SetOffset(0);
   }
   result.set_is_final(is_final);
-  result.set_token_index(token_index);
+  result.set_token_pos(token_pos);
   result.set_has_initializer(false);
   return result.raw();
 }
 
 
 const char* Field::ToCString() const {
   const char* kF0 = is_static() ? " static" : "";
   const char* kF1 = is_final() ? " final" : "";
   const char* kFormat = "Field <%s.%s>:%s%s";
   const char* field_name = String::Handle(name()).ToCString();
@@ skipping 217 matching lines @@
   TimerScope timer(FLAG_compiler_stats, &CompilerStats::scanner_timer);
   const String& src = String::Handle(source());
   Scanner scanner(src, private_key);
   set_tokens(TokenStream::Handle(TokenStream::New(scanner.GetStream())));
   if (FLAG_compiler_stats) {
     CompilerStats::src_length += src.Length();
   }
 }
 
 
-void Script::GetTokenLocation(intptr_t token_index,
+void Script::GetTokenLocation(intptr_t token_pos,
                               intptr_t* line,
                               intptr_t* column) const {
   const String& src = String::Handle(source());
   const String& dummy_key = String::Handle(String::New(""));
   Scanner scanner(src, dummy_key);
-  scanner.ScanTo(token_index);
+  scanner.ScanTo(token_pos);
   *line = scanner.CurrentPosition().line;
   *column = scanner.CurrentPosition().column;
 }
 
 
 intptr_t Script::TokenIndexAtLine(intptr_t line_number) const {
   const String& src = String::Handle(source());
   const String& dummy_key = String::Handle(String::New(""));
   Scanner scanner(src, dummy_key);
   return scanner.TokenIndexAtLine(line_number);
@@ skipping 357 matching lines @@
 
 RawFunction* Library::LookupFunctionInSource(const String& script_url,
                                              intptr_t line_number) const {
   Script& script = Script::Handle(LookupScript(script_url));
   if (script.IsNull()) {
     // The given script url is not loaded into this library.
     return Function::null();
   }
 
   // Determine token position at given line number.
-  intptr_t token_index_at_line = script.TokenIndexAtLine(line_number);
-  if (token_index_at_line < 0) {
+  intptr_t token_pos_at_line = script.TokenIndexAtLine(line_number);
+  if (token_pos_at_line < 0) {
     // Script does not contain the given line number.
     return Function::null();
   }
 
-  return LookupFunctionInScript(script, token_index_at_line);
+  return LookupFunctionInScript(script, token_pos_at_line);
 }
 
 
 RawFunction* Library::LookupFunctionInScript(const Script& script,
-                                             intptr_t token_index) const {
+                                             intptr_t token_pos) const {
   Class& cls = Class::Handle();
   Function& func = Function::Handle();
   ClassDictionaryIterator it(*this);
   while (it.HasNext()) {
     cls = it.GetNextClass();
     if (script.raw() == cls.script()) {
-      func = cls.LookupFunctionAtToken(token_index);
+      func = cls.LookupFunctionAtToken(token_pos);
       if (!func.IsNull()) {
         return func.raw();
       }
     }
   }
   // Look in anonymous classes for toplevel functions.
   Array& anon_classes = Array::Handle(this->raw_ptr()->anonymous_classes_);
   intptr_t num_anonymous = raw_ptr()->num_anonymous_;
   for (int i = 0; i < num_anonymous; i++) {
     cls ^= anon_classes.At(i);
     ASSERT(!cls.IsNull());
     if (script.raw() == cls.script()) {
-      func = cls.LookupFunctionAtToken(token_index);
+      func = cls.LookupFunctionAtToken(token_pos);
       if (!func.IsNull()) {
         return func.raw();
       }
     }
   }
   return Function::null();
 }
 
 
 RawObject* Library::LookupLocalObject(const String& name) const {
@@ skipping 1466 matching lines @@
   RawInstructions* instr;
   instr = isolate->heap()->FindObjectInCodeSpace(&visitor);
   if (instr != Instructions::null()) {
     return instr->ptr()->code_;
   }
   return Code::null();
 }
 
 
 intptr_t Code::GetTokenIndexOfPC(uword pc) const {
-  intptr_t token_index = -1;
+  intptr_t token_pos = -1;
   const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
   for (intptr_t i = 0; i < descriptors.Length(); i++) {
     if (descriptors.PC(i) == pc) {
-      token_index = descriptors.TokenIndex(i);
+      token_pos = descriptors.TokenIndex(i);
       break;
     }
   }
-  return token_index;
+  return token_pos;
 }
 
 
 uword Code::GetDeoptPcAtNodeId(intptr_t node_id) const {
   const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
   for (intptr_t i = 0; i < descriptors.Length(); i++) {
     if ((descriptors.NodeId(i) == node_id) &&
         (descriptors.DescriptorKind(i) == PcDescriptors::kDeopt)) {
       return descriptors.PC(i);
     }
@@ skipping 122 matching lines @@
     RawObject* raw = Object::Allocate(context_scope_class, size, Heap::kOld);
     NoGCScope no_gc;
     result ^= raw;
     result.set_num_variables(num_variables);
   }
   return result.raw();
 }
 
 
 intptr_t ContextScope::TokenIndexAt(intptr_t scope_index) const {
-  return Smi::Value(VariableDescAddr(scope_index)->token_index);
+  return Smi::Value(VariableDescAddr(scope_index)->token_pos);
 }
 
 
 void ContextScope::SetTokenIndexAt(intptr_t scope_index,
-                                   intptr_t token_index) const {
-  VariableDescAddr(scope_index)->token_index = Smi::New(token_index);
+                                   intptr_t token_pos) const {
+  VariableDescAddr(scope_index)->token_pos = Smi::New(token_pos);
 }
 
 
 RawString* ContextScope::NameAt(intptr_t scope_index) const {
   return VariableDescAddr(scope_index)->name;
 }
 
 
 void ContextScope::SetNameAt(intptr_t scope_index, const String& name) const {
   VariableDescAddr(scope_index)->name = name.raw();
@@ skipping 3479 matching lines @@
   // for each frame.
   intptr_t total_len = 0;
   const char* kFormat = verbose ?
       " %d. Function: '%s%s%s' url: '%s' line:%d col:%d code-entry: 0x%x\n" :
       " %d. Function: '%s%s%s' url: '%s' line:%d col:%d\n";
   GrowableArray<char*> frame_strings;
   for (intptr_t i = 0; i < Length(); i++) {
     function = FunctionAtFrame(i);
     code = CodeAtFrame(i);
     uword pc = code.EntryPoint() + Smi::Value(PcOffsetAtFrame(i));
-    intptr_t token_index = code.GetTokenIndexOfPC(pc);
+    intptr_t token_pos = code.GetTokenIndexOfPC(pc);
     function_class = function.owner();
     script = function_class.script();
     function_name = function.name();
     class_name = function_class.Name();
     url = script.url();
     intptr_t line = -1;
     intptr_t column = -1;
-    if (token_index >= 0) {
-      script.GetTokenLocation(token_index, &line, &column);
+    if (token_pos >= 0) {
+      script.GetTokenLocation(token_pos, &line, &column);
     }
     intptr_t len = OS::SNPrint(NULL, 0, kFormat,
                                i,
                                class_name.ToCString(),
                                function_class.IsTopLevel() ? "" : ".",
                                function_name.ToCString(),
                                url.ToCString(),
                                line, column,
                                code.EntryPoint());
     total_len += len;
@@ skipping 118 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart