| 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 CompilerTask; | 8 import '../common/tasks.dart' show CompilerTask; |
| 9 import '../compiler.dart' show Compiler; | 9 import '../compiler.dart' show Compiler; |
| 10 import '../elements/modelx.dart' show ElementX; | 10 import '../elements/modelx.dart' show ElementX; |
| 11 import '../options.dart' show ParserOptions; | 11 import '../options.dart' show ParserOptions; |
| 12 import '../tokens/token.dart' show Token; | 12 import '../tokens/token.dart' show Token; |
| 13 import '../tree/tree.dart' show Node; | 13 import '../tree/tree.dart' show Node; |
| 14 | 14 |
| 15 import 'element_listener.dart' show ScannerOptions; | 15 import 'element_listener.dart' show ScannerOptions; |
| 16 import 'listener.dart' show ParserError; | 16 import 'listener.dart' show ParserError; |
| 17 import 'node_listener.dart' show NodeListener; | 17 import 'node_listener.dart' show NodeListener; |
| 18 import 'parser.dart' show Parser; | 18 import 'parser.dart' show Parser; |
| 19 | 19 |
| 20 class ParserTask extends CompilerTask { | 20 class ParserTask extends CompilerTask { |
| 21 final ParserOptions parserOptions; | 21 final ParserOptions parserOptions; |
| 22 | 22 |
| 23 ParserTask(Compiler compiler, this.parserOptions) : super(compiler); | 23 ParserTask(Compiler compiler, this.parserOptions) : super(compiler); |
| 24 | 24 |
| 25 String get name => 'Parser'; | 25 String get name => 'Parser'; |
| 26 | 26 |
| 27 Node parse(ElementX element) { | 27 Node parse(ElementX element) { |
| 28 return measure(() => element.parseNode(compiler.parsing)); | 28 return measure(() => element.parseNode(compiler.parsingContext)); |
| 29 } | 29 } |
| 30 | 30 |
| 31 Node parseCompilationUnit(Token token) { | 31 Node parseCompilationUnit(Token token) { |
| 32 return measure(() { | 32 return measure(() { |
| 33 NodeListener listener = | 33 NodeListener listener = |
| 34 new NodeListener(const ScannerOptions(), reporter, null); | 34 new NodeListener(const ScannerOptions(), reporter, null); |
| 35 Parser parser = new Parser(listener, parserOptions); | 35 Parser parser = new Parser(listener, parserOptions); |
| 36 try { | 36 try { |
| 37 parser.parseUnit(token); | 37 parser.parseUnit(token); |
| 38 } on ParserError catch (_) { | 38 } on ParserError catch (_) { |
| 39 assert(invariant(token, compiler.compilationFailed)); | 39 assert(invariant(token, compiler.compilationFailed)); |
| 40 return listener.makeNodeList(0, null, null, '\n'); | 40 return listener.makeNodeList(0, null, null, '\n'); |
| 41 } | 41 } |
| 42 Node result = listener.popNode(); | 42 Node result = listener.popNode(); |
| 43 assert(listener.nodes.isEmpty); | 43 assert(listener.nodes.isEmpty); |
| 44 return result; | 44 return result; |
| 45 }); | 45 }); |
| 46 } | 46 } |
| 47 } | 47 } |
| OLD | NEW |