From bcccfa8805dfe471b2e3711a23dcb2e0caf7e7bb Mon Sep 17 00:00:00 2001
From: Liana Husikyan <liana@ethdev.com>
Date: Mon, 9 Feb 2015 02:24:57 +0100
Subject: - 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
---
 Parser.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'Parser.cpp')

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()
-- 
cgit v1.2.3