From fe04d7f7f7686ae8fa406880b3c3069e60ee1c20 Mon Sep 17 00:00:00 2001
From: RJ Catalano <catalanor0220@gmail.com>
Date: Wed, 16 Dec 2015 14:50:40 -0600
Subject: [PATCH] added one more test and realized that there was one last
 change before the parser is perfect

---
 libsolidity/parsing/Parser.cpp      |  2 +-
 test/libsolidity/SolidityParser.cpp | 37 +++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 3df3ac179..4fad65bb0 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1056,7 +1056,7 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
 				if (m_scanner->currentToken() == oppositeToken)
 					break;
 				else if (m_scanner->currentToken() == Token::Comma)
-					if (isArray && (m_scanner->peekNextToken() == (Token::Comma || oppositeToken)))
+					if (isArray && (m_scanner->peekNextToken() == Token::Comma || m_scanner->peekNextToken() == oppositeToken))
 						fatalParserError(std::string("Expected value in array cell after ',' ."));
 					m_scanner->next();
 			}
diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp
index b1af54e0f..c5af075a5 100644
--- a/test/libsolidity/SolidityParser.cpp
+++ b/test/libsolidity/SolidityParser.cpp
@@ -1047,28 +1047,55 @@ BOOST_AUTO_TEST_CASE(using_for)
 	BOOST_CHECK(successParse(text));
 }
 
-BOOST_AUTO_TEST_CASE(inline_array_declaration)
+BOOST_AUTO_TEST_CASE(inline_array_declaration_lvalue)
 {
 	char const* text = R"(
 		contract c {
 			uint[] a;
-			function f() returns (uint, uint) {
+			function f() returns (uint) {
 				a = [1,2,3];
-				return (a[3], [3,4][0]);
+				return (a[3]);
 			}
 		}
 	)";
 	BOOST_CHECK(successParse(text));
 }
 
-BOOST_AUTO_TEST_CASE(inline_array_empty_cells_check)
+BOOST_AUTO_TEST_CASE(inline_array_declaration_self)
+{
+	char const* text = R"(
+		contract c {
+			uint[] a;
+			function f() returns (uint) {
+				return ([1,2,3][0]);
+			}
+		}
+	)";
+	BOOST_CHECK(successParse(text));
+}
+
+BOOST_AUTO_TEST_CASE(inline_array_empty_cells_check_beginning)
 {
 	char const* text = R"(
 		contract c {
 			uint[] a;
 			function f() returns (uint, uint) {
 				a = [,2,3];
-				return (a[3], [3,4][0]);
+				return (a[3], [,3,4][0]);
+			}
+		}
+	)";
+	BOOST_CHECK(!successParse(text));
+}
+
+BOOST_AUTO_TEST_CASE(inline_array_empty_cells_check_commas)
+{
+	char const* text = R"(
+		contract c {
+			uint[] a;
+			function f() returns (uint, uint) {
+				a = [1, ,3];
+				return (a[3], [3, ,4][0]);
 			}
 		}
 	)";