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

Show previous visibility specifier in parser error

Browse Source
This commit is contained in:
Alex Beregszaszi
2017-08-09 14:30:17 +01:00
parent a8ca623a0f
commit efd45f64a5
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/parsing/Parser.cpp
+28 -2
View File
@@ -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