OLD | NEW |
1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 library dart2js.parser.task; | 5 library dart2js.parser.task; |
6 | 6 |
7 import '../common.dart'; | 7 import '../common.dart'; |
8 import '../common/tasks.dart' show | 8 import '../common/tasks.dart' show |
9 CompilerTask; | 9 CompilerTask; |
10 import '../compiler.dart' show | 10 import '../compiler.dart' show |
11 Compiler; | 11 Compiler; |
12 import '../elements/modelx.dart' show | 12 import '../elements/modelx.dart' show |
13 ElementX; | 13 ElementX; |
14 import '../tokens/token.dart' show | 14 import '../tokens/token.dart' show |
15 Token; | 15 Token; |
16 import '../tree/tree.dart' show | 16 import '../tree/tree.dart' show |
17 Node; | 17 Node; |
18 | 18 |
19 import 'element_listener.dart' show | 19 import 'element_listener.dart' show |
20 ScannerOptions; | 20 ScannerOptions, |
| 21 ParserOptions; |
21 import 'listener.dart' show | 22 import 'listener.dart' show |
22 ParserError; | 23 ParserError; |
23 import 'node_listener.dart' show | 24 import 'node_listener.dart' show |
24 NodeListener; | 25 NodeListener; |
25 import 'parser.dart' show | 26 import 'parser.dart' show |
26 Parser; | 27 Parser; |
27 | 28 |
28 class ParserTask extends CompilerTask { | 29 class ParserTask extends CompilerTask { |
29 final bool _enableConditionalDirectives; | 30 final bool _enableConditionalDirectives; |
| 31 final bool _enableGenericMethods; |
30 | 32 |
31 ParserTask(Compiler compiler, | 33 ParserTask(Compiler compiler, ParserOptions parserOptions) |
32 {bool enableConditionalDirectives: false}) | 34 : this._enableConditionalDirectives = |
33 : this._enableConditionalDirectives = enableConditionalDirectives, | 35 parserOptions.enableConditionalDirectives, |
| 36 this._enableGenericMethods = parserOptions.enableGenericMethods, |
34 super(compiler); | 37 super(compiler); |
35 | 38 |
36 String get name => 'Parser'; | 39 String get name => 'Parser'; |
37 | 40 |
38 Node parse(ElementX element) { | 41 Node parse(ElementX element) { |
39 return measure(() => element.parseNode(compiler.parsing)); | 42 return measure(() => element.parseNode(compiler.parsing)); |
40 } | 43 } |
41 | 44 |
42 Node parseCompilationUnit(Token token) { | 45 Node parseCompilationUnit(Token token) { |
43 return measure(() { | 46 return measure(() { |
44 NodeListener listener = new NodeListener( | 47 NodeListener listener = new NodeListener( |
45 const ScannerOptions(), reporter, null); | 48 const ScannerOptions(), reporter, null); |
46 Parser parser = new Parser( | 49 Parser parser = new Parser( |
47 listener, enableConditionalDirectives: _enableConditionalDirectives); | 50 listener, |
| 51 enableConditionalDirectives: _enableConditionalDirectives, |
| 52 enableGenericMethods: _enableGenericMethods); |
48 try { | 53 try { |
49 parser.parseUnit(token); | 54 parser.parseUnit(token); |
50 } on ParserError catch(_) { | 55 } on ParserError catch(_) { |
51 assert(invariant(token, compiler.compilationFailed)); | 56 assert(invariant(token, compiler.compilationFailed)); |
52 return listener.makeNodeList(0, null, null, '\n'); | 57 return listener.makeNodeList(0, null, null, '\n'); |
53 } | 58 } |
54 Node result = listener.popNode(); | 59 Node result = listener.popNode(); |
55 assert(listener.nodes.isEmpty); | 60 assert(listener.nodes.isEmpty); |
56 return result; | 61 return result; |
57 }); | 62 }); |
58 } | 63 } |
59 } | 64 } |
OLD | NEW |