diff --git a/poincare/src/parsing/parser.cpp b/poincare/src/parsing/parser.cpp index f563b0c59..7c184c41b 100644 --- a/poincare/src/parsing/parser.cpp +++ b/poincare/src/parsing/parser.cpp @@ -204,7 +204,7 @@ void Parser::parseStore(Expression & leftHandSide) { // At this point, m_currentToken is Token::Store. popToken(); const Expression::FunctionHelper * const * functionHelper; - if (!m_currentToken.is(Token::Identifier) || currentTokenIsReservedFunction(&functionHelper) || isSpecialIdentifier()) { + if (!m_currentToken.is(Token::Identifier) || currentTokenIsReservedFunction(&functionHelper) || currentTokenIsSpecialIdentifier()) { m_status = Status::Error; // The right-hand side of Token::Store must be symbol or function that is not reserved. return; } @@ -269,7 +269,7 @@ bool Parser::currentTokenIsReservedFunction(const Expression::FunctionHelper * c return IsReservedFunctionName(m_currentToken.text(), m_currentToken.length(), functionHelper); } -bool Parser::isSpecialIdentifier() const { +bool Parser::currentTokenIsSpecialIdentifier() const { // TODO Avoid special cases if possible return ( m_currentToken.compareTo(Symbol::k_ans) == 0 || @@ -404,7 +404,7 @@ void Parser::parseIdentifier(Expression & leftHandSide) { * element of s_reservedFunctions. */ if (currentTokenIsReservedFunction(&functionHelper)) { parseReservedFunction(leftHandSide, functionHelper); - } else if (isSpecialIdentifier()) { + } else if (currentTokenIsSpecialIdentifier()) { parseSpecialIdentifier(leftHandSide); } else { parseCustomIdentifier(leftHandSide, m_currentToken.text(), m_currentToken.length()); diff --git a/poincare/src/parsing/parser.h b/poincare/src/parsing/parser.h index 14cf01ef7..9fd106538 100644 --- a/poincare/src/parsing/parser.h +++ b/poincare/src/parsing/parser.h @@ -66,7 +66,7 @@ private: Expression parseCommaSeparatedList(); bool currentTokenIsReservedFunction(const Expression::FunctionHelper * const * * functionHelper) const; void parseReservedFunction(Expression & leftHandSide, const Expression::FunctionHelper * const * functionHelper); - bool isSpecialIdentifier() const; + bool currentTokenIsSpecialIdentifier() const; void parseSpecialIdentifier(Expression & leftHandSide); void parseSequence(Expression & leftHandSide, const char name, Token::Type leftDelimiter, Token::Type rightDelimiter); void parseCustomIdentifier(Expression & leftHandSide, const char * name, size_t length);