fixup! [libevmasm] Add support to import evm assembly json.

Author: cameel

libevmasm/Assembly.cpp

@@ -81,7 +81,7 @@ void Assembly::importAssemblyItemsFromJSON(Json::Value const& _code, std::vector
 	solRequire(_code.isArray(), AssemblyImportException, "Supplied JSON is not an array.");
 	for (auto current = std::begin(_code); current != std::end(_code); ++current)
 	{
-		auto const& item = m_items.emplace_back(createAssemblyItemFromJSON(*current, _sourceList));
+		AssemblyItem const& item = m_items.emplace_back(createAssemblyItemFromJSON(*current, _sourceList));
 		if (item == Instruction::JUMPDEST)
 			solThrow(AssemblyImportException, "JUMPDEST instruction without a tag");
 		else if (item.type() == AssemblyItemType::Tag)
@@ -97,7 +97,7 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std:
 {
 	solRequire(_json.isObject(), AssemblyImportException, "Supplied JSON is not an object.");
 	static std::set<std::string> const validMembers{"name", "begin", "end", "source", "value", "modifierDepth", "jumpType"};
-	for (auto const& member: _json.getMemberNames())
+	for (std::string const& member: _json.getMemberNames())
 		solRequire(
 			validMembers.count(member),
 			AssemblyImportException,
@@ -510,25 +510,25 @@ Json::Value Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourc
 
 std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSON(Json::Value const& _json, std::vector<std::string> const& _sourceList, size_t _level)
 {
-	std::shared_ptr<Assembly> result = std::make_shared<Assembly>(langutil::EVMVersion(), _level == 0, "");
+	auto result = std::make_shared<Assembly>(langutil::EVMVersion(), _level == 0, "");
 	if (_json.isNull())
 		return std::make_pair(result, std::vector<std::string>());
 
 	solRequire(_json.isObject(), AssemblyImportException, "Supplied JSON is not an object.");
 	static std::set<std::string> const validMembers{".code", ".data", ".auxdata", "sourceList"};
-	for (auto const& attribute: _json.getMemberNames())
+	for (std::string const& attribute: _json.getMemberNames())
 		solRequire(validMembers.count(attribute), AssemblyImportException, "Unknown attribute '" + attribute + "'.");
 	solRequire(_json.isMember(".code"), AssemblyImportException, "Member '.code' does not exist.");
 	solRequire(_json[".code"].isArray(), AssemblyImportException, "Member '.code' is not an array.");
-	for (auto const& codeItem: _json[".code"])
+	for (Json::Value const& codeItem: _json[".code"])
 		solRequire(codeItem.isObject(), AssemblyImportException, "Item of '.code' array is not an object.");
 
 	if (_level == 0)
 	{
 		if (_json.isMember("sourceList"))
 		{
 			solRequire(_json["sourceList"].isArray(), AssemblyImportException, "Optional member 'sourceList' is not an array.");
-			for (auto const& sourceListItem: _json["sourceList"])
+			for (Json::Value const& sourceListItem: _json["sourceList"])
 				solRequire(sourceListItem.isString(), AssemblyImportException, "Item of 'sourceList' array is not of type string.");
 		}
 	} else
@@ -542,7 +542,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 	if (_json.isMember("sourceList"))
 	{
 		solAssert(_level == 0);
-		for (auto const& it: _json["sourceList"])
+		for (Json::Value const& it: _json["sourceList"])
 		{
 			solRequire(
 				std::find(sourceList.begin(), sourceList.end(), it.asString()) == sourceList.end(),
@@ -605,7 +605,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 void Assembly::updatePaths(std::vector<Assembly*> const& _parents, std::vector<size_t> const& _absolutePathFromRoot)
 {
 	size_t subId = 0;
-	for (auto& assembly: this->m_subs)
+	for (std::shared_ptr<Assembly> assembly: this->m_subs)
 	{
 		std::vector<Assembly*> parents{_parents};
 		parents.push_back(this);
@@ -614,7 +614,7 @@ void Assembly::updatePaths(std::vector<Assembly*> const& _parents, std::vector<s
 		absolutePathFromRoot.emplace_back(subId);
 
 		int pindex = 0;
-		for (auto& parent: parents)
+		for (Assembly* parent: parents)
 		{
 			if (pindex == 0)
 				parent->encodeSubPath(absolutePathFromRoot);