Implement capability to use the same library prefix for multiple library imports (currently this ...

vm/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_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 1690 matching lines @@
 
   static RawLibrary* New(const String& url);
 
   // Library scope name dictionary.
   void AddClass(const Class& cls) const;
   void AddObject(const Object& obj, const String& name) const;
   RawObject* LookupObject(const String& name) const;
   RawClass* LookupClass(const String& name) const;
   RawObject* LookupLocalObject(const String& name) const;
   RawClass* LookupLocalClass(const String& name) const;
+  RawLibraryPrefix* LookupLocalLibraryPrefix(const String& name) const;
   RawScript* LookupScript(const String& url) const;
   RawArray* LoadedScripts() const;
 
   void AddAnonymousClass(const Class& cls) const;
 
   // Library imports.
   RawString* LookupImportMap(const String& name) const;
   void AddImport(const Library& library) const;
   RawLibrary* LookupImport(const String& url) const;
 
   RawFunction* LookupFunctionInSource(const String& script_url,
                                       intptr_t line_number) const;
   RawFunction* LookupFunctionInScript(const Script& script,
                                       intptr_t token_index) const;
 
   // Resolving native methods for script loaded in the library.
   Dart_NativeEntryResolver native_entry_resolver() const {
     return raw_ptr()->native_entry_resolver_;
   }
   void set_native_entry_resolver(Dart_NativeEntryResolver value) const {
     raw_ptr()->native_entry_resolver_ = value;
   }
 
   RawString* PrivateName(const char* name);
 
   void Register() const;
 
   RawLibrary* next_registered() const { return raw_ptr()->next_registered_; }
 
+  RawString* DuplicateDefineErrorString(const String& entry_name,
+                                        const Library& conflicting_lib) const;
   static RawLibrary* LookupLibrary(const String& url);
   static RawString* CheckForDuplicateDefinition();
   static bool IsKeyUsed(intptr_t key);
 
   static void InitCoreLibrary(Isolate* isolate);
   static RawLibrary* CoreLibrary();
   static RawLibrary* CoreImplLibrary();
   static void InitNativeWrappersLibrary(Isolate* isolate);
   static RawLibrary* NativeWrappersLibrary();
 
@@ skipping 22 matching lines @@
   void InitClassDictionary() const;
   void InitImportList() const;
   void InitImportedIntoList() const;
   void GrowDictionary(const Array& dict, intptr_t dict_size) const;
   static RawLibrary* NewLibraryHelper(const String& url,
                                       bool import_core_lib);
   void AddImportedInto(const Library& library) const;
   RawObject* LookupObjectFiltered(const String& name,
                                   const Library& filter_lib) const;
   RawLibrary* LookupObjectInImporter(const String& name) const;
-  RawString* DuplicateDefineErrorString(const String& entry_name,
-                                        const Library& conflicting_lib) const;
-  RawString* FindDuplicateDefinition(Library* conflicting_lib) const;
+  RawString* FindDuplicateDefinition() const;
 
   HEAP_OBJECT_IMPLEMENTATION(Library, Object);
   friend class Class;
   friend class DictionaryIterator;
   friend class Debugger;
   friend class Isolate;
 };
 
 
 class LibraryPrefix : public Object {
  public:
   RawString* name() const { return raw_ptr()->name_; }
-  RawLibrary* library() const { return raw_ptr()->library_; }
+  RawArray* libraries() const { return raw_ptr()->libraries_; }
+  intptr_t num_libs() const { return raw_ptr()->num_libs_; }
+
+  RawLibrary* GetLibrary(int index) const;
+  void AddLibrary(const Library& library) const;
+  RawClass* LookupLocalClass(const String& class_name) const;
+  RawString* CheckForDuplicateDefinition() const;
 
   static intptr_t InstanceSize() {
     return RoundedAllocationSize(sizeof(RawLibraryPrefix));
   }
 
   static RawLibraryPrefix* New(const String& name, const Library& lib);
 
  private:
+  static const int kInitialSize = 2;
+  static const int kIncrementSize = 2;
+
   void set_name(const String& value) const;
-  void set_library(const Library& value) const;
+  void set_libraries(const Array& value) const;
+  void set_num_libs(intptr_t value) const;
   static RawLibraryPrefix* New();
 
   HEAP_OBJECT_IMPLEMENTATION(LibraryPrefix, Object);
   friend class Class;
   friend class Isolate;
 };
 
 
 class Instructions : public Object {
  public:
@@ skipping 1841 matching lines @@
 }
 
 
 void Context::SetAt(intptr_t index, const Instance& value) const {
   StorePointer(InstanceAddr(index), value.raw());
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_