From 7feef8f2664656dc85ebdbc799236fdd7efeeb2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Fri, 7 Sep 2018 15:27:28 +0200 Subject: [PATCH] [poincare] Expression: approximateToEvaluation does not handle Uninitialized Expression but approximate does --- poincare/src/expression.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poincare/src/expression.cpp b/poincare/src/expression.cpp index 6b60c0f7c..40ad6603a 100644 --- a/poincare/src/expression.cpp +++ b/poincare/src/expression.cpp @@ -196,7 +196,7 @@ void Expression::defaultSetChildrenInPlace(Expression other) { template Evaluation Expression::approximateToEvaluation(Context& context, Preferences::AngleUnit angleUnit) const { - return isUninitialized() ? Complex::Undefined() : node()->approximate(U(), context, angleUnit); + return node()->approximate(U(), context, angleUnit); } Expression Expression::defaultReplaceSymbolWithExpression(char symbol, Expression expression) { @@ -310,7 +310,7 @@ Expression Expression::setSign(ExpressionNode::Sign s, Context & context, Prefer template Expression Expression::approximate(Context& context, Preferences::AngleUnit angleUnit, Preferences::ComplexFormat complexFormat) const { - return approximateToEvaluation(context, angleUnit).complexToExpression(complexFormat); + return isUninitialized() ? Complex::Undefined() : approximateToEvaluation(context, angleUnit).complexToExpression(complexFormat); }