Changes to handle unresolved qualified identifiers.

runtime/vm/raw_object.h

 // Copyright (c) 2011, 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 "vm/assert.h"
 #include "vm/globals.h"
 #include "vm/snapshot.h"
 
 #include "include/dart_api.h"
 
 namespace dart {
 
 // Macrobatics to define the Object hierarchy of VM implementation classes.
 #define CLASS_LIST_NO_OBJECT(V)                                                \
   V(Class)                                                                     \
+  V(UnresolvedClass)                                                           \
   V(Type)                                                                      \
     V(ParameterizedType)                                                       \
     V(TypeParameter)                                                           \
     V(InstantiatedType)                                                        \
   V(TypeArguments)                                                             \
     V(TypeArray)                                                               \
     V(InstantiatedTypeArguments)                                               \
   V(Function)                                                                  \
   V(Field)                                                                     \
   V(TokenStream)                                                               \
@@ skipping 186 matching lines @@
   intptr_t num_native_fields_;  // Number of native fields in class.
   int8_t class_state_;  // Of type ClassState.
   bool is_const_;
   bool is_interface_;
 
   friend class Object;
   friend class RawInstance;
 };
 
 
+class RawUnresolvedClass : public RawObject {
+  RAW_HEAP_OBJECT_IMPLEMENTATION(UnresolvedClass);
+
+  RawObject** from() {
+    return reinterpret_cast<RawObject**>(&ptr()->qualifier_);
+  }
+  RawString* qualifier_;  // Qualifier for the identifier.
+  RawString* ident_;  // name of the unresolved identifier.
+  RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->ident_); }
+  intptr_t token_index_;
+};
+
+
 class RawType : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Type);
 
   friend class ObjectStore;
 };
 
 
 class RawParameterizedType : public RawType {
  private:
   enum TypeState {
     kAllocated,  // Initial state.
     kBeingFinalized,  // In the process of being finalized.
     kFinalized,  // Type ready for use.
   };
 
   RAW_HEAP_OBJECT_IMPLEMENTATION(ParameterizedType);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->type_class_);
   }
-  RawObject* type_class_;  // Either resolved class or class name.
+  RawObject* type_class_;  // Either resolved class or unresolved class.
   RawTypeArguments* arguments_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->arguments_); }
   int8_t type_state_;
 };
 
 
 class RawTypeParameter : public RawType {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(TypeParameter);
 
@@ skipping 483 matching lines @@
   intptr_t type_;  // Uninitialized, simple or complex.
   intptr_t flags_;  // Represents global/local, case insensitive, multiline.
 
   // Variable length data follows here.
   uint8_t data_[0];
 };
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_