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

Remove a dedicated error flag from DeclarationTypeChecker

Browse Source
This commit is contained in:
a3d4 2020-05-12 18:13:17 +02:00
parent b014b89edc
commit 02d1f8c41a
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
liblangutil/ErrorReporter.h
View File

@ -134,6 +134,12 @@ public:
return m_errorCount > 0; return m_errorCount > 0;
} }
/// @returns the number of errors (ignores warnings).
unsigned errorCount() const
{
return m_errorCount;
}
// @returns true if the maximum error count has been reached. // @returns true if the maximum error count has been reached.
bool hasExcessiveErrors() const; bool hasExcessiveErrors() const;

6
libsolidity/analysis/DeclarationTypeChecker.cpp
View File

@ -361,24 +361,22 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
void DeclarationTypeChecker::typeError(SourceLocation const& _location, string const& _description) void DeclarationTypeChecker::typeError(SourceLocation const& _location, string const& _description)
{ {
m_errorOccurred = true;
m_errorReporter.typeError(2311_error, _location, _description); m_errorReporter.typeError(2311_error, _location, _description);
} }
void DeclarationTypeChecker::fatalTypeError(SourceLocation const& _location, string const& _description) void DeclarationTypeChecker::fatalTypeError(SourceLocation const& _location, string const& _description)
{ {
m_errorOccurred = true;
m_errorReporter.fatalTypeError(5651_error, _location, _description); m_errorReporter.fatalTypeError(5651_error, _location, _description);
} }
void DeclarationTypeChecker::fatalDeclarationError(SourceLocation const& _location, string const& _description) void DeclarationTypeChecker::fatalDeclarationError(SourceLocation const& _location, string const& _description)
{ {
m_errorOccurred = true;
m_errorReporter.fatalDeclarationError(2046_error, _location, _description); m_errorReporter.fatalDeclarationError(2046_error, _location, _description);
} }
bool DeclarationTypeChecker::check(ASTNode const& _node) bool DeclarationTypeChecker::check(ASTNode const& _node)
{ {
unsigned errorCount = m_errorReporter.errorCount();
_node.accept(*this); _node.accept(*this);
return !m_errorOccurred; return m_errorReporter.errorCount() == errorCount;
} }

1
libsolidity/analysis/DeclarationTypeChecker.h
View File

@ -69,7 +69,6 @@ private:
void fatalDeclarationError(langutil::SourceLocation const& _location, std::string const& _description); void fatalDeclarationError(langutil::SourceLocation const& _location, std::string const& _description);
langutil::ErrorReporter& m_errorReporter; langutil::ErrorReporter& m_errorReporter;
bool m_errorOccurred = false;
langutil::EVMVersion m_evmVersion; langutil::EVMVersion m_evmVersion;
bool m_insideFunctionType = false; bool m_insideFunctionType = false;
bool m_recursiveStructSeen = false; bool m_recursiveStructSeen = false;

2
test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
View File

@ -3,5 +3,3 @@ contract test {
} }
// ---- // ----
// DeclarationError: (31-55): The "constant" keyword can only be used for state variables. // DeclarationError: (31-55): The "constant" keyword can only be used for state variables.
// TypeError: (31-55): Constants of non-value type not yet implemented.
// TypeError: (31-55): Uninitialized "constant" variable.

2
test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
View File

@ -3,5 +3,3 @@ contract Foo {
} }
// ---- // ----
// DeclarationError: (30-55): The "constant" keyword can only be used for state variables. // DeclarationError: (30-55): The "constant" keyword can only be used for state variables.
// TypeError: (30-55): Constants of non-value type not yet implemented.
// TypeError: (30-55): Uninitialized "constant" variable.