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

Author: cameel

libevmasm/Assembly.cpp

@@ -533,8 +533,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
@@ -548,14 +548,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
@@ -577,22 +577,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,
 					"Member '.data' contains a value for '" + dataItemID + "' that 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;
 			}