Index: pkg/compiler/lib/src/resolution/resolution_common.dart |
diff --git a/pkg/compiler/lib/src/resolution/resolution_common.dart b/pkg/compiler/lib/src/resolution/resolution_common.dart |
index 819c2921d84d66de04738cf0f41f29d4901949d9..53d3c69b7cf3d3fb9d729f5b228d368fd2740db2 100644 |
--- a/pkg/compiler/lib/src/resolution/resolution_common.dart |
+++ b/pkg/compiler/lib/src/resolution/resolution_common.dart |
@@ -6,22 +6,18 @@ library dart2js.resolution.common; |
import '../common.dart'; |
import '../common/resolution.dart' show Resolution; |
-import '../compiler.dart' show Compiler; |
import '../elements/elements.dart'; |
import '../tree/tree.dart'; |
- |
import 'registry.dart' show ResolutionRegistry; |
import 'scope.dart' show Scope; |
import 'type_resolver.dart' show TypeResolver; |
class CommonResolverVisitor<R> extends Visitor<R> { |
- final Compiler compiler; |
- |
- CommonResolverVisitor(Compiler this.compiler); |
+ final Resolution resolution; |
- DiagnosticReporter get reporter => compiler.reporter; |
+ CommonResolverVisitor(this.resolution); |
- Resolution get resolution => compiler.resolution; |
+ DiagnosticReporter get reporter => resolution.reporter; |
R visitNode(Node node) { |
return reporter.internalError( |
@@ -34,7 +30,7 @@ class CommonResolverVisitor<R> extends Visitor<R> { |
R visit(Node node) => (node == null) ? null : node.accept(this); |
void addDeferredAction(Element element, void action()) { |
- compiler.enqueuer.resolution.addDeferredAction(element, action); |
+ resolution.enqueuer.addDeferredAction(element, action); |
} |
} |
@@ -52,9 +48,9 @@ abstract class MappingVisitor<T> extends CommonResolverVisitor<T> { |
/// The current scope of the visitor. |
Scope get scope; |
- MappingVisitor(Compiler compiler, ResolutionRegistry this.registry) |
- : typeResolver = new TypeResolver(compiler), |
- super(compiler); |
+ MappingVisitor(Resolution resolution, this.registry) |
+ : typeResolver = new TypeResolver(resolution), |
+ super(resolution); |
AsyncMarker get currentAsyncMarker => AsyncMarker.SYNC; |