cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaning up helpers around errors

Browse Source
This commit is contained in:
nishant-sachdeva
2022-09-19 10:51:14 +05:30
parent 1fbee8259a
commit c8011d8719
21 changed files with 271 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/cmdlineTests/standard_urls_existing_and_missing/args
+1
View File
@@ -0,0 +1 @@
--pretty-json --json-indent 4
test/cmdlineTests/standard_urls_existing_and_missing/contract.sol
+2
View File
@@ -0,0 +1,2 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity *;
test/cmdlineTests/standard_urls_existing_and_missing/input.json
+13
View File
@@ -0,0 +1,13 @@
{
"language": "Solidity",
"sources": {
"url_not_found.sol": {
"urls": [
"standard_urls_existing_and_missing/non-existent-contract-1.sol",
"standard_urls_existing_and_missing/contract.sol",
"standard_urls_existing_and_missing/non-existent-contract-2.sol"
]
}
},
"settings": {"outputSelection": {"*": { "*": ["metadata", "evm.bytecode"]}}}
}
test/cmdlineTests/standard_urls_existing_and_missing/output.json
+18
View File
@@ -0,0 +1,18 @@
{
"errors":
[
{
"component": "general",
"formattedMessage": "Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
"message": "Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
"severity": "warning",
"type": "Warning"
}],
"sources":
{
"url_not_found.sol":
{
"id": 0
}
}
}
test/cmdlineTests/standard_urls_missing/args
+1
View File
@@ -0,0 +1 @@
--pretty-json --json-indent 4
test/cmdlineTests/standard_urls_missing/contract.sol
+2
View File
@@ -0,0 +1,2 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity *;
test/cmdlineTests/standard_urls_missing/input.json
+13
View File
@@ -0,0 +1,13 @@
{
"language": "Solidity",
"sources": {
"url_not_found.sol": {
"urls": [
"standard_urls_missing/non-existent-contract-1.sol",
"standard_urls_missing/non-existent-contract.sol",
"standard_urls_missing/non-existent-contract-2.sol"
]
}
},
"settings": {"outputSelection": {"*": { "*": ["metadata", "evm.bytecode"]}}}
}
test/cmdlineTests/standard_urls_missing/output.json
+26
View File
@@ -0,0 +1,26 @@
{
"errors":
[
{
"component": "general",
"formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
"message": "Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
"severity": "error",
"type": "IOError"
},
{
"component": "general",
"formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".",
"message": "Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".",
"severity": "error",
"type": "IOError"
},
{
"component": "general",
"formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".",
"message": "Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".",
"severity": "error",
"type": "IOError"
}],
"sources": {}
}
test/libsolidity/ErrorCheck.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ string solidity::frontend::test::searchErrors(ErrorList const& _errors, vector<p
break;
}
if (!found)
return "Unexpected error: " + error->typeName() + ": " + msg;
return "Unexpected error: " + Error::formatErrorType(error->type()) + ": " + msg;
}
if (!expectations.empty())
{
test/libsolidity/SyntaxTest.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ void SyntaxTest::filterObtainedErrors()
}
}
m_errorList.emplace_back(SyntaxTestError{
currentError->typeName(),
Error::formatErrorType(currentError->type()),
currentError->errorId(),
errorMessage(*currentError),
sourceName,
test/libyul/SyntaxTest.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ void SyntaxTest::parseAndAnalyze()
}
m_errorList.emplace_back(SyntaxTestError{
error->typeName(),
Error::formatErrorType(error->type()),
error->errorId(),
errorMessage(*error),
name,
test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+1 -4
View File
@@ -79,10 +79,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
SourceReferenceFormatter formatter(std::cout, stack, false, false);
for (auto const& error: stack.errors())
formatter.printExceptionInformation(
*error,
(error->type() == Error::Type::Warning) ? "Warning" : "Error"
);
formatter.printExceptionInformation(*error, error->type());
yulAssert(false, "Proto fuzzer generated malformed program");
}