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

Unified Diff: runtime/vm/parser.cc

Issue 23910003: Eliminate legacy support for throw without expression. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 3 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 | « runtime/vm/isolate_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/parser.cc
===================================================================
--- runtime/vm/parser.cc (revision 27847)
+++ runtime/vm/parser.cc (working copy)
@@ -6996,12 +6996,8 @@
} else if (CurrentToken() == Token::kSEMICOLON) {
// Empty statement, nothing to do.
ConsumeToken();
- } else if ((CurrentToken() == Token::kRETHROW) ||
- ((CurrentToken() == Token::kTHROW) &&
- (LookaheadToken(1) == Token::kSEMICOLON))) {
- // Rethrow of current exception. Throwing of an exception object
- // is an expression and is handled in ParseExpr().
- // TODO(hausner): remove support for 'throw;'.
+ } else if (CurrentToken() == Token::kRETHROW) {
+ // Rethrow of current exception.
ConsumeToken();
ExpectSemicolon();
// Check if it is ok to do a rethrow.
@@ -7747,7 +7743,9 @@
if (CurrentToken() == Token::kTHROW) {
ConsumeToken();
- ASSERT(CurrentToken() != Token::kSEMICOLON);
+ if (CurrentToken() == Token::kSEMICOLON) {
+ ErrorMsg("expression expected after throw");
+ }
AstNode* expr = ParseExpr(require_compiletime_const, consume_cascades);
return new ThrowNode(expr_pos, expr, NULL);
}
« no previous file with comments | « runtime/vm/isolate_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698