Remove library_map.dart.

lib/compiler/implementation/apiimpl.dart

 // 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.
 
 #library('leg_apiimpl');
 
 #import('dart:uri');
 
 #import('../compiler.dart', prefix: 'api');
 #import('leg.dart', prefix: 'leg');
 #import('tree/tree.dart', prefix: 'tree');
 #import('elements/elements.dart', prefix: 'elements');
 #import('ssa/tracer.dart', prefix: 'ssa');
-#import('library_map.dart');
+#import('../../../lib/_internal/libraries.dart');
 #import('source_file.dart');
 
 class Compiler extends leg.Compiler {
   api.ReadStringFromUri provider;
   api.DiagnosticHandler handler;
   final Uri libraryRoot;
   final Uri packageRoot;
   List<String> options;
   bool mockableLibraryUsed = false;
 
   Compiler(this.provider, this.handler, this.libraryRoot, this.packageRoot,
            List<String> options)
-    : this.options = options,
-      super(
-          tracer: new ssa.HTracer(),
-          enableTypeAssertions: options.indexOf('--enable-checked-mode') != -1,
-          enableUserAssertions: options.indexOf('--enable-checked-mode') != -1,
-          emitJavascript: options.indexOf('--output-type=dart') == -1,
-          minify: options.indexOf('--minify') != -1,
-          cutDeclarationTypes: options.indexOf('--cutDeclarationTypes') != -1);
+      : this.options = options,
+        super(
+            tracer: new ssa.HTracer(),
+            enableTypeAssertions: _hasOption(options, '--enable-checked-mode'),
+            enableUserAssertions: _hasOption(options, '--enable-checked-mode'),
+            emitJavascript: !_hasOption(options, '--output-type=dart'),
+            minify: _hasOption(options, '--minify'),
+            cutDeclarationTypes: _hasOption(options, '--cutDeclarationTypes'));
+
+  static bool _hasOption(List<String> options, String option) {

[ahe, 2012/08/29 12:30:21]

Why is this method private?

[Lasse Reichstein Nielsen, 2012/08/29 12:43:53]

Because it can't be unnamed, and I can't make it visible only in the scope of
the super-call.
But I'll make it public.
And remove it when Collection gets a "contains" method.

+    return options.indexOf(option) >= 0;
+  }
+
+  String lookupDartLibraryPath(String dartLibraryName) {
+    LibraryInfo info = LIBRARIES[dartLibraryName];
+    if (info == null) return null;

[ahe, 2012/08/29 12:30:21]

Please use === as long as the new == semantics aren't implemented in dart2js.

[Lasse Reichstein Nielsen, 2012/08/29 12:43:53]

The semantics change will not make any difference here. 
But done.

+    if (!info.isDart2jsLibrary) return null;
+    String path = info.dart2jsPath;
+    if (path == null) path = info.path;

[ahe, 2012/08/29 12:30:21]

===

[ahe, 2012/08/29 12:30:21]

This looks like a bail out, but it is not a return statement. I think my style
preference would be:

if (path == null) {
  path = info.path;
}

[Lasse Reichstein Nielsen, 2012/08/29 12:43:53]

Done.

+    return "lib/$path";
+  }
+
+  String lookupDartPatchPath(String dartLibraryName) {

[ahe, 2012/08/29 12:30:21]

Remove "dart" from method name. This brings focus to the difference.

[Lasse Reichstein Nielsen, 2012/08/29 12:43:53]

Done.

+    LibraryInfo info = LIBRARIES[dartLibraryName];
+    if (info == null) return null;
+    if (!info.isDart2jsLibrary) return null;
+    String path = info.dart2jsPatchPath;
+    if (path == null) return null;
+    return "lib/$path";
+  }
 
   elements.LibraryElement scanBuiltinLibrary(String path) {
-    Uri uri = libraryRoot.resolve(DART2JS_LIBRARY_MAP[path].libraryPath);
+    Uri uri = libraryRoot.resolve(lookupDartLibraryPath(path));
     Uri canonicalUri;
     if (path.startsWith("_")) {
       canonicalUri = uri;
     } else {
       canonicalUri = new Uri.fromComponents(scheme: "dart", path: path);
     }
     elements.LibraryElement library =
         scanner.loadLibrary(uri, null, canonicalUri);
     return library;
   }
@@ skipping 23 matching lines @@
   }
 
   Uri translateUri(Uri uri, tree.Node node) {
     switch (uri.scheme) {
       case 'package': return translatePackageUri(uri, node);
       default: return uri;
     }
   }
 
   Uri translateDartUri(Uri uri, tree.Node node) {
-    String path = DART2JS_LIBRARY_MAP[uri.path].libraryPath;
-    if (path === null || uri.path.startsWith('_')) {
+    String path = lookupDartLibraryPath(uri.path);
+    if (path === null || LIBRARIES[uri.path].category == "Internal") {
       reportError(node, 'library not found ${uri}');
       return null;
     }
-    if (uri.path == 'dom_deprecated'
-        || uri.path == 'html' || uri.path == 'io') {
+    if (uri.path == 'dom_deprecated' ||
+        uri.path == 'html' ||
+        uri.path == 'io') {
       // TODO(ahe): Get rid of mockableLibraryUsed when test.dart
       // supports this use case better.
       mockableLibraryUsed = true;
     }
     return libraryRoot.resolve(path);
   }
 
   Uri resolvePatchUri(String dartLibraryPath) {
-    String patchPath = DART2JS_LIBRARY_MAP[dartLibraryPath].patchPath;
+    String patchPath = lookupDartPatchPath(dartLibraryPath);
     if (patchPath === null) return null;
     return libraryRoot.resolve(patchPath);
   }
 
   translatePackageUri(Uri uri, tree.Node node) => packageRoot.resolve(uri.path);
 
   bool run(Uri uri) {
     bool success = super.run(uri);
     for (final task in tasks) {
       log('${task.name} took ${task.timing}msec');
@@ skipping 14 matching lines @@
       handler(translateUri(span.uri, null), span.begin, span.end,
               message, kind);
     }
   }
 
   bool get isMockCompilation {
     return mockableLibraryUsed
       && (options.indexOf('--allow-mock-compilation') !== -1);
   }
 }