From 0099911ace631789ab8a2294710b9fd57af1c478 Mon Sep 17 00:00:00 2001
From: wadeAlexC <wade.alex.c@gmail.com>
Date: Thu, 21 Sep 2017 17:42:34 -0400
Subject: Better error message for unexpected trailing comma in parameter lists

---
 libsolidity/parsing/Parser.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libsolidity/parsing/Parser.cpp')

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index ce8a9f01..9a8bb358 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -828,6 +828,8 @@ ASTPointer<ParameterList> Parser::parseParameterList(
 		parameters.push_back(parseVariableDeclaration(options));
 		while (m_scanner->currentToken() != Token::RParen)
 		{
+			if (m_scanner->currentToken() == Token::Comma && m_scanner->peekNextToken() == Token::RParen)
+				fatalParserError("Unexpected trailing comma in parameter list.");
 			expectToken(Token::Comma);
 			parameters.push_back(parseVariableDeclaration(options));
 		}
-- 
cgit v1.2.3


From 639b85f4987db13bebdd751b205424810a7daab7 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 27 Sep 2017 19:27:36 +0200
Subject: Fix source location of VariableDeclarationStatement.

---
 libsolidity/parsing/Parser.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'libsolidity/parsing/Parser.cpp')

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 9a8bb358..821e81d2 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1133,6 +1133,7 @@ ASTPointer<VariableDeclarationStatement> Parser::parseVariableDeclarationStateme
 		options.allowVar = true;
 		options.allowLocationSpecifier = true;
 		variables.push_back(parseVariableDeclaration(options, _lookAheadArrayType));
+		nodeFactory.setEndPositionFromNode(variables.back());
 	}
 	if (m_scanner->currentToken() == Token::Assign)
 	{
-- 
cgit v1.2.3