Beginning support for library prefixes in the dart API.

runtime/vm/dart_api_impl.cc

Index: runtime/vm/dart_api_impl.cc
diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc
index 19c6df3f7febd144b46af5e3bed862a122ab9e0b..a3120dd19df7b7abb2ce32ee1a8094afa1b551c6 100644
--- a/runtime/vm/dart_api_impl.cc
+++ b/runtime/vm/dart_api_impl.cc
@@ -2634,7 +2634,7 @@ DART_EXPORT Dart_Handle Dart_LookupFunction(Dart_Handle target,
       func = lib.LookupFunctionAllowPrivate(tmp_name);
     }
 
-    // Case 3.  Lookup the funciton with the getter prefix prepended.
+    // Case 3.  Lookup the function with the getter prefix prepended.
     if (func.IsNull()) {
       tmp_name = Field::GetterName(func_name);
       func = lib.LookupFunctionAllowPrivate(tmp_name);
@@ -4034,7 +4034,8 @@ DART_EXPORT Dart_Handle Dart_LoadLibrary(Dart_Handle url,
 
 
 DART_EXPORT Dart_Handle Dart_LibraryImportLibrary(Dart_Handle library,
-                                                  Dart_Handle import) {
+                                                  Dart_Handle import,
+                                                  Dart_Handle prefix) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Library& library_vm = Api::UnwrapLibraryHandle(isolate, library);
@@ -4045,7 +4046,24 @@ DART_EXPORT Dart_Handle Dart_LibraryImportLibrary(Dart_Handle library,
   if (import_vm.IsNull()) {
     RETURN_TYPE_ERROR(isolate, import, Library);
   }
-  library_vm.AddImport(import_vm);
+  const String& prefix_vm = Api::UnwrapStringHandle(isolate, prefix);
+  if (prefix_vm.IsNull()) {

[Ivan Posva, 2012/08/27 23:55:00]

I would expect that an empty prefix is equivalent to an empty string. Although
Todd has a better overview of the API.

[Mads Ager (google), 2012/08/28 05:58:31]

I'll be happy to do it either way. Let me know what you guys want so I can move
forward with this change (and coordinate with Dartium changes as well).

+    RETURN_TYPE_ERROR(isolate, prefix, String);
+  }
+  const String& prefix_symbol =
+      String::Handle(isolate, Symbols::New(prefix_vm));
+  if (prefix_vm.Length() == 0) {
+    library_vm.AddImport(import_vm);
+  } else {
+    LibraryPrefix& library_prefix = LibraryPrefix::Handle();
+    library_prefix = library_vm.LookupLocalLibraryPrefix(prefix_symbol);
+    if (!library_prefix.IsNull()) {
+      library_prefix.AddLibrary(import_vm);
+    } else {
+      library_prefix = LibraryPrefix::New(prefix_symbol, import_vm);
+      library_vm.AddObject(library_prefix, prefix_symbol);
+    }
+  }
   return Api::Success(isolate);
 }