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

Author: cameel

libevmasm/Assembly.cpp

@@ -81,15 +81,15 @@ void Assembly::importAssemblyItemsFromJSON(Json::Value const& _code, std::vector
 {
 	solAssert(m_items.empty());
 	solRequire(_code.isArray(), AssemblyImportException, "Supplied JSON is not an array.");
-	for (auto current = std::begin(_code); current != std::end(_code); ++current)
+	for (auto jsonItemIter = std::begin(_code); jsonItemIter != std::end(_code); ++jsonItemIter)
 	{
-		AssemblyItem const& item = m_items.emplace_back(createAssemblyItemFromJSON(*current, _sourceList));
-		if (item == Instruction::JUMPDEST)
+		AssemblyItem const& newItem = m_items.emplace_back(createAssemblyItemFromJSON(*jsonItemIter, _sourceList));
+		if (newItem == Instruction::JUMPDEST)
 			solThrow(AssemblyImportException, "JUMPDEST instruction without a tag");
-		else if (item.type() == AssemblyItemType::Tag)
+		else if (newItem.type() == AssemblyItemType::Tag)
 		{
-			++current;
-			if (current != std::end(_code) && createAssemblyItemFromJSON(*current, _sourceList) != Instruction::JUMPDEST)
+			++jsonItemIter;
+			if (jsonItemIter != std::end(_code) && createAssemblyItemFromJSON(*jsonItemIter, _sourceList) != Instruction::JUMPDEST)
 				solThrow(AssemblyImportException, "JUMPDEST expected after tag.");
 		}
 	}
@@ -526,8 +526,8 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 		if (_json.isMember("sourceList"))
 		{
 			solRequire(_json["sourceList"].isArray(), AssemblyImportException, "Optional member 'sourceList' is not an array.");
-			for (Json::Value const& sourceListItem: _json["sourceList"])
-				solRequire(sourceListItem.isString(), AssemblyImportException, "The 'sourceList' array contains an item that is not a string.");
+			for (Json::Value const& sourceName: _json["sourceList"])
+				solRequire(sourceName.isString(), AssemblyImportException, "The 'sourceList' array contains an item that is not a string.");
 		}
 	}
 	else
@@ -542,14 +542,14 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 	if (_json.isMember("sourceList"))
 	{
 		solAssert(_level == 0);
-		for (Json::Value const& it: _json["sourceList"])
+		for (Json::Value const& sourceName: _json["sourceList"])
 		{
 			solRequire(
-				std::find(sourceList.begin(), sourceList.end(), it.asString()) == sourceList.end(),
+				std::find(sourceList.begin(), sourceList.end(), sourceName.asString()) == sourceList.end(),
 				AssemblyImportException,
 				"Items in 'sourceList' array are not unique."
 			);
-			sourceList.emplace_back(it.asString());
+			sourceList.emplace_back(sourceName.asString());
 		}
 	}
 	else
@@ -571,22 +571,22 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 		{
 			solRequire(dataIter.key().isString(), AssemblyImportException, "Key inside '.data' is not a string.");
 			std::string dataItemID = dataIter.key().asString();
-			Json::Value const& code = data[dataItemID];
-			if (code.isString())
+			Json::Value const& dataItem = data[dataItemID];
+			if (dataItem.isString())
 			{
 				solRequire(
-					code.asString().empty() || !fromHex(code.asString()).empty(),
+					dataItem.asString().empty() || !fromHex(dataItem.asString()).empty(),
 					AssemblyImportException,
 					"The value for key '" + dataItemID + "' inside '.data' is not a valid hexadecimal string."
 				);
-				result->m_data[h256(fromHex(dataItemID))] = fromHex(code.asString());
+				result->m_data[h256(fromHex(dataItemID))] = fromHex(dataItem.asString());
 			}
-			else if (code.isObject())
+			else if (dataItem.isObject())
 			{
 				size_t index = static_cast<size_t>(std::stoi(dataItemID));
 				if (result->m_subs.size() <= index)
 					result->m_subs.resize(index + 1);
-				std::shared_ptr<Assembly> subassembly(Assembly::fromJSON(code, sourceList, _level + 1).first);
+				std::shared_ptr<Assembly> subassembly(Assembly::fromJSON(dataItem, sourceList, _level + 1).first);
 				solAssert(subassembly);
 				result->m_subs[index] = subassembly;
 			}