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

Merge pull request #7123 from rocky/tolerate-pragma-mismatch

Browse Source 
A pragma version mismatch is not fatal if ...
This commit is contained in:
chriseth
2019-08-01 14:48:24 +02:00
committed by GitHub
parent 6730a59f74 f9b631f410
commit 2a25d7461f
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/SolidityParser.cpp
+17 -4
View File
@@ -41,12 +41,13 @@ namespace test
namespace
{
ASTPointer<ContractDefinition> parseText(std::string const& _source, ErrorList& _errors)
ASTPointer<ContractDefinition> parseText(std::string const& _source, ErrorList& _errors, bool errorRecovery = false)
{
ErrorReporter errorReporter(_errors);
ASTPointer<SourceUnit> sourceUnit = Parser(
errorReporter,
dev::test::Options::get().evmVersion()
dev::test::Options::get().evmVersion(),
errorRecovery
).parse(std::make_shared<Scanner>(CharStream(_source, "")));
if (!sourceUnit)
return ASTPointer<ContractDefinition>();
@@ -78,12 +79,12 @@ bool successParse(std::string const& _source)
return true;
}
Error getError(std::string const& _source)
Error getError(std::string const& _source, bool errorRecovery = false)
{
ErrorList errors;
try
{
parseText(_source, errors);
parseText(_source, errors, errorRecovery);
}
catch (FatalError const& /*_exception*/)
{
@@ -134,6 +135,18 @@ BOOST_AUTO_TEST_CASE(unsatisfied_version_followed_by_invalid_syntax)
CHECK_PARSE_ERROR(text, "Source file requires different compiler version");
}
BOOST_AUTO_TEST_CASE(unsatisfied_version_with_recovery)
{
char const* text = R"(
pragma solidity ^99.99.0;
contract test {
uint ;
}
)";
Error err = getError(text, true);
BOOST_CHECK(searchErrorMessage(err, "Expected identifier but got ';'"));
}
BOOST_AUTO_TEST_CASE(function_natspec_documentation)
{
char const* text = R"(