WIP - Expression compiler for array push

1 files changed, 31 insertions, 15 deletions

diff --git a/libsolidity/ExpressionCompiler.cpp b/libsolidity/ExpressionCompiler.cpp
index f6eed0de..c25202b6 100644
--- a/libsolidity/ExpressionCompiler.cpp
+++ b/libsolidity/ExpressionCompiler.cpp
@@ -784,26 +784,42 @@ void ExpressionCompiler::endVisit(MemberAccess const& _memberAccess)
 	}
 	case Type::Category::Array:
 	{
-		solAssert(member == "length", "Illegal array member.");
 		auto const& type = dynamic_cast<ArrayType const&>(*_memberAccess.expression().annotation().type);
-		if (!type.isDynamicallySized())
+		if (member == "length")
 		{
-			utils().popStackElement(type);
-			m_context << type.length();
+			if (!type.isDynamicallySized())
+			{
+				utils().popStackElement(type);
+				m_context << type.length();
+			}
+			else
+				switch (type.location())
+				{
+				case DataLocation::CallData:
+					m_context << eth::Instruction::SWAP1 << eth::Instruction::POP;
+					break;
+				case DataLocation::Storage:
+					setLValue<StorageArrayLength>(_memberAccess, type);
+					break;
+				case DataLocation::Memory:
+					m_context << eth::Instruction::MLOAD;
+					break;
+				}
 		}
-		else
-			switch (type.location())
+		else if (member == "push" && type.isDynamicallySized() && type.location() == DataLocation::Storage)
+		{
+			if (type.isByteArray())
 			{
-			case DataLocation::CallData:
-				m_context << eth::Instruction::SWAP1 << eth::Instruction::POP;
-				break;
-			case DataLocation::Storage:
-				setLValue<StorageArrayLength>(_memberAccess, type);
-				break;
-			case DataLocation::Memory:
-				m_context << eth::Instruction::MLOAD;
-				break;
+				solAssert(!type.isString(), "Index access to string is not allowed.");
+				setLValue<StorageByteArrayElement>(_indexAccess);
 			}
+			else
+				setLValueToStorageItem(_indexAccess);
+			setLValue<StorageArrayLength>(_memberAccess, type);
+		}
+		else
+			solAssert(false, "Illegal array member.");
+		
 		break;
 	}
 	default: