more corrections

This commit is contained in:
LianaHus 2015-10-23 12:56:50 +02:00
parent 6e13853421
commit d8865f9f05

View File

@ -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();
}