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

Unified Diff: pkg/compiler/lib/src/tree/nodes.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/tree/nodes.dart
diff --git a/pkg/compiler/lib/src/tree/nodes.dart b/pkg/compiler/lib/src/tree/nodes.dart
index 1e5f9ddbdd41e6e4b2cf65bb0957ce6282f35458..61d23b99bb7bb39e6e9f3b2153dc7f4573575a59 100644
--- a/pkg/compiler/lib/src/tree/nodes.dart
+++ b/pkg/compiler/lib/src/tree/nodes.dart
@@ -8,14 +8,17 @@ import '../common.dart';
import '../elements/elements.dart' show MetadataAnnotation;
import '../resolution/secret_tree_element.dart'
show NullTreeElementMixin, StoredTreeElementMixin;
-import '../tokens/precedence_constants.dart' as Precedence show FUNCTION_INFO;
-import '../tokens/token.dart' show BeginGroupToken, Token;
-import '../tokens/token_constants.dart' as Tokens show PLUS_TOKEN;
-import '../util/characters.dart';
+import 'package:dart_scanner/src/precedence.dart' as Precedence
+ show FUNCTION_INFO;
+import 'package:dart_scanner/dart_scanner.dart' show BeginGroupToken, Token;
+import 'package:dart_scanner/src/token_constants.dart' as Tokens
+ show PLUS_TOKEN;
+import 'package:dart_scanner/src/characters.dart';
import '../util/util.dart';
import 'dartstring.dart';
import 'prettyprint.dart';
import 'unparser.dart';
+import 'package:dart_parser/dart_parser.dart' show ErrorKind;
abstract class Visitor<R> {
const Visitor();
@@ -478,7 +481,7 @@ class ClassNode extends Node {
if (token == null) {
token = name.getEndToken();
}
- assert(invariant(beginToken, token != null));
+ assert(token != null);
return token;
}
@@ -3086,17 +3089,19 @@ class IsInterpolationVisitor extends Visitor<bool> {
class ErrorNode extends Node
implements FunctionExpression, VariableDefinitions, Typedef {
final Token token;
- final String reason;
+ final ErrorKind kind;
+ final Map arguments;
final Identifier name;
final NodeList definitions;
- ErrorNode.internal(this.token, this.reason, this.name, this.definitions);
+ ErrorNode.internal(
+ this.token, this.kind, this.arguments, this.name, this.definitions);
- factory ErrorNode(Token token, String reason) {
+ factory ErrorNode(Token token, ErrorKind kind, Map arguments) {
Identifier name = new Identifier(token);
NodeList definitions =
new NodeList(null, const Link<Node>().prepend(name), null, null);
- return new ErrorNode.internal(token, reason, name, definitions);
+ return new ErrorNode.internal(token, kind, arguments, name, definitions);
}
Token get beginToken => token;

Powered by Google App Engine
This is Rietveld 408576698