Simplify expectIdentifierToken by using expectToken

This commit is contained in:
Alex Beregszaszi
2018-05-03 22:10:51 +01:00
parent 73c99d15cd
commit ed9f80690b
13 changed files with 16 additions and 33 deletions
+2 -19
View File
@@ -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();
if (id != Token::Identifier)
fatalParserError(
string("Expected identifier, got '") +
currentTokenName() +
string("'")
);
// do not advance on success
expectToken(Token::Identifier, false);
return getLiteralAndAdvance();
}