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

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

Issue 87813002: Fix crashes in scanner. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Merged with r30775 and updated status files. Created 7 years, 1 month 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 | « no previous file | dart/sdk/lib/_internal/compiler/implementation/scanner/parser.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/sdk/lib/_internal/compiler/implementation/scanner/listener.dart
diff --git a/dart/sdk/lib/_internal/compiler/implementation/scanner/listener.dart b/dart/sdk/lib/_internal/compiler/implementation/scanner/listener.dart
index a35be99edcbc872b082e34784b2a2500d484eb11..b2ab377abe362cbc615a8cdd92fcbeeba15e3b81 100644
--- a/dart/sdk/lib/_internal/compiler/implementation/scanner/listener.dart
+++ b/dart/sdk/lib/_internal/compiler/implementation/scanner/listener.dart
@@ -552,7 +552,13 @@ class Listener {
}
Token expectedExpression(Token token) {
- error("expected an expression, but got '${token.value}'", token);
+ String message;
+ if (token.info == BAD_INPUT_INFO) {
+ message = token.value;
+ } else {
+ message = "expected an expression, but got '${token.value}'";
+ }
+ error(message, token);
return skipToEof(token);
}
@@ -972,16 +978,22 @@ class ElementListener extends Listener {
}
Token expectedExpression(Token token) {
- listener.cancel("expected an expression, but got '${token.value}'",
- token: token);
- pushNode(null);
- return skipToEof(token);
+ if (token.info == BAD_INPUT_INFO) {
+ reportError(token, MessageKind.GENERIC, {'text': token.value});
+ pushNode(new ErrorExpression(token));
+ return token.next;
+ } else {
+ listener.cancel("expected an expression, but got '${token.value}'",
+ token: token);
+ pushNode(null);
+ return skipToEof(token);
+ }
}
Token unexpected(Token token) {
String message = "unexpected token '${token.value}'";
if (token.info == BAD_INPUT_INFO) {
- message = token.stringValue;
+ message = token.value;
}
listener.cancel(message, token: token);
return skipToEof(token);
« no previous file with comments | « no previous file | dart/sdk/lib/_internal/compiler/implementation/scanner/parser.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698