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

Unified Diff: runtime/vm/parser.cc

Issue 8450009: No returns allowed in constructors (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 9 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 | tests/language/language.status » ('j') | 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 1158)
+++ runtime/vm/parser.cc (working copy)
@@ -1770,6 +1770,9 @@
ExpectToken(Token::kRBRACE);
} else if (CurrentToken() == Token::kARROW) {
ConsumeToken();
+ if (func.IsConstructor()) {
+ ErrorMsg("constructors may not return a value");
+ }
intptr_t expr_pos = token_index_;
AstNode* expr = ParseExpr(kAllowConst);
ASSERT(expr != NULL);
@@ -4838,8 +4841,13 @@
} else if (CurrentToken() == Token::kTRY) {
statement = ParseTryStatement(label_name);
} else if (CurrentToken() == Token::kRETURN) {
+ const intptr_t return_pos = token_index_;
ConsumeToken();
if (CurrentToken() != Token::kSEMICOLON) {
+ if (current_function().IsConstructor() &&
+ (current_block_->scope->function_level() == 0)) {
+ ErrorMsg(return_pos, "return of a value not allowed in constructors");
+ }
AstNode* expr = ParseExpr(kAllowConst);
statement = new ReturnNode(statement_pos, expr);
} else {
« no previous file with comments | « no previous file | tests/language/language.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698