From 7d5f9d0acac0ea02300fb579498d4ff85f38e403 Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Fri, 13 Sep 2019 15:51:19 +0200 Subject: [PATCH] [poincare] Factor asserts in Expression::replaceUnknown --- poincare/src/expression.cpp | 2 ++ poincare/src/parametered_expression.cpp | 3 --- poincare/src/symbol.cpp | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/poincare/src/expression.cpp b/poincare/src/expression.cpp index 126e95636..26e2bd85e 100644 --- a/poincare/src/expression.cpp +++ b/poincare/src/expression.cpp @@ -417,6 +417,8 @@ int Expression::getPolynomialReducedCoefficients(const char * symbolName, Expres } Expression Expression::replaceUnknown(const Symbol & symbol, const Symbol & unknownSymbol) { + assert(!symbol.isUninitialized()); + assert(symbol.type() == ExpressionNode::Type::Symbol); return node()->replaceUnknown(symbol, unknownSymbol); } diff --git a/poincare/src/parametered_expression.cpp b/poincare/src/parametered_expression.cpp index f87bcf3b3..9ad1c6b5d 100644 --- a/poincare/src/parametered_expression.cpp +++ b/poincare/src/parametered_expression.cpp @@ -10,9 +10,6 @@ Expression ParameteredExpressionNode::replaceUnknown(const Symbol & symbol, cons } Expression ParameteredExpression::replaceUnknown(const Symbol & symbolToReplace, const Symbol & unknownSymbol) { - assert(!symbolToReplace.isUninitialized()); - assert(symbolToReplace.type() == ExpressionNode::Type::Symbol); - Expression c = childAtIndex(ParameterChildIndex()); assert(c.type() == ExpressionNode::Type::Symbol); Symbol& parameterChild = static_cast(c); diff --git a/poincare/src/symbol.cpp b/poincare/src/symbol.cpp index 2b8569d0e..0eac5da07 100644 --- a/poincare/src/symbol.cpp +++ b/poincare/src/symbol.cpp @@ -210,8 +210,6 @@ Expression Symbol::replaceSymbolWithExpression(const SymbolAbstract & symbol, co } Expression Symbol::replaceUnknown(const Symbol & symbol, const Symbol & unknownSymbol) { - assert(!symbol.isUninitialized()); - assert(symbol.type() == ExpressionNode::Type::Symbol); assert(unknownSymbol.type() == ExpressionNode::Type::Symbol); return replaceSymbolWithExpression(symbol, unknownSymbol); }