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/expression] Return undef if simplification interrupted

Browse Source 
Without this change, we would get weird "reduced" expression, such as
multiplication(undef, _s), but we do not always check
sSimplificationHasBeenInterrupted afterwards.
This commit is contained in:
Léa Saviot
2020-07-28 17:07:22 +02:00
committed by EmilieNumworks
parent 5c75cc55d3
commit f3628f368f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
poincare/src/expression.cpp
View File

@@ -817,7 +817,11 @@ Expression Expression::angleUnitToRadian(Preferences::AngleUnit angleUnit) {
Expression Expression::reduce(ExpressionNode::ReductionContext reductionContext) {
sSimplificationHasBeenInterrupted = false;
return deepReduce(reductionContext);
Expression result = deepReduce(reductionContext);
if (sSimplificationHasBeenInterrupted) {
return replaceWithUndefinedInPlace();
}
return result;
}
Expression Expression::deepReduce(ExpressionNode::ReductionContext reductionContext) {