cerc-io/solidity
10
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

Generate ASTJSONTest variants only if a file with expected result exists

Browse Source
This commit is contained in:
wechman 2022-02-23 14:57:57 +01:00 committed by wechman
parent 371a531381
commit 4c1224e3bf
4 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/libsolidity/ASTJSON/assembly/nested_functions.json
View File

@ -89,7 +89,7 @@
} }
] ]
}, },
"evmVersion": "london", "evmVersion": %EVMVERSION%,
"externalReferences": "externalReferences":
[ [
{ {

2
test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
View File

@ -76,7 +76,7 @@
} }
] ]
}, },
"evmVersion": "london", "evmVersion": %EVMVERSION%,
"externalReferences": [], "externalReferences": [],
"id": 5, "id": 5,
"nodeType": "InlineAssembly", "nodeType": "InlineAssembly",

0
test/libsolidity/ASTJSON/event_with_variables_of_internal_types.json
View File

61
test/libsolidity/ASTJSONTest.cpp
View File

@ -50,14 +50,29 @@ namespace
string const sourceDelimiter("==== Source: "); string const sourceDelimiter("==== Source: ");
const map<string, CompilerStack::State> compilerStateMap = { string compilerStateToString(CompilerStack::State _state)
{"Empty", CompilerStack::State::Empty}, {
{"SourcesSet", CompilerStack::State::SourcesSet}, switch (_state)
{"Parsed", CompilerStack::State::Parsed}, {
{"ParsedAndImported", CompilerStack::State::ParsedAndImported}, case CompilerStack::State::Empty: return "Empty";
{"AnalysisPerformed", CompilerStack::State::AnalysisPerformed}, case CompilerStack::State::SourcesSet: return "SourcesSet";
{"CompilationSuccessful", CompilerStack::State::CompilationSuccessful} case CompilerStack::State::Parsed: return "Parsed";
}; case CompilerStack::State::ParsedAndImported: return "ParsedAndImported";
case CompilerStack::State::AnalysisPerformed: return "AnalysisPerformed";
case CompilerStack::State::CompilationSuccessful: return "CompilationSuccessful";
}
soltestAssert(false, "Unexpected value of state parameter");
}
CompilerStack::State stringToCompilerState(const string& _state)
{
for (unsigned int i = CompilerStack::State::Empty; i <= CompilerStack::State::CompilationSuccessful; ++i)
{
if (_state == compilerStateToString(CompilerStack::State(i)))
return CompilerStack::State(i);
}
BOOST_THROW_EXCEPTION(runtime_error("Unsupported compiler state (" + _state + ") in test contract file"));
}
void replaceVersionWithTag(string& _input) void replaceVersionWithTag(string& _input)
{ {
@ -88,11 +103,25 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
string_view baseName = _filename; string_view baseName = _filename;
baseName.remove_suffix(4); baseName.remove_suffix(4);
m_variants = { const std::vector<CompilerStack::State> variantCompileStates = {
TestVariant(baseName, CompilerStack::State::Parsed), CompilerStack::State::Parsed,
TestVariant(baseName, CompilerStack::State::AnalysisPerformed), CompilerStack::State::AnalysisPerformed
}; };
for (const auto state: variantCompileStates)
{
auto variant = TestVariant(baseName, state);
if (boost::filesystem::exists(variant.astFilename()))
{
variant.expectation = readFileAsString(variant.astFilename());
boost::replace_all(variant.expectation, "\r\n", "\n");
m_variants.push_back(variant);
}
}
if (m_variants.empty())
BOOST_THROW_EXCEPTION(runtime_error("Missing file with expected result for: \"" + _filename + "\"."));
ifstream file(_filename); ifstream file(_filename);
if (!file) if (!file)
BOOST_THROW_EXCEPTION(runtime_error("Cannot open test contract: \"" + _filename + "\".")); BOOST_THROW_EXCEPTION(runtime_error("Cannot open test contract: \"" + _filename + "\"."));
@ -120,11 +149,9 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
{ {
string state = line.substr(failMarker.size()); string state = line.substr(failMarker.size());
boost::algorithm::trim(state); boost::algorithm::trim(state);
if (compilerStateMap.find(state) == compilerStateMap.end())
BOOST_THROW_EXCEPTION(runtime_error("Unsupported compiler state (" + state + ") in test contract file"));
if (m_expectedFailAfter.has_value()) if (m_expectedFailAfter.has_value())
BOOST_THROW_EXCEPTION(runtime_error("Duplicated \"failAfter\" directive")); BOOST_THROW_EXCEPTION(runtime_error("Duplicated \"failAfter\" directive"));
m_expectedFailAfter = compilerStateMap.at(state); m_expectedFailAfter = stringToCompilerState(state);
} }
else if (!line.empty() && !boost::algorithm::starts_with(line, delimiter)) else if (!line.empty() && !boost::algorithm::starts_with(line, delimiter))
source += line + "\n"; source += line + "\n";
@ -132,12 +159,6 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
m_sources.emplace_back(sourceName.empty() ? "a" : sourceName, source); m_sources.emplace_back(sourceName.empty() ? "a" : sourceName, source);
file.close(); file.close();
for (TestVariant& variant: m_variants)
{
variant.expectation = readFileAsString(variant.astFilename());
boost::replace_all(variant.expectation, "\r\n", "\n");
}
} }
TestCase::TestResult ASTJSONTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted) TestCase::TestResult ASTJSONTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)