Get rid of support for string interpolation in #import strings.

bin/main.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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
@@ skipping 12 matching lines @@
 
 // snapshot_buffer points to a snapshot if we link in a snapshot otherwise
 // it is initialized to NULL.
 extern const uint8_t* snapshot_buffer;
 
 
 // Global state that stores the original working directory..
 static const char* original_working_directory = NULL;
 
 
-// Global state that stores the import URL map specified on the
-// command line.
-static CommandLineOptions* import_map_options = NULL;
-
-
 // Global state that indicates whether perf_events symbol information
 // is to be generated or not.
 static File* perf_events_symbols_file = NULL;
 
 
 // Global state that indicates whether pprof symbol information is
 // to be generated or not.
 static const char* generate_pprof_symbols_filename = NULL;
 
 
@@ skipping 110 matching lines @@
 }
 
 
 static void ProcessFlowGraphOption(const char* flowgraph_option) {
   ASSERT(flowgraph_option != NULL);
   flow_graph_file = File::Open("flowgraph.cfg", File::kWriteTruncate);
   ASSERT(flow_graph_file != NULL);
 }
 
 
-static void ProcessImportMapOption(const char* map) {
-  ASSERT(map != NULL);
-  import_map_options->AddArgument(map);
-}
-
-
 static struct {
   const char* option_name;
   void (*process)(const char* option);
 } main_options[] = {
   { "--break_at=", ProcessBreakpointOption },
   { "--compile_all", ProcessCompileAllOption },
   { "--debug", ProcessDebugOption },
   { "--generate_perf_events_symbols", ProcessPerfEventsOption },
   { "--generate_pprof_symbols=", ProcessPprofOption },
-  { "--import_map=", ProcessImportMapOption },
   { "--package-root=", ProcessPackageRootOption },
   { "--generate_flow_graph", ProcessFlowGraphOption },
   { NULL, NULL }
 };
 
 
 static bool ProcessMainOptions(const char* option) {
   int i = 0;
   const char* name = main_options[0].option_name;
   while (name != NULL) {
@@ skipping 306 matching lines @@
     resolved_script_uri = Dart_NewString(script_uri);
   }
   Dart_Handle source = ReadSource(resolved_script_uri, builtin_lib);
   if (Dart_IsError(source)) {
     return source;
   }
   return Dart_LoadScript(resolved_script_uri, source);
 }
 
 
-static Dart_Handle CreateImportMap(CommandLineOptions* map) {
-  intptr_t length =  (map == NULL) ? 0 : map->count();
-  Dart_Handle import_map = Dart_NewList(length * 2);
-  for (intptr_t i = 0; i < length; i++) {
-    ASSERT(map->GetArgument(i) != NULL);
-    char* name = strdup(map->GetArgument(i));
-    ASSERT(name != NULL);
-    char* map_name = strchr(name, ',');
-    intptr_t index = i * 2;
-    if (map_name != NULL) {
-      *map_name = '\0';
-      map_name += 1;
-      Dart_ListSetAt(import_map, index, Dart_NewString(name));
-      Dart_ListSetAt(import_map, (index + 1), Dart_NewString(map_name));
-    } else {
-      Dart_ListSetAt(import_map, index, Dart_NewString(name));
-      Dart_ListSetAt(import_map, (index + 1), Dart_NewString(""));
-    }
-    free(name);
-  }
-  return import_map;
-}
-
-
 // Returns true on success, false on failure.
 static bool CreateIsolateAndSetupHelper(const char* script_uri,
                                         const char* main,
                                         bool resolve_script,
                                         void* data,
                                         char** error) {
   Dart_Isolate isolate =
       Dart_CreateIsolate(script_uri, main, snapshot_buffer, data, error);
   if (isolate == NULL) {
     return false;
@@ skipping 11 matching lines @@
 
   // Set up the library tag handler for this isolate.
   Dart_Handle result = Dart_SetLibraryTagHandler(LibraryTagHandler);
   if (Dart_IsError(result)) {
     *error = strdup(Dart_GetError(result));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     return false;
   }
 
-  // Set up the import map for this isolate.
-  result = Dart_SetImportMap(CreateImportMap(import_map_options));
-  if (Dart_IsError(result)) {
-    *error = strdup(Dart_GetError(result));
-    Dart_ExitScope();
-    Dart_ShutdownIsolate();
-    return false;
-  }
-
   // Prepare builtin and its dependent libraries for use to resolve URIs.
   Dart_Handle uri_lib = Builtin::LoadLibrary(Builtin::kUriLibrary);
   if (Dart_IsError(uri_lib)) {
     *error = strdup(Dart_GetError(uri_lib));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     return false;
   }
   Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);
   if (Dart_IsError(builtin_lib)) {
@@ skipping 153 matching lines @@
   if (handler != NULL) handler->Shutdown();
   delete isolate_data;
 }
 
 
 int main(int argc, char** argv) {
   char* executable_name;
   char* script_name;
   CommandLineOptions vm_options(argc);
   CommandLineOptions dart_options(argc);
-  CommandLineOptions import_map(argc);
-  import_map_options = &import_map;
   bool print_flags_seen = false;
 
   // Perform platform specific initialization.
   if (!Platform::Initialize()) {
     fprintf(stderr, "Initialization failed\n");
   }
 
   // Parse command line arguments.
   if (ParseArguments(argc,
                      argv,
@@ skipping 96 matching lines @@
   DumpPprofSymbolInfo();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   // Terminate process exit-code handler.
   Process::TerminateExitCodeHandler();
 
   free(const_cast<char*>(original_working_directory));
 
   return 0;
 }