Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(563)

Unified Diff: lib/src/compiler.dart

Issue 1689013002: Use Uris for corelibOrder (Closed) Base URL: git@github.com:dart-lang/dev_compiler.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/src/codegen/module_builder.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/compiler.dart
diff --git a/lib/src/compiler.dart b/lib/src/compiler.dart
index 33b453392778f0456e09383de95514c90dd918e5..5375a3575570a49bc43441dd4ad941bf2d5d18b9 100644
--- a/lib/src/compiler.dart
+++ b/lib/src/compiler.dart
@@ -489,61 +489,40 @@ AnalysisErrorListener createErrorReporter(
// TODO(jmesserly): find a better home for these.
/// Curated order to minimize lazy classes needed by dart:core and its
/// transitive SDK imports.
-const corelibOrder = const [
- 'dart.core',
- 'dart.collection',
- 'dart._internal',
- 'dart.math',
- 'dart._interceptors',
- 'dart.async',
- 'dart._foreign_helper',
- 'dart._js_embedded_names',
- 'dart._js_helper',
- 'dart.isolate',
- 'dart.typed_data',
- 'dart._native_typed_data',
- 'dart._isolate_helper',
- 'dart._js_primitives',
- 'dart.convert',
+final corelibOrder = [
+ 'dart:core',
+ 'dart:collection',
+ 'dart:_internal',
+ 'dart:math',
+ 'dart:_interceptors',
+ 'dart:async',
+ 'dart:_foreign_helper',
+ 'dart:_js_embedded_names',
+ 'dart:_js_helper',
+ 'dart:isolate',
+ 'dart:typed_data',
+ 'dart:_native_typed_data',
+ 'dart:_isolate_helper',
+ 'dart:_js_primitives',
+ 'dart:convert',
// TODO(jmesserly): these are not part of corelib library cycle, and shouldn't
// be listed here. Instead, their source should be copied on demand if they
// are actually used by the application.
- 'dart.mirrors',
- 'dart._js_mirrors',
- 'dart.js',
- 'dart._metadata',
- 'dart.dom.html',
- 'dart.dom.html_common',
- 'dart._debugger'
+ 'dart:mirrors',
+ 'dart:_js_mirrors',
+ 'dart:js',
+ 'dart:_metadata',
+ 'dart:html',
+ 'dart:html_common',
+ 'dart:_debugger'
// _foreign_helper is not included, as it only defines the JS builtin that
// the compiler handles at compile time.
-];
-
-/// Returns the JS module name corresponding to a core library name (must be
-/// from the [corelibOrder] list).
-String getCorelibModuleName(String lib) {
- assert(corelibOrder.contains(lib));
- switch (lib) {
- case 'dart.dom.html_common':
- return 'dart/html_common';
- case 'dart.dom.html':
- return 'dart/html';
- default:
- return lib.replaceAll('dart.', 'dart/');
- }
-}
+].map(Uri.parse).toList();
/// Runtime files added to all applications when running the compiler in the
/// command line.
final defaultRuntimeFiles = () {
- String coreToFile(String name) {
- var parts = name.split('.');
- var length = parts.length;
- if (length > 1) {
- name = parts[0] + '/' + parts[length - 1];
- }
- return name + '.js';
- }
+ String coreToFile(Uri uri) => uri.toString().replaceAll(':', '/') + '.js';
var files = [
'harmony_feature_check.js',
« no previous file with comments | « lib/src/codegen/module_builder.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698