aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AST.cpp3
-rw-r--r--Parser.cpp11
2 files changed, 4 insertions, 10 deletions
diff --git a/AST.cpp b/AST.cpp
index dbc32664..79d724fc 100644
--- a/AST.cpp
+++ b/AST.cpp
@@ -60,7 +60,6 @@ void ContractDefinition::checkTypeRequirements()
FunctionDefinition const* fallbackFunction = nullptr;
for (ASTPointer<FunctionDefinition> const& function: getDefinedFunctions())
- {
if (function->getName().empty())
{
if (fallbackFunction)
@@ -72,8 +71,6 @@ void ContractDefinition::checkTypeRequirements()
BOOST_THROW_EXCEPTION(fallbackFunction->getParameterList().createTypeError("Fallback function cannot take parameters."));
}
}
- }
-
for (ASTPointer<ModifierDefinition> const& modifier: getFunctionModifiers())
modifier->checkTypeRequirements();
diff --git a/Parser.cpp b/Parser.cpp
index 2f5b18a0..491b5f84 100644
--- a/Parser.cpp
+++ b/Parser.cpp
@@ -180,7 +180,7 @@ ASTPointer<InheritanceSpecifier> Parser::parseInheritanceSpecifier()
Declaration::Visibility Parser::parseVisibilitySpecifier(Token::Value _token)
{
- Declaration::Visibility visibility = Declaration::Visibility::DEFAULT;
+ Declaration::Visibility visibility(Declaration::Visibility::DEFAULT);
if (_token == Token::PUBLIC)
visibility = Declaration::Visibility::PUBLIC;
else if (_token == Token::PROTECTED)
@@ -278,20 +278,17 @@ ASTPointer<VariableDeclaration> Parser::parseVariableDeclaration(VarDeclParserOp
isIndexed = true;
m_scanner->next();
}
+ nodeFactory.markEndPosition();
if (_options.allowEmptyName && m_scanner->getCurrentToken() != Token::IDENTIFIER)
{
identifier = make_shared<ASTString>("");
nodeFactory.setEndPositionFromNode(type);
}
else
- {
- nodeFactory.markEndPosition();
identifier = expectIdentifierToken();
- }
- nodeFactory.markEndPosition();
return nodeFactory.createNode<VariableDeclaration>(type, identifier,
- visibility, _options.isStateVariable,
- isIndexed);
+ visibility, _options.isStateVariable,
+ isIndexed);
}
ASTPointer<ModifierDefinition> Parser::parseModifierDefinition()