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] Rename Power Token as Caret

Browse Source
This commit is contained in:
Ruben Dashyan
2018-10-04 11:10:33 +02:00
committed by Émilie Feral
parent 6c52a62168
commit b27f98c287
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ Expression Parser::parseUntil(Token::Type stoppingType) {
&Parser::parseMinus,
&Parser::parseTimes,
&Parser::parseSlash,
&Parser::parsePower,
&Parser::parseCaret,
&Parser::parseSquareRoot,
&Parser::parseBang,
&Parser::parseMatrix, //LeftBracket,
@@ -96,18 +96,16 @@ Expression Parser::parseMinus(const Expression & leftHandSide) {
}
}
Expression Parser::parsePower(const Expression & leftHandSide) {
Expression Parser::parseCaret(const Expression & leftHandSide) {
return parseBinaryOperator<Power>(leftHandSide, Token::Type::Slash); // Power is right-associative
}
Expression Parser::parseLeftParenthesis(const Expression & leftHandSide) {
assert(leftHandSide.isUninitialized());
Expression rightHandSide = parseUntil(Token::Type::RightParenthesis);
if (!expect(Token::Type::RightParenthesis)) {
return Expression();
}
return Parenthesis(rightHandSide);
}

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

@@ -58,7 +58,7 @@ private:
Expression parseTimes(const Expression & leftHandSide);
Expression parseSlash(const Expression & leftHandSide);
Expression parseMinus(const Expression & leftHandSide);
Expression parsePower(const Expression & leftHandSide);
Expression parseCaret(const Expression & leftHandSide);
Expression parseLeftParenthesis(const Expression & leftHandSide);
Expression parseSquareRoot(const Expression & leftHandSide);
Expression parseBang(const Expression & leftHandSide);

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

@@ -20,7 +20,7 @@ public:
Minus,
Times,
Slash,
Power,
Caret,
SquareRoot,
Bang,
LeftBracket,

2
poincare/src/parsing/tokenizer.cpp
View File

@@ -104,7 +104,7 @@ Token Tokenizer::popToken() {
return Token(Token::Type::RightBracket);
}
if (canPopChar('^')) {
return Token(Token::Type::Power);
return Token(Token::Type::Caret);
}
if (canPopChar('{')) {
return Token(Token::Type::LeftBrace);