| 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 977d8a901f62a22ec8a0a5f8bef0dc9e083b2eba..fb2e437048ae709b5bf2282804e6453a7365ad99 100644
|
| --- a/pkg/compiler/lib/src/patch_parser.dart
|
| +++ b/pkg/compiler/lib/src/patch_parser.dart
|
| @@ -137,8 +137,6 @@ import 'js_backend/js_backend.dart' show
|
| JavaScriptBackend;
|
| import 'library_loader.dart' show
|
| LibraryLoader;
|
| -import 'options.dart' show
|
| - ParserOptions;
|
| import 'parser/listener.dart' show
|
| Listener,
|
| ParserError;
|
| @@ -161,9 +159,11 @@ import 'tokens/token.dart' show
|
|
|
| class PatchParserTask extends CompilerTask {
|
| final String name = "Patching Parser";
|
| - final ParserOptions parserOptions;
|
| + final bool _enableConditionalDirectives;
|
|
|
| - PatchParserTask(Compiler compiler, this.parserOptions) : super(compiler);
|
| + PatchParserTask(Compiler compiler, {bool enableConditionalDirectives})
|
| + : this._enableConditionalDirectives = enableConditionalDirectives,
|
| + super(compiler);
|
|
|
| /**
|
| * Scans a library patch file, applies the method patches and
|
| @@ -198,7 +198,9 @@ class PatchParserTask extends CompilerTask {
|
| compilationUnit,
|
| idGenerator);
|
| try {
|
| - new PartialParser(patchListener, parserOptions).parseUnit(tokens);
|
| + new PartialParser(patchListener,
|
| + enableConditionalDirectives: _enableConditionalDirectives)
|
| + .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.
|
| @@ -215,7 +217,8 @@ class PatchParserTask extends CompilerTask {
|
|
|
| measure(() => reporter.withCurrentElement(cls, () {
|
| MemberListener listener = new PatchMemberListener(compiler, cls);
|
| - Parser parser = new PatchClassElementParser(listener, parserOptions);
|
| + Parser parser = new PatchClassElementParser(
|
| + listener, enableConditionalDirectives: _enableConditionalDirectives);
|
| try {
|
| Token token = parser.parseTopLevelDeclaration(cls.beginToken);
|
| assert(identical(token, cls.endToken.next));
|
| @@ -267,8 +270,9 @@ class PatchMemberListener extends MemberListener {
|
| * declarations.
|
| */
|
| class PatchClassElementParser extends PartialParser {
|
| - PatchClassElementParser(Listener listener, ParserOptions options)
|
| - : super(listener, options);
|
| + PatchClassElementParser(Listener listener, {bool enableConditionalDirectives})
|
| + : super(listener,
|
| + enableConditionalDirectives: enableConditionalDirectives);
|
|
|
| Token parseClassBody(Token token) => fullParseClassBody(token);
|
| }
|
|
|