Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(513)

Unified Diff: pkg/compiler/lib/src/parser/parser_task.dart

Issue 2644843006: Use packages dart_parser, dart_scanner, and compiler_util. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/compiler/lib/src/parser/parser_task.dart
diff --git a/pkg/compiler/lib/src/parser/parser_task.dart b/pkg/compiler/lib/src/parser/parser_task.dart
index 54219d474188d019a7fca7d5317aa670e2a250d0..1ffa6219fc532eca8eb8b182b985c8e900786900 100644
--- a/pkg/compiler/lib/src/parser/parser_task.dart
+++ b/pkg/compiler/lib/src/parser/parser_task.dart
@@ -8,12 +8,11 @@ import '../common.dart';
import '../common/tasks.dart' show CompilerTask;
import '../compiler.dart' show Compiler;
import '../elements/modelx.dart' show ElementX;
-import '../tokens/token.dart' show Token;
+import 'package:dart_scanner/dart_scanner.dart' show Token;
import '../tree/tree.dart' show Node;
import 'element_listener.dart' show ScannerOptions;
-import 'listener.dart' show ParserError;
+import 'package:dart_parser/dart_parser.dart' show Parser, ParserError;
import 'node_listener.dart' show NodeListener;
-import 'parser.dart' show Parser;
class ParserTask extends CompilerTask {
final Compiler compiler;
@@ -36,7 +35,8 @@ class ParserTask extends CompilerTask {
try {
parser.parseUnit(token);
} on ParserError catch (_) {
- assert(invariant(token, compiler.compilationFailed));
+ assert(invariant(compiler.reporter.spanFromToken(token),
+ compiler.compilationFailed));
return listener.makeNodeList(0, null, null, '\n');
}
Node result = listener.popNode();

Powered by Google App Engine
This is Rietveld 408576698