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

Author: cameel

libevmasm/Assembly.cpp

@@ -101,7 +101,7 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std:
 		solRequire(
 			validMembers.count(member),
 			AssemblyImportException,
-			"Unknown member '" + member + "'. Valid members are " +
+			"Unknown member '" + member + "'. Valid members are: " +
 			solidity::util::joinHumanReadable(validMembers, ", ") + "."
 		);
 	solRequire(isOfType<std::string>(_json["name"]), AssemblyImportException, "Member 'name' missing or not of type string.");
@@ -121,7 +121,7 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std:
 	);
 
 	std::string name = get<std::string>(_json["name"]);
-	solRequire(!name.empty(), AssemblyImportException, "Member 'name' was empty.");
+	solRequire(!name.empty(), AssemblyImportException, "Member 'name' is empty.");
 
 	SourceLocation location;
 	location.start = get<int>(_json["begin"]);
@@ -158,7 +158,7 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std:
 		solRequire(
 			!_value.empty(),
 			AssemblyImportException,
-			"Member 'value' was not defined for instruction '" + _name + "', but the instruction needs a value."
+			"Member 'value' is missing for instruction '" + _name + "', but the instruction needs a value."
 		);
 	};
 
@@ -171,7 +171,7 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std:
 		);
 	};
 
-	solRequire(srcIndex >= -1 && srcIndex < static_cast<int>(_sourceList.size()), AssemblyImportException, "srcIndex out of bound.");
+	solRequire(srcIndex >= -1 && srcIndex < static_cast<int>(_sourceList.size()), AssemblyImportException, "Source index out of bounds.");
 	if (srcIndex != -1)
 	{
 		static std::map<std::string, std::shared_ptr<std::string const>> sharedSourceNames;
@@ -514,24 +514,25 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 	static std::set<std::string> const validMembers{".code", ".data", ".auxdata", "sourceList"};
 	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.isMember(".code"), AssemblyImportException, "Member '.code' is missing.");
 	solRequire(_json[".code"].isArray(), AssemblyImportException, "Member '.code' is not an array.");
 	for (Json::Value const& codeItem: _json[".code"])
-		solRequire(codeItem.isObject(), AssemblyImportException, "Item of '.code' array is not an object.");
+		solRequire(codeItem.isObject(), AssemblyImportException, "The '.code' array contains an item that is not an object.");
 
 	if (_level == 0)
 	{
 		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, "Item of 'sourceList' array is not of type string.");
+				solRequire(sourceListItem.isString(), AssemblyImportException, "The 'sourceList' array contains an item that is not a string.");
 		}
 	} else
 		solRequire(
 			!_json.isMember("sourceList"),
 			AssemblyImportException,
-			"Member 'sourceList' is only allowed in root JSON object."
+			"Member 'sourceList' may only be present in the root JSON object."
 		);
 
 	std::shared_ptr<Assembly> result = std::make_shared<Assembly>(langutil::EVMVersion(), _level == 0, "");
@@ -554,7 +555,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 	result->importAssemblyItemsFromJSON(_json[".code"], sourceList);
 	if (_json[".auxdata"])
 	{
-		solRequire(_json[".auxdata"].isString(), AssemblyImportException, "Optional member '.auxdata' is not of type string.");
+		solRequire(_json[".auxdata"].isString(), AssemblyImportException, "Optional member '.auxdata' is not a string.");
 		bytes auxdata{fromHex(_json[".auxdata"].asString())};
 		solRequire(!auxdata.empty(), AssemblyImportException, "Optional member '.auxdata' is not a valid hexadecimal string.");
 		result->m_auxiliaryData = auxdata;
@@ -566,7 +567,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 		Json::Value const& data = _json[".data"];
 		for (Json::ValueConstIterator dataIter = data.begin(); dataIter != data.end(); dataIter++)
 		{
-			solRequire(dataIter.key().isString(), AssemblyImportException, "Key inside '.data' is not of type string.");
+			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())
@@ -577,7 +578,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 					solRequire(
 						!data_value.empty(),
 						AssemblyImportException,
-						"Member '.data' contains a value for '" + dataItemID + "' that is not a valid hexadecimal string.");
+						"The value for key '" + dataItemID + "' inside '.data' is not a valid hexadecimal string.");
 				}
 				result->m_data[h256(fromHex(dataItemID))] = fromHex(code.asString());
 			}
@@ -591,7 +592,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 				result->m_subs[index] = subassembly;
 			}
 			else
-				solThrow(AssemblyImportException, "Key inside '.data' '" + dataItemID + "' can only be a valid hex-string or an object.");
+				solThrow(AssemblyImportException, "The value of key '" + dataItemID + "' inside '.data' is neither a hex string nor an object.");
 		}
 	}
 	if (_level == 0)

solc/CommandLineParser.cpp

@@ -1468,10 +1468,9 @@ void CommandLineParser::parseCombinedJsonOption()
 				solThrow(
 					CommandLineValidationError,
 					fmt::format(
-						"Invalid option to --{}: {} for --{}",
+						"The --{} {} output is not available in EVM assembly import mode.",
 						g_strCombinedJson,
-						CombinedJsonRequests::componentName(invalidOption),
-						g_strImportEvmAssemblerJson
+						CombinedJsonRequests::componentName(invalidOption)
 					)
 				);
 	}

test/cmdlineTests/asm_json_import_invalid_data_no_hex/err

@@ -1 +1 @@
-Error: Assembly Import Error: Member '.data' contains a value for '0' that is not a valid hexadecimal string.
+Error: Assembly Import Error: The value for key '0' inside '.data' is not a valid hexadecimal string.

test/cmdlineTests/asm_json_import_invalid_data_no_object/err

@@ -1 +1 @@
-Error: Assembly Import Error: Key inside '.data' '0' can only be a valid hex-string or an object.
+Error: Assembly Import Error: The value of key '0' inside '.data' is neither a hex string nor an object.

test/cmdlineTests/asm_json_import_no_value/err

@@ -1 +1 @@
-Error: Assembly Import Error: Member 'value' was not defined for instruction 'PUSH', but the instruction needs a value.
+Error: Assembly Import Error: Member 'value' is missing for instruction 'PUSH', but the instruction needs a value.

test/cmdlineTests/asm_json_import_other_fields/err

@@ -1 +1 @@
-Error: Assembly Import Error: Unknown member '_name'. Valid members are begin, end, jumpType, modifierDepth, name, source, value.
+Error: Assembly Import Error: Unknown member '_name'. Valid members are: begin, end, jumpType, modifierDepth, name, source, value.