Browse Source

- removed unnesessary braces but one in if statement is still there because of warrning about ambiguous "else"

- added marking of position in node factory to the function

Conflicts:
	libsolidity/Parser.cpp
cl-refactor
Liana Husikyan 10 years ago
parent
commit
1db350b06a
  1. 3
      libsolidity/AST.cpp
  2. 11
      libsolidity/Parser.cpp

3
libsolidity/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();

11
libsolidity/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()

Loading…
Cancel
Save