From aa1f4a9f9ca83e51277486dbe640d985f215463f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Fri, 31 Aug 2018 10:37:57 +0200 Subject: [PATCH] [poincare] Expression(Node)::setSign is not const --- poincare/include/poincare/absolute_value.h | 4 ++-- poincare/include/poincare/decimal.h | 4 ++-- poincare/include/poincare/exception_expression_node.h | 2 +- poincare/include/poincare/expression.h | 2 +- poincare/include/poincare/float.h | 2 +- poincare/include/poincare/infinity.h | 2 +- poincare/include/poincare/integer.h | 4 ++-- poincare/include/poincare/multiplication.h | 4 ++-- poincare/include/poincare/power.h | 4 ++-- poincare/include/poincare/random.h | 4 ++-- poincare/include/poincare/rational.h | 4 ++-- poincare/include/poincare/undefined.h | 2 +- poincare/include/poincare/uninitialized_expression_node.h | 2 +- poincare/src/undefined.cpp | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/poincare/include/poincare/absolute_value.h b/poincare/include/poincare/absolute_value.h index 87c793bfd..ec15c0d90 100644 --- a/poincare/include/poincare/absolute_value.h +++ b/poincare/include/poincare/absolute_value.h @@ -25,7 +25,7 @@ public: // Properties Type type() const override { return Type::AbsoluteValue; } Sign sign() const override { return Sign::Positive; } - Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const override; + Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) override; // Approximation template static Complex computeOnComplex(const std::complex c, Preferences::AngleUnit angleUnit); @@ -56,7 +56,7 @@ public: } Expression shallowReduce(Context & context, Preferences::AngleUnit angleUnit) const; private: - Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const; + Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit); }; } diff --git a/poincare/include/poincare/decimal.h b/poincare/include/poincare/decimal.h index 09ff2e98c..dbc05bcb5 100644 --- a/poincare/include/poincare/decimal.h +++ b/poincare/include/poincare/decimal.h @@ -47,7 +47,7 @@ public: // Properties Type type() const override { return Type::Decimal; } Sign sign() const override { return m_negative ? Sign::Negative : Sign::Positive; } - Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const override; + Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) override; // Approximation Evaluation approximate(SinglePrecision p, Context& context, Preferences::AngleUnit angleUnit) const override { @@ -102,7 +102,7 @@ private: constexpr static int k_maxMantissaLength = 20; DecimalNode * node() const { return static_cast(Number::node()); } Decimal(size_t size, const Integer & m, int e); - Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const; + Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit); // Simplification Expression shallowReduce(Context& context, Preferences::AngleUnit angleUnit) const; Expression shallowBeautify(Context& context, Preferences::AngleUnit angleUnit) const; diff --git a/poincare/include/poincare/exception_expression_node.h b/poincare/include/poincare/exception_expression_node.h index dbd8275eb..127598373 100644 --- a/poincare/include/poincare/exception_expression_node.h +++ b/poincare/include/poincare/exception_expression_node.h @@ -15,7 +15,7 @@ public: // ExpressionNode void setChildrenInPlace(Expression other) override {} ExpressionNode::Sign sign() const override { return ExpressionNode::Sign::Unknown; } - Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const override { return Expression(this).clone(); } + Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) override { return Expression(this).clone(); } int polynomialDegree(char symbolName) const override { return -1; } Evaluation approximate(ExpressionNode::SinglePrecision p, Context& context, Preferences::AngleUnit angleUnit) const override { return Complex::Undefined(); } diff --git a/poincare/include/poincare/expression.h b/poincare/include/poincare/expression.h index eb8de3737..78cc9a49c 100644 --- a/poincare/include/poincare/expression.h +++ b/poincare/include/poincare/expression.h @@ -181,7 +181,7 @@ protected: Expression shallowBeautify(Context & context, Preferences::AngleUnit angleUnit) { return node()->shallowBeautify(context, angleUnit); } Expression deepBeautify(Context & context, Preferences::AngleUnit angleUnit); Expression deepReduce(Context & context, Preferences::AngleUnit angleUnit, const Expression futureParent = Expression()); - Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const { return node()->setSign(s, context, angleUnit); } + Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) { return node()->setSign(s, context, angleUnit); } private: /* Simplification */ Expression defaultShallowReduce(Context & context, Preferences::AngleUnit angleUnit); diff --git a/poincare/include/poincare/float.h b/poincare/include/poincare/float.h index 66e5b4399..602596682 100644 --- a/poincare/include/poincare/float.h +++ b/poincare/include/poincare/float.h @@ -42,7 +42,7 @@ public: // Properties Type type() const override { return Type::Float; } Sign sign() const override { return m_value < 0 ? Sign::Negative : Sign::Positive; } - Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const override; + Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) override; int simplificationOrderSameType(const ExpressionNode * e, bool canBeInterrupted) const override; // Layout diff --git a/poincare/include/poincare/infinity.h b/poincare/include/poincare/infinity.h index 3a8ffbf3f..5a947ff73 100644 --- a/poincare/include/poincare/infinity.h +++ b/poincare/include/poincare/infinity.h @@ -13,7 +13,7 @@ public: InfinityNode * failedAllocationStaticNode() override { return FailedAllocationStaticNode(); } void setNegative(bool negative) { m_negative = negative; } - Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const override; + Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) override; // TreeNode size_t size() const override { return sizeof(InfinityNode); } diff --git a/poincare/include/poincare/integer.h b/poincare/include/poincare/integer.h index 5c9fc79f7..7c92c2fc9 100644 --- a/poincare/include/poincare/integer.h +++ b/poincare/include/poincare/integer.h @@ -157,7 +157,7 @@ public: // ExpressionNode Sign sign() const override { return m_negative ? Sign::Negative : Sign::Positive; } - Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const override; + Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) override; void setNegative(bool negative); @@ -243,7 +243,7 @@ private: // Simplification Expression shallowReduce(Context & context, Preferences::AngleUnit angleUnit) const; - Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const; + Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit); }; struct IntegerDivision { diff --git a/poincare/include/poincare/multiplication.h b/poincare/include/poincare/multiplication.h index b1b40bd37..a87eb93b8 100644 --- a/poincare/include/poincare/multiplication.h +++ b/poincare/include/poincare/multiplication.h @@ -45,7 +45,7 @@ public: private: // Property - Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const override; + Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) override; // Layout bool needsParenthesesWithParent(const SerializationHelperInterface * parentNode) const override; @@ -87,7 +87,7 @@ public: } // Expression - Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const; + Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit); Expression shallowReduce(Context& context, Preferences::AngleUnit angleUnit) const; Expression shallowBeautify(Context& context, Preferences::AngleUnit angleUnit) const; int getPolynomialCoefficients(char symbolName, Expression coefficients[]) const; diff --git a/poincare/include/poincare/power.h b/poincare/include/poincare/power.h index f936bf267..ee916c14a 100644 --- a/poincare/include/poincare/power.h +++ b/poincare/include/poincare/power.h @@ -28,7 +28,7 @@ public: // Properties Type type() const override { return Type::Power; } Sign sign() const override; - Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const override; + Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) override; int polynomialDegree(char symbolName) const override; int getPolynomialCoefficients(char symbolName, Expression coefficients[]) const override; @@ -75,7 +75,7 @@ public: replaceChildAtIndexInPlace(1, exponent); } Power(const PowerNode * n) : Expression(n) {} - Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const; + Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit); int getPolynomialCoefficients(char symbolName, Expression coefficients[]) const; Expression shallowReduce(Context & context, Preferences::AngleUnit angleUnit) const; Expression shallowBeautify(Context & context, Preferences::AngleUnit angleUnit) const; diff --git a/poincare/include/poincare/random.h b/poincare/include/poincare/random.h index 4f5458e8e..6704c2098 100644 --- a/poincare/include/poincare/random.h +++ b/poincare/include/poincare/random.h @@ -26,7 +26,7 @@ public: // Properties Type type() const override { return Type::Random; } Sign sign() const override { return Sign::Positive; } - Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const override; + Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) override; private: // Layout LayoutReference createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override; @@ -52,7 +52,7 @@ public: template static T random(); private: - Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const; + Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit); }; } diff --git a/poincare/include/poincare/rational.h b/poincare/include/poincare/rational.h index 5c32f5561..ac5657d03 100644 --- a/poincare/include/poincare/rational.h +++ b/poincare/include/poincare/rational.h @@ -60,7 +60,7 @@ private: int simplificationOrderSameType(const ExpressionNode * e, bool canBeInterrupted) const override; Expression shallowReduce(Context & context, Preferences::AngleUnit angleUnit) const override; Expression shallowBeautify(Context & context, Preferences::AngleUnit angleUnit) const override; - Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const override; + Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) override; Expression denominator(Context & context, Preferences::AngleUnit angleUnit) const override; bool m_negative; size_t m_numberOfDigitsNumerator; @@ -123,7 +123,7 @@ private: /* Simplification */ Expression shallowBeautify(Context & context, Preferences::AngleUnit angleUnit) const; Expression denominator(Context & context, Preferences::AngleUnit angleUnit) const; - Expression setSign(ExpressionNode::Sign s) const; + Expression setSign(ExpressionNode::Sign s); }; } diff --git a/poincare/include/poincare/undefined.h b/poincare/include/poincare/undefined.h index 6860489a3..debf24bff 100644 --- a/poincare/include/poincare/undefined.h +++ b/poincare/include/poincare/undefined.h @@ -22,7 +22,7 @@ public: // Properties Type type() const override { return Type::Undefined; } int polynomialDegree(char symbolName) const override; - Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const override; + Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) override; // Approximation Evaluation approximate(SinglePrecision p, Context& context, Preferences::AngleUnit angleUnit) const override { diff --git a/poincare/include/poincare/uninitialized_expression_node.h b/poincare/include/poincare/uninitialized_expression_node.h index c8599c7a5..939964465 100644 --- a/poincare/include/poincare/uninitialized_expression_node.h +++ b/poincare/include/poincare/uninitialized_expression_node.h @@ -17,7 +17,7 @@ public: // ExpressionNode void setChildrenInPlace(Expression other) override { assert(false); return ExceptionExpressionNode::setChildrenInPlace(other); } ExpressionNode::Sign sign() const override { assert(false); return ExceptionExpressionNode::sign(); } - Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const override { assert(false); return ExceptionExpressionNode::setSign(s, context, angleUnit); } + Expression setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) override { assert(false); return ExceptionExpressionNode::setSign(s, context, angleUnit); } ExpressionNode::Type type() const override { assert(false); return ExpressionNode::Type::Uninitialized; } int serialize(char * buffer, int bufferSize, Preferences::PrintFloatMode floatDisplayMode = Preferences::PrintFloatMode::Decimal, int numberOfSignificantDigits = 0) const override { diff --git a/poincare/src/undefined.cpp b/poincare/src/undefined.cpp index c0e1de8dc..248406f11 100644 --- a/poincare/src/undefined.cpp +++ b/poincare/src/undefined.cpp @@ -19,7 +19,7 @@ int UndefinedNode::polynomialDegree(char symbolName) const { return -1; } -Expression UndefinedNode::setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const { +Expression UndefinedNode::setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) { return Undefined(); }