Implement support for specifying string interopolation style variable substitution in the import ...

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 2158 matching lines @@
     *result = Api::NewLocalHandle(error);
     if (update_lib_status) {
       lib.SetLoadError();
     }
   }
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadScript(Dart_Handle url,
                                         Dart_Handle source,
-                                        Dart_LibraryTagHandler handler) {
+                                        Dart_LibraryTagHandler handler,
+                                        Dart_Handle import_map) {
   TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const String& url_str = Api::UnwrapStringHandle(url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(url, String);
   }
   const String& source_str = Api::UnwrapStringHandle(source);
   if (source_str.IsNull()) {
     RETURN_TYPE_ERROR(source, String);
   }
+  const Array& mapping_array = Api::UnwrapArrayHandle(import_map);
+  if (mapping_array.IsNull()) {
+    RETURN_TYPE_ERROR(import_map, Array);
+  }
   Library& library = Library::Handle(isolate->object_store()->root_library());
   if (!library.IsNull()) {
     const String& library_url = String::Handle(library.url());
     return Api::NewError("%s: A script has already been loaded from '%s'.",
                          CURRENT_FUNC, library_url.ToCString());
   }
   isolate->set_library_tag_handler(handler);
   library = Library::New(url_str);
+  library.set_import_map(mapping_array);
   library.Register();
   isolate->object_store()->set_root_library(library);
   Dart_Handle result;
   CompileSource(isolate,
                 library,
                 url_str,
                 source_str,
                 RawScript::kScript,
                 &result);
   return result;
@@ skipping 105 matching lines @@
   const Library& library = Library::Handle(Library::LookupLibrary(url_str));
   if (library.IsNull()) {
     return Api::NewError("%s: library '%s' not found.",
                          CURRENT_FUNC, url_str.ToCString());
   } else {
     return Api::NewLocalHandle(library);
   }
 }
 
 
-DART_EXPORT Dart_Handle Dart_LoadLibrary(Dart_Handle url, Dart_Handle source) {
+DART_EXPORT Dart_Handle Dart_LoadLibrary(Dart_Handle url,
+                                         Dart_Handle source,
+                                         Dart_Handle import_map) {
   TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const String& url_str = Api::UnwrapStringHandle(url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(url, String);
   }
   const String& source_str = Api::UnwrapStringHandle(source);
   if (source_str.IsNull()) {
     RETURN_TYPE_ERROR(source, String);
   }
+  const Array& mapping_array = Api::UnwrapArrayHandle(import_map);
+  if (mapping_array.IsNull()) {
+    RETURN_TYPE_ERROR(import_map, Array);
+  }
   Library& library = Library::Handle(Library::LookupLibrary(url_str));
   if (library.IsNull()) {
     library = Library::New(url_str);
+    library.set_import_map(mapping_array);
     library.Register();
   } else if (!library.LoadNotStarted()) {
     // The source for this library has either been loaded or is in the
     // process of loading.  Return an error.
     return Api::NewError("%s: library '%s' has already been loaded.",
                          CURRENT_FUNC, url_str.ToCString());
   }
   Dart_Handle result;
   CompileSource(isolate,
                 library,
@@ skipping 83 matching lines @@
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 
 }  // namespace dart