UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare/parser] Rename Parser::currentTokenIsSpecialIdentifier

Browse Source
This commit is contained in:
Léa Saviot
2018-11-12 10:12:47 +01:00
committed by Émilie Feral
parent 76aae9d478
commit b753619378
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
poincare/src/parsing/parser.cpp
View File

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

2
poincare/src/parsing/parser.h
View File

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