From d8865f9f0540a4aff270a9c2caf5d63c3d70e7c4 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Fri, 23 Oct 2015 12:56:50 +0200
Subject: more corrections

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

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index e7451396..35872f78 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1180,13 +1180,13 @@ ASTPointer<Expression> Parser::expressionFromIndexAccessStructure(
 void Parser::expectToken(Token::Value _value)
 {
 	if (m_scanner->currentToken() != _value)
-		fatalParserError(std::string(
+		fatalParserError(
 			string("Expected token ") +
 			string(Token::name(_value)) +
 			string(" got '") +
 			string(Token::name(m_scanner->currentToken())) +
 			string("'")
-		));
+		);
 	m_scanner->next();
 }
 
@@ -1194,7 +1194,12 @@ Token::Value Parser::expectAssignmentOperator()
 {
 	Token::Value op = m_scanner->currentToken();
 	if (!Token::isAssignmentOp(op))
-		fatalParserError(std::string("Expected assignment operator"));
+		fatalParserError(
+			std::string("Expected assignment operator ") +
+			string(" got '") +
+			string(Token::name(m_scanner->currentToken())) +
+			string("'")
+		);
 	m_scanner->next();
 	return op;
 }
@@ -1202,7 +1207,12 @@ Token::Value Parser::expectAssignmentOperator()
 ASTPointer<ASTString> Parser::expectIdentifierToken()
 {
 	if (m_scanner->currentToken() != Token::Identifier)
-		fatalParserError(std::string("Expected identifier"));
+		fatalParserError(
+			std::string("Expected identifier ") +
+			string(" got '") +
+			string(Token::name(m_scanner->currentToken())) +
+			string("'")
+		);
 	return getLiteralAndAdvance();
 }
 
-- 
cgit