Improve error reporting of trailing commas

nandodj · Jun 15, 2017 · 60bfae7 · 60bfae7
1 parent 54e97d1
commit 60bfae7
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
@@ -1335,13 +1335,19 @@ pair<vector<ASTPointer<Expression>>, vector<ASTPointer<ASTString>>> Parser::pars
 			if (!first)
 				expectToken(Token::Comma);
 
-			if (m_scanner->currentToken() == Token::RBrace)
-				fatalParserError("Unexpected trailing comma.");
-
 			ret.second.push_back(expectIdentifierToken());
 			expectToken(Token::Colon);
 			ret.first.push_back(parseExpression());
 
+			if (
+				m_scanner->currentToken() == Token::Comma &&
+				m_scanner->peekNextToken() == Token::RBrace
+			)
+			{
+				parserError("Unexpected trailing comma.");
+				m_scanner->next();
+			}
+
 			first = false;
 		}
 		expectToken(Token::RBrace);