Beginning support for library prefixes in the dart API.

runtime/vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 2616 matching lines @@
 
     // Case 2.  Lookup the function without the external setter suffix
     // '='.  Make sure to do this check after the regular lookup, so
     // that we don't interfere with operator lookups (like ==).
     if (func.IsNull() && HasExternalSetterSuffix(func_name)) {
       tmp_name = RemoveExternalSetterSuffix(func_name);
       tmp_name = Field::SetterName(tmp_name);
       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);
     }
   } else {
     return Api::NewError(
         "%s expects argument 'target' to be a class or library.",
         CURRENT_FUNC);
   }
 
@@ skipping 1379 matching lines @@
     const char* msg = CheckIsolateState(isolate);
     if (msg != NULL) {
       return Api::NewError(msg);
     }
   }
   return result;
 }
 
 
 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);
   if (library_vm.IsNull()) {
     RETURN_TYPE_ERROR(isolate, library, Library);
   }
   const Library& import_vm = Api::UnwrapLibraryHandle(isolate, import);
   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);
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadSource(Dart_Handle library,
                                         Dart_Handle url,
                                         Dart_Handle source) {
   TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
@@ skipping 69 matching lines @@
 DART_EXPORT void Dart_InitPerfEventsSupport(Dart_FileWriterFunction function) {
   Dart::set_perf_events_writer(function);
 }
 
 
 DART_EXPORT void Dart_InitFlowGraphPrinting(Dart_FileWriterFunction function) {
   Dart::set_flow_graph_writer(function);
 }
 
 }  // namespace dart