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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sdk/lib/_internal/compiler/implementation/scanner/listener.dart

Issue 206193002: Remove cancel and make crash exit with code 253. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Remove reportInternalError Created 6 years, 9 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
« no previous file with comments | « sdk/lib/_internal/compiler/implementation/scanner/class_element_parser.dart ('k') | sdk/lib/_internal/compiler/implementation/scanner/parser.dart » ('j') | tests/compiler/dart2js/parser_helper.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/compiler/implementation/scanner/listener.dart
diff --git a/sdk/lib/_internal/compiler/implementation/scanner/listener.dart b/sdk/lib/_internal/compiler/implementation/scanner/listener.dart
index 92d19f6c877bd728fc6e488c3172b7faee095ff0..042f272ef7a042b570aa45faa7152772860fe01d 100644
--- a/sdk/lib/_internal/compiler/implementation/scanner/listener.dart
+++ b/sdk/lib/_internal/compiler/implementation/scanner/listener.dart
@@ -610,10 +610,7 @@ class Listener {
return token;
}
- void recoverableError(String message, {Token token, Node node}) {
- if (token == null && node != null) {
- token = node.getBeginToken();
- }
+ void recoverableError(Token token, String message) {
error(message, token);
}
@@ -630,11 +627,11 @@ class Listener {
if (spannable is Token) {
token = spannable;
} else if (spannable is Node) {
- node = spannable;
+ token = spannable.getBeginToken();
} else {
throw new ParserError(message);
}
- recoverableError(message, token: token, node: node);
+ recoverableError(token, message);
}
}
@@ -653,8 +650,8 @@ typedef int IdGenerator();
* [compilationUnitElement].
*/
class ElementListener extends Listener {
- final IdGenerator idGenerator;
final DiagnosticListener listener;
karlklose 2014/03/21 08:39:39 Why this change?
Johnni Winther 2014/03/21 09:39:23 No good reason. Reverted.
+ final IdGenerator idGenerator;
final CompilationUnitElement compilationUnitElement;
final StringValidator stringValidator;
Link<StringQuoting> interpolationScope;
@@ -684,8 +681,8 @@ class ElementListener extends Listener {
StringNode node = popNode();
// TODO(lrn): Handle interpolations in script tags.
if (node.isInterpolation) {
- listener.cancel("String interpolation not supported in library tags",
- node: node);
+ listener.internalError(
+ node, "String interpolation not supported in library tags");
return null;
}
return node;
@@ -774,8 +771,8 @@ class ElementListener extends Listener {
void endTopLevelDeclaration(Token token) {
if (!metadata.isEmpty) {
- recoverableError('Error: Metadata not supported here.',
- token: metadata.head.beginToken);
+ recoverableError(metadata.head.beginToken,
+ 'Metadata not supported here.');
karlklose 2014/03/21 08:39:39 Indentation is one off.
Johnni Winther 2014/03/21 09:39:23 Done.
metadata = const Link<MetadataAnnotation>();
}
}
@@ -801,7 +798,7 @@ class ElementListener extends Listener {
if (name.token is KeywordToken) {
Keyword keyword = (name.token as KeywordToken).keyword;
if (!keyword.isPseudo) {
- recoverableError('illegal name ${keyword.syntax}', node: name);
+ recoverableError(name, 'Illegal name ${keyword.syntax}');
karlklose 2014/03/21 08:39:39 The capital letter in the beginning of the message
Johnni Winther 2014/03/21 09:39:23 All messages are now capitalized and end with a pe
}
}
}
@@ -957,8 +954,8 @@ class ElementListener extends Listener {
}
Token expected(String string, Token token) {
- listener.cancel("expected '$string', but got '${token.value}'",
- token: token);
+ reportFatalError(token,
+ "expected '$string', but got '${token.value}'");
return skipToEof(token);
}
@@ -968,15 +965,15 @@ class ElementListener extends Listener {
token, MessageKind.EXPECTED_IDENTIFIER_NOT_RESERVED_WORD,
{'keyword': token.value});
} else {
- listener.cancel(
- "Error: Expected identifier, but got '${token.value}'", token: token);
+ reportFatalError(token,
+ "Error: Expected identifier, but got '${token.value}'");
}
return token;
}
Token expectedType(Token token) {
- listener.cancel("expected a type, but got '${token.value}'",
- token: token);
+ reportFatalError(token,
+ "expected a type, but got '${token.value}'");
pushNode(null);
return skipToEof(token);
}
@@ -987,8 +984,8 @@ class ElementListener extends Listener {
pushNode(new ErrorExpression(token));
return token.next;
} else {
- listener.cancel("expected an expression, but got '${token.value}'",
- token: token);
+ reportFatalError(token,
+ "expected an expression, but got '${token.value}'");
pushNode(null);
return skipToEof(token);
}
@@ -999,7 +996,7 @@ class ElementListener extends Listener {
if (token.info == BAD_INPUT_INFO) {
message = token.value;
}
- listener.cancel(message, token: token);
+ reportFatalError(token, message);
return skipToEof(token);
}
@@ -1013,14 +1010,14 @@ class ElementListener extends Listener {
Token expectedFunctionBody(Token token) {
String printString = token.value;
- listener.cancel("expected a function body, but got '$printString'",
- token: token);
+ reportFatalError(token,
+ "expected a function body, but got '$printString'");
return skipToEof(token);
}
Token expectedClassBody(Token token) {
- listener.cancel("expected a class body, but got '${token.value}'",
- token: token);
+ reportFatalError(token,
+ "expected a class body, but got '${token.value}'");
return skipToEof(token);
}
@@ -1033,18 +1030,20 @@ class ElementListener extends Listener {
}
Link<Token> expectedDeclaration(Token token) {
- listener.cancel("expected a declaration, but got '${token.value}'",
- token: token);
+ reportFatalError(token,
+ "expected a declaration, but got '${token.value}'");
return const Link<Token>();
}
Token unmatched(Token token) {
- listener.cancel("unmatched '${token.value}'", token: token);
+ reportFatalError(token,
+ "unmatched '${token.value}'");
return skipToEof(token);
}
- void recoverableError(String message, {Token token, Node node}) {
- listener.cancel(message, token: token, node: node);
+ void recoverableError(Spannable node, String message) {
+ // TODO(johnniwinther): Make recoverable errors non-fatal.
+ reportFatalError(node, message);
}
void pushElement(Element element) {
@@ -1069,7 +1068,7 @@ class ElementListener extends Listener {
void addLibraryTag(LibraryTag tag) {
if (!allowLibraryTags()) {
- recoverableError('library tags not allowed here', node: tag);
+ recoverableError(tag, 'library tags not allowed here');
}
compilationUnitElement.getImplementationLibrary().addTag(tag, listener);
}
@@ -1165,6 +1164,12 @@ class ElementListener extends Listener {
pushNode(accumulator);
}
+ void reportFatalError(Spannable spannable,
+ String message) {
+ listener.reportFatalError(
+ spannable, MessageKind.GENERIC, {'text': message});
+ }
+
void reportError(Spannable spannable,
MessageKind errorCode,
[Map arguments = const {}]) {
@@ -1336,17 +1341,15 @@ class NodeListener extends ElementListener {
}
void handleOnError(Token token, var errorInformation) {
- listener.cancel("internal error: '${token.value}': ${errorInformation}",
- token: token);
+ listener.internalError(token, "'${token.value}': ${errorInformation}");
}
Token expectedFunctionBody(Token token) {
if (identical(token.stringValue, 'native')) {
return native.handleNativeFunctionBody(this, token);
} else {
- listener.cancel(
- "expected a function body, but got '${token.value}'",
- token: token);
+ reportFatalError(token,
+ "expected a function body, but got '${token.value}'");
return skipToEof(token);
}
}
@@ -1355,9 +1358,8 @@ class NodeListener extends ElementListener {
if (identical(token.stringValue, 'native')) {
return native.handleNativeClassBody(this, token);
} else {
- listener.cancel(
- "expected a class body, but got '${token.value}'",
- token: token);
+ reportFatalError(token,
+ "expected a class body, but got '${token.value}'");
return skipToEof(token);
}
}
@@ -1392,8 +1394,8 @@ class NodeListener extends ElementListener {
if (argumentSend == null) {
// TODO(ahe): The parser should diagnose this problem, not
// this listener.
- listener.cancel('Syntax error: Expected an identifier.',
- node: argument);
+ reportFatalError(argument,
+ 'Syntax error: Expected an identifier.');
}
if (argumentSend.receiver != null) internalError(node: argument);
if (argument is SendSet) internalError(node: argument);
@@ -1450,7 +1452,8 @@ class NodeListener extends ElementListener {
void reportNotAssignable(Node node) {
// TODO(ahe): The parser should diagnose this problem, not this
// listener.
- listener.cancel('Syntax error: Not assignable.', node: node);
+ reportFatalError(node,
+ 'Syntax error: Not assignable.');
}
void handleConditionalExpression(Token question, Token colon) {
@@ -1840,8 +1843,8 @@ class NodeListener extends ElementListener {
Node receiver = popNode();
if (typeArguments != null) {
receiver = new TypeAnnotation(receiver, typeArguments);
- recoverableError('Error: type arguments are not allowed here',
- node: typeArguments);
+ recoverableError(typeArguments,
+ 'Error: type arguments are not allowed here');
} else {
Identifier identifier = receiver.asIdentifier();
Send send = receiver.asSend();
@@ -1977,9 +1980,11 @@ class PartialFieldList extends VariableList {
!definitions.modifiers.isFinal() &&
!definitions.modifiers.isConst() &&
definitions.type == null) {
- listener.cancel('A field declaration must start with var, final, '
- 'const, or a type annotation.',
- node: definitions);
+ listener.reportError(
+ definitions,
+ MessageKind.GENERIC,
+ { 'text': 'A field declaration must start with var, final, '
+ 'const, or a type annotation.' });
}
return definitions;
}
« no previous file with comments | « sdk/lib/_internal/compiler/implementation/scanner/class_element_parser.dart ('k') | sdk/lib/_internal/compiler/implementation/scanner/parser.dart » ('j') | tests/compiler/dart2js/parser_helper.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698