2 files changed, 14 insertions, 28 deletions

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 4fad65bb..c7b2bb50 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1038,26 +1038,25 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
 	case Token::LBrack:
 	{
 		// Tuple/parenthesized expression or inline array/bracketed expression.
-		// Special cases: ()/[] is empty tuple/array type, (x)/[] is not a real tuple/array,
-		// (x,) is one-dimensional tuple
+		// Special cases: ()/[] is empty tuple/array type, (x) is not a real tuple,
+		// (x,) is one-dimensional tuple, elements in arrays cannot be left out, only in tuples.
 		m_scanner->next();
 		vector<ASTPointer<Expression>> components;
 		Token::Value oppositeToken = (token == Token::LParen ? Token::RParen : Token::RBrack);
-		bool isArray = (token == Token::LBrack ? true : false);
-		if (isArray && (m_scanner->currentToken() == Token::Comma))
-			fatalParserError(std::string("Expected value in array cell after '[' ."));
+		bool isArray = (token == Token::LBrack);
+
 		if (m_scanner->currentToken() != oppositeToken)
 			while (true)
 			{
 				if (m_scanner->currentToken() != Token::Comma && m_scanner->currentToken() != oppositeToken)
 					components.push_back(parseExpression());
+				else if (isArray)
+					parserError(std::string("Expected value in array cell after"));
 				else
 					components.push_back(ASTPointer<Expression>());
 				if (m_scanner->currentToken() == oppositeToken)
 					break;
 				else if (m_scanner->currentToken() == Token::Comma)
-					if (isArray && (m_scanner->peekNextToken() == Token::Comma || m_scanner->peekNextToken() == oppositeToken))
-						fatalParserError(std::string("Expected value in array cell after ',' ."));
 					m_scanner->next();
 			}
 		nodeFactory.markEndPosition();
diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp
index c5af075a..e6c8a8d8 100644
--- a/test/libsolidity/SolidityParser.cpp
+++ b/test/libsolidity/SolidityParser.cpp
@@ -1047,55 +1047,42 @@ BOOST_AUTO_TEST_CASE(using_for)
 	BOOST_CHECK(successParse(text));
 }
 
-BOOST_AUTO_TEST_CASE(inline_array_declaration_lvalue)
+BOOST_AUTO_TEST_CASE(inline_array_declaration)
 {
 	char const* text = R"(
 		contract c {
 			uint[] a;
-			function f() returns (uint) {
+			function f() returns (uint, uint) {
 				a = [1,2,3];
-				return (a[3]);
+				return (a[3], [2,3,4][0]);
 			}
 		}
 	)";
 	BOOST_CHECK(successParse(text));
 }
 
-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)
+BOOST_AUTO_TEST_CASE(inline_array_empty_cells_check_lvalue)
 {
 	char const* text = R"(
 		contract c {
 			uint[] a;
-			function f() returns (uint, uint) {
+			function f() returns (uint) {
 				a = [,2,3];
-				return (a[3], [,3,4][0]);
+				return (a[0]);
 			}
 		}
 	)";
 	BOOST_CHECK(!successParse(text));
 }
 
-BOOST_AUTO_TEST_CASE(inline_array_empty_cells_check_commas)
+BOOST_AUTO_TEST_CASE(inline_array_empty_cells_check_without_lvalue)
 {
 	char const* text = R"(
 		contract c {
 			uint[] a;
 			function f() returns (uint, uint) {
-				a = [1, ,3];
-				return (a[3], [3, ,4][0]);
+				return ([3, ,4][0]);
 			}
 		}
 	)";