| Index: pkg/compiler/lib/src/js_backend/backend_helpers.dart
|
| diff --git a/pkg/compiler/lib/src/js_backend/backend_helpers.dart b/pkg/compiler/lib/src/js_backend/backend_helpers.dart
|
| index 804594c9f01b55d3a555972860ba0ea258da4f38..aac308d4c2f5f19dd10a04bac14a6a36f915752f 100644
|
| --- a/pkg/compiler/lib/src/js_backend/backend_helpers.dart
|
| +++ b/pkg/compiler/lib/src/js_backend/backend_helpers.dart
|
| @@ -5,26 +5,21 @@
|
| library dart2js.js_backend.helpers;
|
|
|
| import '../common.dart';
|
| -import '../common/names.dart' show
|
| - Identifiers,
|
| - Uris;
|
| -import '../common/resolution.dart' show
|
| - Resolution;
|
| -import '../compiler.dart' show
|
| - Compiler;
|
| -import '../core_types.dart' show
|
| - CoreClasses;
|
| -import '../elements/elements.dart' show
|
| - AbstractFieldElement,
|
| - ClassElement,
|
| - ConstructorElement,
|
| - Element,
|
| - EnumClassElement,
|
| - FunctionElement,
|
| - LibraryElement,
|
| - MethodElement;
|
| -import '../library_loader.dart' show
|
| - LoadedLibraries;
|
| +import '../common/names.dart' show Identifiers, Uris;
|
| +import '../common/resolution.dart' show Resolution;
|
| +import '../compiler.dart' show Compiler;
|
| +import '../core_types.dart' show CoreClasses;
|
| +import '../elements/elements.dart'
|
| + show
|
| + AbstractFieldElement,
|
| + ClassElement,
|
| + ConstructorElement,
|
| + Element,
|
| + EnumClassElement,
|
| + FunctionElement,
|
| + LibraryElement,
|
| + MethodElement;
|
| +import '../library_loader.dart' show LoadedLibraries;
|
|
|
| import 'js_backend.dart';
|
|
|
| @@ -37,14 +32,12 @@ class BackendHelpers {
|
| new Uri(scheme: 'dart', path: '_foreign_helper');
|
| static final Uri DART_JS_MIRRORS =
|
| new Uri(scheme: 'dart', path: '_js_mirrors');
|
| - static final Uri DART_JS_NAMES =
|
| - new Uri(scheme: 'dart', path: '_js_names');
|
| + static final Uri DART_JS_NAMES = new Uri(scheme: 'dart', path: '_js_names');
|
| static final Uri DART_EMBEDDED_NAMES =
|
| new Uri(scheme: 'dart', path: '_js_embedded_names');
|
| static final Uri DART_ISOLATE_HELPER =
|
| new Uri(scheme: 'dart', path: '_isolate_helper');
|
| - static final Uri PACKAGE_JS =
|
| - new Uri(scheme: 'package', path: 'js/js.dart');
|
| + static final Uri PACKAGE_JS = new Uri(scheme: 'package', path: 'js/js.dart');
|
|
|
| static const String INVOKE_ON = '_getCachedInvocation';
|
| static const String START_ROOT_ISOLATE = 'startRootIsolate';
|
| @@ -67,7 +60,6 @@ class BackendHelpers {
|
| MethodElement assertThrow;
|
| MethodElement assertHelper;
|
|
|
| -
|
| LibraryElement jsHelperLibrary;
|
| LibraryElement asyncLibrary;
|
| LibraryElement interceptorsLibrary;
|
| @@ -203,9 +195,9 @@ class BackendHelpers {
|
| asyncLibrary = library;
|
| } else if (uri == Uris.dart__internal) {
|
| internalLibrary = library;
|
| - } else if (uri == DART_INTERCEPTORS) {
|
| + } else if (uri == DART_INTERCEPTORS) {
|
| interceptorsLibrary = library;
|
| - } else if (uri == DART_FOREIGN_HELPER) {
|
| + } else if (uri == DART_FOREIGN_HELPER) {
|
| foreignLibrary = library;
|
| } else if (uri == DART_ISOLATE_HELPER) {
|
| isolateHelperLibrary = library;
|
| @@ -225,7 +217,8 @@ class BackendHelpers {
|
| boundClosureClass = lookupHelperClass('BoundClosure');
|
| closureClass = lookupHelperClass('Closure');
|
| if (!missingHelperClasses.isEmpty) {
|
| - reporter.internalError(jsHelperLibrary,
|
| + reporter.internalError(
|
| + jsHelperLibrary,
|
| 'dart:_js_helper library does not contain required classes: '
|
| '$missingHelperClasses');
|
| }
|
| @@ -309,7 +302,6 @@ class BackendHelpers {
|
| }
|
| }
|
|
|
| -
|
| void onLibrariesLoaded(LoadedLibraries loadedLibraries) {
|
| assert(loadedLibraries.containsLibrary(Uris.dart_core));
|
| assert(loadedLibraries.containsLibrary(DART_INTERCEPTORS));
|
| @@ -340,8 +332,7 @@ class BackendHelpers {
|
| }
|
|
|
| jsIndexableClass.ensureResolved(resolution);
|
| - jsIndexableLength = compiler.lookupElementIn(
|
| - jsIndexableClass, 'length');
|
| + jsIndexableLength = compiler.lookupElementIn(jsIndexableClass, 'length');
|
| if (jsIndexableLength != null && jsIndexableLength.isAbstractField) {
|
| AbstractFieldElement element = jsIndexableLength;
|
| jsIndexableLength = element.getter;
|
| @@ -396,7 +387,6 @@ class BackendHelpers {
|
| return findHelper('isJsIndexable');
|
| }
|
|
|
| -
|
| Element get throwIllegalArgumentException {
|
| return findHelper('iae');
|
| }
|
| @@ -608,8 +598,7 @@ class BackendHelpers {
|
| }
|
|
|
| Element get asyncStarController {
|
| - ClassElement classElement =
|
| - findAsyncHelper("_AsyncStarStreamController");
|
| + ClassElement classElement = findAsyncHelper("_AsyncStarStreamController");
|
| classElement.ensureResolved(resolution);
|
| return classElement;
|
| }
|
|
|