Index: tests/compiler/dart2js/compiler_helper.dart |
diff --git a/tests/compiler/dart2js/compiler_helper.dart b/tests/compiler/dart2js/compiler_helper.dart |
index 8cfc920ca2dcd6ba711cc2818a617a9eb9f31218..df1dc987a7519631634592c64c7a0978f5ca3a0b 100644 |
--- a/tests/compiler/dart2js/compiler_helper.dart |
+++ b/tests/compiler/dart2js/compiler_helper.dart |
@@ -16,16 +16,12 @@ export 'package:compiler/src/elements/elements.dart'; |
import 'package:compiler/src/js_backend/js_backend.dart' |
as js; |
-import 'package:compiler/src/dart2jslib.dart' |
- as leg; |
-export 'package:compiler/src/dart2jslib.dart' |
- show Selector, |
- SourceSpan; |
+import 'package:compiler/src/common/codegen.dart'; |
+import 'package:compiler/src/common/resolution.dart'; |
-export 'package:compiler/src/messages.dart' |
- show Message, |
- MessageKind, |
- MessageTemplate; |
+export 'package:compiler/src/diagnostics/source_span.dart'; |
+export 'package:compiler/src/diagnostics/spannable.dart'; |
+export 'package:compiler/src/messages.dart'; |
import 'package:compiler/src/types/types.dart' |
as types; |
@@ -35,7 +31,7 @@ export 'package:compiler/src/types/types.dart' |
import 'package:compiler/src/util/util.dart'; |
export 'package:compiler/src/util/util.dart'; |
-import 'package:compiler/src/dart2jslib.dart' |
+import 'package:compiler/src/compiler.dart' |
show Compiler; |
export 'package:compiler/src/tree/tree.dart'; |
@@ -71,11 +67,11 @@ Future<String> compile(String code, |
compiler.world.populate(); |
compiler.backend.onResolutionComplete(); |
var context = new js.JavaScriptItemCompilationContext(); |
- leg.ResolutionWorkItem resolutionWork = |
- new leg.ResolutionWorkItem(element, context); |
+ ResolutionWorkItem resolutionWork = |
+ new ResolutionWorkItem(element, context); |
resolutionWork.run(compiler, compiler.enqueuer.resolution); |
- leg.CodegenWorkItem work = |
- new leg.CodegenWorkItem(compiler, element, context); |
+ CodegenWorkItem work = |
+ new CodegenWorkItem(compiler, element, context); |
compiler.phase = Compiler.PHASE_COMPILING; |
work.run(compiler, compiler.enqueuer.codegen); |
js.JavaScriptBackend backend = compiler.backend; |