From d506bb4442763ef05e8702fff03069c2bbcdd5ca Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Fri, 13 Sep 2019 15:57:43 +0200
Subject: [PATCH] [poincare] Remove Expression::defaultReplaceUnknown

and substitute defaultReplaceSymbolWithExpression instead
---
 poincare/include/poincare/expression.h  | 3 +--
 poincare/src/expression.cpp             | 8 --------
 poincare/src/expression_node.cpp        | 2 +-
 poincare/src/parametered_expression.cpp | 2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/poincare/include/poincare/expression.h b/poincare/include/poincare/expression.h
index 068637444..617ffa7bd 100644
--- a/poincare/include/poincare/expression.h
+++ b/poincare/include/poincare/expression.h
@@ -190,7 +190,6 @@ public:
   int getPolynomialReducedCoefficients(const char * symbolName, Expression coefficients[], Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit) const;
   Expression replaceSymbolWithExpression(const SymbolAbstract & symbol, const Expression & expression) { return node()->replaceSymbolWithExpression(symbol, expression); }
   Expression replaceUnknown(const Symbol & symbol, const Symbol & unknownSymbol);
-  Expression defaultReplaceUnknown(const Symbol & symbol, const Symbol & unknownSymbol);
 
   /* Complex */
   static bool EncounteredComplex();
@@ -327,6 +326,7 @@ protected:
 
   /* Properties */
   int getPolynomialCoefficients(Context * context, const char * symbolName, Expression coefficients[]) const { return node()->getPolynomialCoefficients(context, symbolName, coefficients); }
+  Expression defaultReplaceSymbolWithExpression(const SymbolAbstract & symbol, const Expression expression);
   bool hasReplaceableSymbols(Context * context) const;
   Expression shallowReplaceReplaceableSymbols(Context * context) { return node()->shallowReplaceReplaceableSymbols(context); }
   Expression defaultReplaceReplaceableSymbols(Context * context);
@@ -381,7 +381,6 @@ private:
   template<typename U> Evaluation<U> approximateToEvaluation(Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit) const;
 
   /* Properties */
-  Expression defaultReplaceSymbolWithExpression(const SymbolAbstract & symbol, const Expression expression);
   int defaultGetPolynomialCoefficients(Context * context, const char * symbol, Expression expression[]) const;
 
   /* Builder */
diff --git a/poincare/src/expression.cpp b/poincare/src/expression.cpp
index 26e2bd85e..08d4a2ff5 100644
--- a/poincare/src/expression.cpp
+++ b/poincare/src/expression.cpp
@@ -422,14 +422,6 @@ Expression Expression::replaceUnknown(const Symbol & symbol, const Symbol & unkn
   return node()->replaceUnknown(symbol, unknownSymbol);
 }
 
-Expression Expression::defaultReplaceUnknown(const Symbol & symbol, const Symbol & unknownSymbol) {
-  const int childrenCount = numberOfChildren();
-  for (int i = 0; i < childrenCount; i++) {
-    childAtIndex(i).replaceUnknown(symbol, unknownSymbol);
-  }
-  return *this;
-}
-
 /* Complex */
 
 bool Expression::EncounteredComplex() {
diff --git a/poincare/src/expression_node.cpp b/poincare/src/expression_node.cpp
index ecb0320ea..40638dfb6 100644
--- a/poincare/src/expression_node.cpp
+++ b/poincare/src/expression_node.cpp
@@ -19,7 +19,7 @@ Expression ExpressionNode::replaceSymbolWithExpression(const SymbolAbstract & sy
 }
 
 Expression ExpressionNode::replaceUnknown(const Symbol & symbol, const Symbol & unknownSymbol) {
-  return Expression(this).defaultReplaceUnknown(symbol, unknownSymbol);
+  return Expression(this).defaultReplaceSymbolWithExpression(symbol, unknownSymbol);
 }
 
 Expression ExpressionNode::setSign(Sign s, ReductionContext reductionContext) {
diff --git a/poincare/src/parametered_expression.cpp b/poincare/src/parametered_expression.cpp
index 9ad1c6b5d..5d533b39f 100644
--- a/poincare/src/parametered_expression.cpp
+++ b/poincare/src/parametered_expression.cpp
@@ -15,7 +15,7 @@ Expression ParameteredExpression::replaceUnknown(const Symbol & symbolToReplace,
   Symbol& parameterChild = static_cast<Symbol &>(c);
   if (strcmp(parameterChild.name(), symbolToReplace.name()) != 0) {
     // If the unknown is not the parameter, replace normally
-    return defaultReplaceUnknown(symbolToReplace, unknownSymbol);
+    return defaultReplaceSymbolWithExpression(symbolToReplace, unknownSymbol);
   }
 
   /* If the unknown is the parameter, replace the unknown in all children except