Index: pkg/compiler/lib/src/common/resolution.dart |
diff --git a/pkg/compiler/lib/src/common/resolution.dart b/pkg/compiler/lib/src/common/resolution.dart |
index 0ccd78e506942e2c2da01c9ce926c72efe0ff909..3e3bf22c0277cc148e36b1d8312b4885d0581b3b 100644 |
--- a/pkg/compiler/lib/src/common/resolution.dart |
+++ b/pkg/compiler/lib/src/common/resolution.dart |
@@ -31,6 +31,7 @@ import '../mirrors_used.dart'; |
import '../options.dart' show CompilerOptions; |
import '../parser/element_listener.dart' show ScannerOptions; |
import '../parser/parser_task.dart'; |
+import '../scanner/scanner_task.dart'; |
import '../patch_parser.dart'; |
import '../resolution/resolution.dart'; |
import '../tree/tree.dart' show Send, TypeAnnotation; |
@@ -216,10 +217,12 @@ abstract class Resolution implements Frontend { |
/// A container of commonly used dependencies for tasks that involve parsing. |
abstract class ParsingContext { |
factory ParsingContext(DiagnosticReporter reporter, ParserTask parser, |
- PatchParserTask patchParser, Backend backend) = _ParsingContext; |
+ ScannerTask scanner, PatchParserTask patchParser, Backend backend) |
+ = _ParsingContext; |
DiagnosticReporter get reporter; |
ParserTask get parser; |
+ ScannerTask get scanner; |
PatchParserTask get patchParser; |
/// Use [patchParser] directly instead. |
@@ -237,10 +240,12 @@ abstract class ParsingContext { |
class _ParsingContext implements ParsingContext { |
final DiagnosticReporter reporter; |
final ParserTask parser; |
+ final ScannerTask scanner; |
final PatchParserTask patchParser; |
final Backend backend; |
- _ParsingContext(this.reporter, this.parser, this.patchParser, this.backend); |
+ _ParsingContext(this.reporter, this.parser, this.scanner, this.patchParser, |
+ this.backend); |
@override |
measure(f()) => parser.measure(f); |