cerc-io/solidity
16
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 #12353 from ethereum/accessorsForExecptions

Browse Source 
Accessors for exceptions.
This commit is contained in:
chriseth 2021-12-01 15:09:08 +01:00 committed by GitHub
commit 8569cf32f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
liblangutil/Exceptions.cpp
View File

@ -75,6 +75,16 @@ Error::Error(
*this << util::errinfo_comment(_description); *this << util::errinfo_comment(_description);
} }
SourceLocation const* Error::sourceLocation() const noexcept
{
return boost::get_error_info<errinfo_sourceLocation>(*this);
}
SecondarySourceLocation const* Error::secondarySourceLocation() const noexcept
{
return boost::get_error_info<errinfo_secondarySourceLocation>(*this);
}
optional<Error::Severity> Error::severityFromString(string _input) optional<Error::Severity> Error::severityFromString(string _input)
{ {
boost::algorithm::to_lower(_input); boost::algorithm::to_lower(_input);

5
liblangutil/Exceptions.h
View File

@ -197,6 +197,9 @@ public:
Type type() const { return m_type; } Type type() const { return m_type; }
std::string const& typeName() const { return m_typeName; } std::string const& typeName() const { return m_typeName; }
SourceLocation const* sourceLocation() const noexcept;
SecondarySourceLocation const* secondarySourceLocation() const noexcept;
/// helper functions /// helper functions
static Error const* containsErrorOfType(ErrorList const& _list, Error::Type _type) static Error const* containsErrorOfType(ErrorList const& _list, Error::Type _type)
{ {
@ -206,7 +209,7 @@ public:
return nullptr; return nullptr;
} }
static Severity errorSeverity(Type _type) static constexpr Severity errorSeverity(Type _type)
{ {
if (_type == Type::Info) if (_type == Type::Info)
return Severity::Info; return Severity::Info;

2
libsolidity/interface/StandardCompiler.cpp
View File

@ -129,7 +129,7 @@ Json::Value formatErrorWithException(
_charStreamProvider _charStreamProvider
); );
if (string const* description = boost::get_error_info<util::errinfo_comment>(_exception)) if (string const* description = _exception.comment())
message = ((_message.length() > 0) ? (_message + ":") : "") + *description; message = ((_message.length() > 0) ? (_message + ":") : "") + *description;
else else
message = _message; message = _message;

2
libsolutil/Exceptions.h
View File

@ -39,8 +39,6 @@ struct Exception: virtual std::exception, virtual boost::exception
/// @returns the errinfo_comment of this exception. /// @returns the errinfo_comment of this exception.
std::string const* comment() const noexcept; std::string const* comment() const noexcept;
private:
}; };
/// Throws an exception with a given description and extra information about the location the /// Throws an exception with a given description and extra information about the location the

2
test/libsolidity/AnalysisFramework.cpp
View File

@ -100,7 +100,7 @@ ErrorList AnalysisFramework::filterErrors(ErrorList const& _errorList, bool _inc
for (auto const& messagePrefix: m_messagesToCut) for (auto const& messagePrefix: m_messagesToCut)
if (currentError->comment()->find(messagePrefix) == 0) if (currentError->comment()->find(messagePrefix) == 0)
{ {
SourceLocation const* location = boost::get_error_info<errinfo_sourceLocation>(*currentError); SourceLocation const* location = currentError->sourceLocation();
// sufficient for now, but in future we might clone the error completely, including the secondary location // sufficient for now, but in future we might clone the error completely, including the secondary location
newError = make_shared<Error>( newError = make_shared<Error>(
currentError->errorId(), currentError->errorId(),

5
test/libsolidity/SyntaxTest.cpp
View File

@ -118,9 +118,10 @@ void SyntaxTest::filterObtainedErrors()
{ {
for (auto const& currentError: filterErrors(compiler().errors(), true)) for (auto const& currentError: filterErrors(compiler().errors(), true))
{ {
int locationStart = -1, locationEnd = -1; int locationStart = -1;
int locationEnd = -1;
string sourceName; string sourceName;
if (auto location = boost::get_error_info<errinfo_sourceLocation>(*currentError)) if (SourceLocation const* location = currentError->sourceLocation())
{ {
solAssert(location->sourceName, ""); solAssert(location->sourceName, "");
sourceName = *location->sourceName; sourceName = *location->sourceName;

2
test/libyul/SyntaxTest.cpp
View File

@ -54,7 +54,7 @@ void SyntaxTest::parseAndAnalyze()
int locationStart = -1; int locationStart = -1;
int locationEnd = -1; int locationEnd = -1;
if (auto location = boost::get_error_info<errinfo_sourceLocation>(*error)) if (SourceLocation const* location = error->sourceLocation())
{ {
locationStart = location->start; locationStart = location->start;
locationEnd = location->end; locationEnd = location->end;