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

vm/raw_object.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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 384 matching lines @@
     return reinterpret_cast<RawObject**>(&ptr()->allocation_stub_);
   }
 
   cpp_vtable handle_vtable_;
   intptr_t instance_size_;  // Size if fixed length or 0 if variable length.
   ObjectKind instance_kind_;
   intptr_t id_;  // Class Id, also index in the class table.
   intptr_t type_arguments_instance_field_offset_;  // May be kNoTypeArguments.
   intptr_t next_field_offset_;  // Offset of the next instance field.
   intptr_t num_native_fields_;  // Number of native fields in class.
-  intptr_t token_index_;
+  intptr_t token_pos_;
   int8_t class_state_;  // Of type ClassState.
   bool is_const_;
   bool is_interface_;
 
   friend class Object;
   friend class RawInstance;
   friend class RawInstructions;
   friend class SnapshotReader;
 };
 
 
 class RawUnresolvedClass : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(UnresolvedClass);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->library_prefix_);
   }
   RawLibraryPrefix* library_prefix_;  // Library prefix qualifier for the ident.
   RawString* ident_;  // Name of the unresolved identifier.
   RawClass* factory_signature_class_;  // Expected type parameters for factory.
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->factory_signature_class_);
   }
-  intptr_t token_index_;
+  intptr_t token_pos_;
 };
 
 
 class RawAbstractType : public RawObject {
  protected:
   enum TypeState {
     kAllocated,  // Initial state.
     kBeingFinalized,  // In the process of being finalized.
     kFinalizedInstantiated,  // Instantiated type ready for use.
     kFinalizedUninstantiated,  // Uninstantiated type ready for use.
@@ skipping 12 matching lines @@
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->type_class_);
   }
   RawObject* type_class_;  // Either resolved class or unresolved class.
   RawAbstractTypeArguments* arguments_;
   RawError* malformed_error_;  // Error object if type is malformed.
   RawObject** to() {
       return reinterpret_cast<RawObject**>(&ptr()->malformed_error_);
   }
-  intptr_t token_index_;
+  intptr_t token_pos_;
   int8_t type_state_;
 };
 
 
 class RawTypeParameter : public RawAbstractType {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(TypeParameter);
 
   RawObject** from() {
       return reinterpret_cast<RawObject**>(&ptr()->parameterized_class_);
   }
   RawClass* parameterized_class_;
   RawString* name_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   intptr_t index_;
-  intptr_t token_index_;
+  intptr_t token_pos_;
   int8_t type_state_;
 };
 
 
 class RawInstantiatedType : public RawAbstractType {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(InstantiatedType);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->uninstantiated_type_);
@@ skipping 75 matching lines @@
   RawCode* unoptimized_code_;  // Unoptimized code, keep it after optimization.
   RawContextScope* context_scope_;
   RawFunction* parent_function_;  // Enclosing function of this local function.
   RawClass* signature_class_;  // Only for closure or signature function.
   RawCode* closure_allocation_stub_;  // Stub code for allocation of closures.
   RawFunction* implicit_closure_function_;  // Implicit closure function.
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->implicit_closure_function_);
   }
 
-  intptr_t token_index_;
-  intptr_t end_token_index_;
+  intptr_t token_pos_;
+  intptr_t end_token_pos_;
   intptr_t num_fixed_parameters_;
   intptr_t num_optional_parameters_;
   intptr_t usage_counter_;  // Incremented while function is running.
   intptr_t deoptimization_counter_;
   Kind kind_;
   bool is_static_;
   bool is_const_;
   bool is_optimizable_;
   bool is_native_;
 };
 
 
 class RawField : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Field);
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   RawString* name_;
   RawClass* owner_;
   RawAbstractType* type_;
   RawInstance* value_;  // Offset for instance and value for static fields.
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->value_); }
 
-  intptr_t token_index_;
+  intptr_t token_pos_;
   bool is_static_;
   bool is_final_;
   bool has_initializer_;
 };
 
 
 class RawLiteralToken : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(LiteralToken);
 
   RawObject** from() {
@@ skipping 241 matching lines @@
   friend class SnapshotReader;
 };
 
 
 class RawContextScope : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ContextScope);
 
   // TODO(iposva): Switch to convential enum offset based structure to avoid
   // alignment mishaps.
   struct VariableDesc {
-    RawSmi* token_index;
+    RawSmi* token_pos;
     RawString* name;
     RawBool* is_final;
     RawAbstractType* type;
     RawSmi* context_index;
     RawSmi* context_level;
   };
 
   intptr_t num_variables_;
 
   // Variable length data follows here.
@@ skipping 645 matching lines @@
          kExternalUint64Array == kByteArray + 18 &&
          kExternalFloat32Array == kByteArray + 19 &&
          kExternalFloat64Array == kByteArray + 20 &&
          kClosure == kByteArray + 21);
   return (index >= kByteArray && index <= kClosure);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_