From 48f58aa3f9b4d8962b2c6f1bd7967b119893a889 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 26 May 2017 21:00:08 +0100
Subject: [PATCH] Remove duplicate code

---
 libsolidity/parsing/Parser.cpp | 38 ++++++++++++++++------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 470586cff..dca49360d 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1442,21 +1442,20 @@ Token::Value Parser::expectAssignmentOperator()
 	Token::Value op = m_scanner->currentToken();
 	if (!Token::isAssignmentOp(op))
 	{
+		string tokenName;
 		if (Token::isElementaryTypeName(op)) //for the sake of accuracy in reporting
 		{
 			ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken();
-			fatalParserError(
-				string("Expected assignment operator,  got '") +
-				elemTypeName.toString() +
-				string("'")
-			);
+			tokenName = elemTypeName.toString();
 		}
 		else
-			fatalParserError(
-				string("Expected assignment operator,  got '") +
-				string(Token::name(m_scanner->currentToken())) +
-				string("'")
-			);
+			tokenName = Token::name(m_scanner->currentToken());
+
+		fatalParserError(
+			string("Expected assignment operator,  got '") +
+			tokenName +
+			string("'")
+		);
 	}
 	m_scanner->next();
 	return op;
@@ -1467,21 +1466,20 @@ ASTPointer<ASTString> Parser::expectIdentifierToken()
 	Token::Value id = m_scanner->currentToken();
 	if (id != Token::Identifier)
 	{
+		string tokenName;
 		if (Token::isElementaryTypeName(id)) //for the sake of accuracy in reporting
 		{
 			ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken();
-			fatalParserError(
-				string("Expected identifier, got '") +
-				elemTypeName.toString() +
-				string("'")
-			);
+			tokenName = elemTypeName.toString();
 		}
 		else
-			fatalParserError(
-				string("Expected identifier, got '") +
-				string(Token::name(id)) +
-				string("'")
-			);
+			tokenName = Token::name(id);
+
+		fatalParserError(
+			string("Expected identifier, got '") +
+			tokenName +
+			string("'")
+		);
 	}
 	return getLiteralAndAdvance();
 }