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] Catch interrupted "simplify" in Poincare::Store

Browse Source
This commit is contained in:
Léa Saviot
2018-11-08 15:18:04 +01:00
committed by Émilie Feral
parent cb678e370e
commit 4b4376a41f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
poincare/src/store.cpp
View File

@@ -46,6 +46,9 @@ Evaluation<T> StoreNode::templatedApproximate(Context& context, Preferences::Ang
* setExpressionForSymbol. */
Store s(this);
Expression expressionToStore = s.value().clone().simplify(context, angleUnit, false);
if (expressionToStore.isUninitialized() || expressionToStore.isUndefined()) {
expressionToStore = s.value();
}
context.setExpressionForSymbol(expressionToStore, s.symbol(), context);
Expression e = context.expressionForSymbol(s.symbol());
if (e.isUninitialized()) {
@@ -66,7 +69,11 @@ Expression Store::shallowReduce(Context & context, Preferences::AngleUnit angleU
assert(symbol().type() == ExpressionNode::Type::Symbol);
finalValue = childAtIndex(0);
}
context.setExpressionForSymbol(finalValue.simplify(context, angleUnit, false), symbol(), context);
Expression expressionToStore = finalValue.clone().simplify(context, angleUnit, false);
if (expressionToStore.isUninitialized() || expressionToStore.isUndefined()) {
expressionToStore = finalValue;
}
context.setExpressionForSymbol(expressionToStore, symbol(), context);
Expression e = context.expressionForSymbol(symbol());
if (e.isUninitialized()) {
return Undefined();