From a78a362ba64bc82048a30725dd8126e7f598cb3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 9 Aug 2018 16:15:24 +0200 Subject: [PATCH] [poincare] Fix expression --- poincare/include/poincare/expression.h | 6 +++--- poincare/src/expression_node.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/poincare/include/poincare/expression.h b/poincare/include/poincare/expression.h index 96c1b826e..dfbab425e 100644 --- a/poincare/include/poincare/expression.h +++ b/poincare/include/poincare/expression.h @@ -53,7 +53,7 @@ public: /* Properties */ ExpressionNode::Type type() const { return node()->type(); } ExpressionNode::Sign sign() const { return node()->sign(); } - Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const { node()->setSign(s, context, angleUnit); } + Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const { return node()->setSign(s, context, angleUnit); } bool isUndefinedOrAllocationFailure() const { return node()->type() == ExpressionNode::Type::Undefined || node()->type() == ExpressionNode::Type::AllocationFailure; } bool isNumber() const { return node()->isNumber(); } bool isRationalZero() const; @@ -139,9 +139,9 @@ private: int getPolynomialCoefficients(char symbolName, Expression coefficients[]) const { return node()->getPolynomialCoefficients(symbolName, coefficients); } /* Simplification */ - Expression shallowReduce(Context & context, Preferences::AngleUnit angleUnit) const { node()->shallowReduce(context, angleUnit); } + Expression shallowReduce(Context & context, Preferences::AngleUnit angleUnit) const { return node()->shallowReduce(context, angleUnit); } Expression deepReduce(Context & context, Preferences::AngleUnit angleUnit) const; - Expression shallowBeautify(Context & context, Preferences::AngleUnit angleUnit) const { node()->shallowBeautify(context, angleUnit); } + Expression shallowBeautify(Context & context, Preferences::AngleUnit angleUnit) const { return node()->shallowBeautify(context, angleUnit); } Expression deepBeautify(Context & context, Preferences::AngleUnit angleUnit) const; /* Approximation */ diff --git a/poincare/src/expression_node.cpp b/poincare/src/expression_node.cpp index 6673ca64c..27619d6b8 100644 --- a/poincare/src/expression_node.cpp +++ b/poincare/src/expression_node.cpp @@ -5,7 +5,7 @@ namespace Poincare { Expression ExpressionNode::replaceSymbolWithExpression(char symbol, Expression expression) const { - Expression(this).privateReplaceSymbolWithExpression(symbol, expression); + return Expression(this).privateReplaceSymbolWithExpression(symbol, expression); } Expression ExpressionNode::setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const {