Simplify expectIdentifierToken by using expectToken

libsolidity/parsing/Parser.cpp

@@ -1602,27 +1602,10 @@ ASTPointer<ParameterList> Parser::createEmptyParameterList()
 	return nodeFactory.createNode<ParameterList>(vector<ASTPointer<VariableDeclaration>>());
 }
 
-string Parser::currentTokenName()
-{
-	Token::Value token = m_scanner->currentToken();
-	if (Token::isElementaryTypeName(token)) //for the sake of accuracy in reporting
-	{
-		ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken();
-		return elemTypeName.toString();
-	}
-	else
-		return Token::name(token);
-}
-
 ASTPointer<ASTString> Parser::expectIdentifierToken()
 {
-	Token::Value id = m_scanner->currentToken();
+	// do not advance on success
-	if (id != Token::Identifier)
+	expectToken(Token::Identifier, false);
-		fatalParserError(
-			string("Expected identifier, got '") +
-			currentTokenName() +
-			string("'")
-		);
 	return getLiteralAndAdvance();
 }
 

libsolidity/parsing/Parser.h

@@ -165,7 +165,6 @@ private:
 	/// @returns an expression parsed in look-ahead fashion from something like "a.b[8][2**70]".
 	ASTPointer<Expression> expressionFromIndexAccessStructure(IndexAccessedPath const& _pathAndIndices);
 
-	std::string currentTokenName();
 	ASTPointer<ASTString> expectIdentifierToken();
 	ASTPointer<ASTString> getLiteralAndAdvance();
 	///@}

libsolidity/parsing/ParserBase.cpp

@@ -63,7 +63,7 @@ Token::Value ParserBase::advance()
 	return m_scanner->next();
 }
 
-void ParserBase::expectToken(Token::Value _value)
+void ParserBase::expectToken(Token::Value _value, bool _advance)
 {
 	Token::Value tok = m_scanner->currentToken();
 	if (tok != _value)
@@ -98,6 +98,7 @@ void ParserBase::expectToken(Token::Value _value)
 				string("'")
 			);
 	}
+	if (_advance)
 		m_scanner->next();
 }
 

libsolidity/parsing/ParserBase.h

@@ -63,7 +63,7 @@ protected:
 	///@{
 	///@name Helper functions
 	/// If current token value is not _value, throw exception otherwise advance token.
-	void expectToken(Token::Value _value);
+	void expectToken(Token::Value _value, bool _advance = true);
 	Token::Value currentToken() const;
 	Token::Value peekNextToken() const;
 	std::string currentLiteral() const;

test/libsolidity/SolidityParser.cpp

@@ -992,7 +992,7 @@ BOOST_AUTO_TEST_CASE(keyword_is_reserved)
 	for (const auto& keyword: keywords)
 	{
 		auto text = std::string("contract ") + keyword + " {}";
-		CHECK_PARSE_ERROR(text.c_str(), "Expected identifier");
+		CHECK_PARSE_ERROR(text.c_str(), "Expected token Identifier got reserved keyword");
 	}
 }
 

test/libsolidity/StandardCompiler.cpp

@@ -326,8 +326,8 @@ BOOST_AUTO_TEST_CASE(compilation_error)
 		{
 			BOOST_CHECK_EQUAL(
 				dev::jsonCompactPrint(error),
-				"{\"component\":\"general\",\"formattedMessage\":\"fileA:1:23: ParserError: Expected identifier, got 'RBrace'\\n"
+				"{\"component\":\"general\",\"formattedMessage\":\"fileA:1:23: ParserError: Expected token Identifier got 'RBrace'\\n"
-				"contract A { function }\\n                      ^\\n\",\"message\":\"Expected identifier, got 'RBrace'\","
+				"contract A { function }\\n                      ^\\n\",\"message\":\"Expected token Identifier got 'RBrace'\","
 				"\"severity\":\"error\",\"sourceLocation\":{\"end\":22,\"file\":\"fileA\",\"start\":22},\"type\":\"ParserError\"}"
 			);
 		}

test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol

@@ -2,4 +2,4 @@ contract Foo {
 	uint constant = 4;
 }
 // ----
-// ParserError: (30-30): Expected identifier, got 'Assign'
+// ParserError: (30-30): Expected token Identifier got 'Assign'

test/libsolidity/syntaxTests/parsing/external_variable.sol

@@ -2,4 +2,4 @@ contract c {
 	uint external x;
 }
 // ----
-// ParserError: (19-19): Expected identifier, got 'External'
+// ParserError: (19-19): Expected token Identifier got 'External'

test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol

@@ -2,4 +2,4 @@ contract Foo {
 	uint[] memory x;
 }
 // ----
-// ParserError: (23-23): Expected identifier, got 'Memory'
+// ParserError: (23-23): Expected token Identifier got 'Memory'

test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol

@@ -3,4 +3,4 @@ contract test {
 	function b() returns (uint r) { r = a({: 1, : 2, : 3}); }
 }
 // ----
-// ParserError: (143-143): Expected identifier, got 'Colon'
+// ParserError: (143-143): Expected token Identifier got 'Colon'

test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol

@@ -2,4 +2,4 @@ contract test {
     uint256 ;
 }
 // ----
-// ParserError: (28-28): Expected identifier, got 'Semicolon'
+// ParserError: (28-28): Expected token Identifier got 'Semicolon'

test/libsolidity/syntaxTests/parsing/payable_accessor.sol

@@ -2,4 +2,4 @@ contract test {
 	uint payable x;
 }
 // ----
-// ParserError: (22-22): Expected identifier, got 'Payable'
+// ParserError: (22-22): Expected token Identifier got 'Payable'

test/libsolidity/syntaxTests/parsing/var_array.sol

@@ -2,4 +2,4 @@ contract Foo {
 	function f() { var[] a; }
 }
 // ----
-// ParserError: (34-34): Expected identifier, got 'LBrack'
+// ParserError: (34-34): Expected token Identifier got 'LBrack'