diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-09 20:35:38 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-09 21:30:17 +0800 |
| commit | efd45f64a542c722d750f79b483dd7428aba16ed (patch) | |
| tree | 9faffe22eb9c3fa3a20248e1d7550a1b7dfd1d32 /libsolidity/parsing/Parser.cpp | |
| parent | a8ca623a0f852c738b8bb92b449894ecc73b44e1 (diff) | |
| download | dexon-solidity-efd45f64a542c722d750f79b483dd7428aba16ed.tar.gz dexon-solidity-efd45f64a542c722d750f79b483dd7428aba16ed.tar.zst dexon-solidity-efd45f64a542c722d750f79b483dd7428aba16ed.zip | |
Show previous visibility specifier in parser error
Diffstat (limited to 'libsolidity/parsing/Parser.cpp')
| -rw-r--r-- | libsolidity/parsing/Parser.cpp | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp index d1f9c1fa..7e1d36dd 100644 --- a/libsolidity/parsing/Parser.cpp +++ b/libsolidity/parsing/Parser.cpp @@ -307,6 +307,24 @@ Declaration::Visibility Parser::parseVisibilitySpecifier(Token::Value _token) return visibility; } +string Parser::visibilitySpecifierName(Declaration::Visibility _visibility) +{ + switch(_visibility) + { + case Declaration::Visibility::Public: + return "public"; + case Declaration::Visibility::Internal: + return "internal"; + case Declaration::Visibility::Private: + return "private"; + case Declaration::Visibility::External: + return "external"; + default: + solAssert(false, "Invalid visibility specifier."); + } + return string(); +} + Parser::FunctionHeaderParserResult Parser::parseFunctionHeader(bool _forceEmptyName, bool _allowModifiers) { FunctionHeaderParserResult result; @@ -354,7 +372,11 @@ Parser::FunctionHeaderParserResult Parser::parseFunctionHeader(bool _forceEmptyN { if (result.visibility != Declaration::Visibility::Default) { - parserError(string("Visibility already specified.")); + parserError(string( + "Visibility already specified as \"" + + visibilitySpecifierName(result.visibility) + + "\"." + )); m_scanner->next(); } else @@ -512,7 +534,11 @@ ASTPointer<VariableDeclaration> Parser::parseVariableDeclaration( { if (visibility != Declaration::Visibility::Default) { - parserError(string("Visibility already specified.")); + parserError(string( + "Visibility already specified as \"" + + visibilitySpecifierName(visibility) + + "\"." + )); m_scanner->next(); } else |