Index: pkg/compiler/lib/src/patch_parser.dart |
diff --git a/pkg/compiler/lib/src/patch_parser.dart b/pkg/compiler/lib/src/patch_parser.dart |
index 593b08fb43519d980fbc981ed080fe4cca2b395c..ee1ec00ea0455707bd0152a420bb20a5d94f4c1d 100644 |
--- a/pkg/compiler/lib/src/patch_parser.dart |
+++ b/pkg/compiler/lib/src/patch_parser.dart |
@@ -149,7 +149,8 @@ import 'parser/partial_elements.dart' show |
import 'parser/partial_parser.dart' show |
PartialParser; |
import 'parser/parser.dart' show |
- Parser; |
+ Parser, |
+ ParserOptions; |
import 'scanner/scanner.dart' show |
Scanner; |
import 'script.dart'; |
@@ -159,11 +160,9 @@ import 'tokens/token.dart' show |
class PatchParserTask extends CompilerTask { |
final String name = "Patching Parser"; |
- final bool _enableConditionalDirectives; |
+ final ParserOptions parserOptions; |
- PatchParserTask(Compiler compiler, {bool enableConditionalDirectives}) |
- : this._enableConditionalDirectives = enableConditionalDirectives, |
- super(compiler); |
+ PatchParserTask(Compiler compiler, this.parserOptions) : super(compiler); |
/** |
* Scans a library patch file, applies the method patches and |
@@ -198,9 +197,7 @@ class PatchParserTask extends CompilerTask { |
compilationUnit, |
idGenerator); |
try { |
- new PartialParser(patchListener, |
- enableConditionalDirectives: _enableConditionalDirectives) |
- .parseUnit(tokens); |
+ new PartialParser(patchListener, parserOptions).parseUnit(tokens); |
} on ParserError catch (e) { |
// No need to recover from a parser error in platform libraries, user |
// will never see this if the libraries are tested correctly. |
@@ -217,8 +214,7 @@ class PatchParserTask extends CompilerTask { |
measure(() => reporter.withCurrentElement(cls, () { |
MemberListener listener = new PatchMemberListener(compiler, cls); |
- Parser parser = new PatchClassElementParser( |
- listener, enableConditionalDirectives: _enableConditionalDirectives); |
+ Parser parser = new PatchClassElementParser(listener, parserOptions); |
try { |
Token token = parser.parseTopLevelDeclaration(cls.beginToken); |
assert(identical(token, cls.endToken.next)); |
@@ -270,9 +266,8 @@ class PatchMemberListener extends MemberListener { |
* declarations. |
*/ |
class PatchClassElementParser extends PartialParser { |
- PatchClassElementParser(Listener listener, {bool enableConditionalDirectives}) |
- : super(listener, |
- enableConditionalDirectives: enableConditionalDirectives); |
+ PatchClassElementParser(Listener listener, ParserOptions options) |
+ : super(listener, options); |
Token parseClassBody(Token token) => fullParseClassBody(token); |
} |