UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare/parser] Parse one multiplication/addition for 1+1+1+1+1+1

Browse Source
This commit is contained in:
Léa Saviot
2019-08-02 11:45:34 +02:00
committed by Émilie Feral
parent cedcab21ec
commit ddb05d930d
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,12 @@ void Parser::parseNumber(Expression & leftHandSide, Token::Type stoppingType) {
void Parser::parsePlus(Expression & leftHandSide, Token::Type stoppingType) {
Expression rightHandSide;
if (parseBinaryOperator(leftHandSide, rightHandSide, Token::Plus)) {
leftHandSide = Addition::Builder(leftHandSide, rightHandSide);
if (leftHandSide.type() == ExpressionNode::Type::Addition) {
int childrenCount = leftHandSide.numberOfChildren();
static_cast<Addition &>(leftHandSide).addChildAtIndexInPlace(rightHandSide, childrenCount, childrenCount);
} else {
leftHandSide = Addition::Builder(leftHandSide, rightHandSide);
}
}
}
@@ -191,7 +196,12 @@ void Parser::parseMinus(Expression & leftHandSide, Token::Type stoppingType) {
void Parser::parseTimes(Expression & leftHandSide, Token::Type stoppingType) {
Expression rightHandSide;
if (parseBinaryOperator(leftHandSide, rightHandSide, Token::Times)) {
leftHandSide = MultiplicationExplicite::Builder(leftHandSide, rightHandSide);
if (leftHandSide.type() == ExpressionNode::Type::MultiplicationExplicite) {
int childrenCount = leftHandSide.numberOfChildren();
static_cast<MultiplicationExplicite &>(leftHandSide).addChildAtIndexInPlace(rightHandSide, childrenCount, childrenCount);
} else {
leftHandSide = MultiplicationExplicite::Builder(leftHandSide, rightHandSide);
}
}
}