[poincare] Change call to Expression::shallowReduce to

Expression::defaultShallowReduce to avoid infinite loop

poincare/src/absolute_value.cpp

@@ -28,7 +28,7 @@ LayoutRef AbsoluteValue::createLayout(Preferences::PrintFloatMode floatDisplayMo
 }
 
 Expression AbsoluteValue::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/arc_cosine.cpp

@@ -18,7 +18,7 @@ Expression * ArcCosine::clone() const {
 }
 
 Expression ArcCosine::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/arc_sine.cpp

@@ -18,7 +18,7 @@ Expression * ArcSine::clone() const {
 }
 
 Expression ArcSine::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/arc_tangent.cpp

@@ -18,7 +18,7 @@ Expression * ArcTangent::clone() const {
 }
 
 Expression ArcTangent::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/binomial_coefficient.cpp

@@ -21,7 +21,7 @@ Expression * BinomialCoefficient::clone() const {
 }
 
 Expression BinomialCoefficient::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/ceiling.cpp

@@ -21,7 +21,7 @@ Expression * Ceiling::clone() const {
 }
 
 Expression Ceiling::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/complex_argument.cpp

@@ -17,7 +17,7 @@ Expression * ComplexArgument::clone() const {
 }
 
 Expression ComplexArgument::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/confidence_interval.cpp

@@ -25,7 +25,7 @@ int ConfidenceInterval::polynomialDegree(char symbolName) const {
 }
 
 Expression ConfidenceInterval::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/conjugate.cpp

@@ -20,7 +20,7 @@ LayoutRef Conjugate::createLayout(Preferences::PrintFloatMode floatDisplayMode,
 }
 
 Expression Conjugate::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/cosine.cpp

@@ -33,7 +33,7 @@ std::complex<T> Cosine::computeOnComplex(const std::complex<T> c, Preferences::A
 }
 
 Expression Cosine::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/decimal.cpp

@@ -274,7 +274,7 @@ Decimal::Decimal(size_t size, Integer m, int e) : Number(TreePool::sharedPool()-
 }
 
 Expression Decimal::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) const {
-  Expression e = Expression::shallowReduce(context, angleUnit);
+  Expression e = Expression::defaultShallowReduce(context, angleUnit);
   if (e.isUndefinedOrAllocationFailure()) {
     return e;
   }

poincare/src/derivative.cpp

@@ -30,7 +30,7 @@ int Derivative::polynomialDegree(char symbolName) const {
 }
 
 Expression Derivative::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/determinant.cpp

@@ -17,7 +17,7 @@ Expression * Determinant::clone() const {
 }
 
 Expression Determinant::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/division.cpp

@@ -65,7 +65,7 @@ template<typename T> MatrixComplex<T> DivisionNode::computeOnMatrices(const Matr
 // Division
 
 Expression Division::shallowReduce(Context & context, Preferences::AngleUnit angleUnit) const {
-  Expression result = Expression::shallowReduce(context, angleUnit);
+  Expression result = Expression::defaultShallowReduce(context, angleUnit);
   if (result.isUndefinedOrAllocationFailure()) {
     return result;
   }

poincare/src/division_quotient.cpp

@@ -19,7 +19,7 @@ Expression * DivisionQuotient::clone() const {
 }
 
 Expression DivisionQuotient::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/division_remainder.cpp

@@ -19,7 +19,7 @@ Expression * DivisionRemainder::clone() const {
 }
 
 Expression DivisionRemainder::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/equal.cpp

@@ -39,7 +39,7 @@ Expression * Equal::standardEquation(Context & context, Preferences::AngleUnit a
 }
 
 Expression Equal::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/factorial.cpp

@@ -37,7 +37,7 @@ bool Factorial::needsParenthesesWithParent(const SerializationHelperInterface *
 /* Simplification */
 
 Expression Factorial::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/floor.cpp

@@ -21,7 +21,7 @@ Expression * Floor::clone() const {
 }
 
 Expression Floor::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/frac_part.cpp

@@ -18,7 +18,7 @@ Expression * FracPart::clone() const {
 }
 
 Expression FracPart::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/great_common_divisor.cpp

@@ -20,7 +20,7 @@ Expression * GreatCommonDivisor::clone() const {
 }
 
 Expression GreatCommonDivisor::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/hyperbolic_arc_cosine.cpp

@@ -18,7 +18,7 @@ Expression * HyperbolicArcCosine::clone() const {
 }
 
 Expression HyperbolicArcCosine::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/hyperbolic_arc_sine.cpp

@@ -18,7 +18,7 @@ Expression * HyperbolicArcSine::clone() const {
 }
 
 Expression HyperbolicArcSine::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/hyperbolic_arc_tangent.cpp

@@ -18,7 +18,7 @@ Expression * HyperbolicArcTangent::clone() const {
 }
 
 Expression HyperbolicArcTangent::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/hyperbolic_cosine.cpp

@@ -22,7 +22,7 @@ Expression * HyperbolicCosine::clone() const {
 }
 
 Expression HyperbolicCosine::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/hyperbolic_sine.cpp

@@ -22,7 +22,7 @@ Expression * HyperbolicSine::clone() const {
 }
 
 Expression HyperbolicSine::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/hyperbolic_tangent.cpp

@@ -21,7 +21,7 @@ Expression * HyperbolicTangent::clone() const {
 }
 
 Expression HyperbolicTangent::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/imaginary_part.cpp

@@ -19,7 +19,7 @@ Expression * ImaginaryPart::clone() const {
 
 
 Expression ImaginaryPart::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/integral.cpp

@@ -32,7 +32,7 @@ int Integral::polynomialDegree(char symbolName) const {
 }
 
 Expression Integral::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/least_common_multiple.cpp

@@ -20,7 +20,7 @@ Expression * LeastCommonMultiple::clone() const {
 }
 
 Expression LeastCommonMultiple::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/logarithm.cpp

@@ -60,7 +60,7 @@ Expression * Logarithm::simpleShallowReduce(Context & context, Preferences::Angl
 }
 
 Expression Logarithm::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/matrix_dimension.cpp

@@ -17,7 +17,7 @@ Expression * MatrixDimension::clone() const {
 }
 
 Expression MatrixDimension::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/matrix_inverse.cpp

@@ -20,7 +20,7 @@ Expression * MatrixInverse::clone() const {
 }
 
 Expression MatrixInverse::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/matrix_trace.cpp

@@ -19,7 +19,7 @@ Expression * MatrixTrace::clone() const {
 }
 
 Expression MatrixTrace::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/matrix_transpose.cpp

@@ -18,7 +18,7 @@ Expression * MatrixTranspose::clone() const {
 }
 
 Expression MatrixTranspose::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/multiplication.cpp

@@ -190,10 +190,10 @@ Expression Multiplication::shallowReduce(Context& context, Preferences::AngleUni
 }
 
 Expression Multiplication::privateShallowReduce(Context & context, Preferences::AngleUnit angleUnit, bool shouldExpand, bool canBeInterrupted) const {
-  return Expression::shallowReduce(context, angleUnit);;
+  return Expression::defaultShallowReduce(context, angleUnit);;
   //TODO
 #if 0
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/naperian_logarithm.cpp

@@ -21,7 +21,7 @@ Expression * NaperianLogarithm::clone() const {
 }
 
 Expression NaperianLogarithm::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/nth_root.cpp

@@ -20,7 +20,7 @@ Expression * NthRoot::clone() const {
 }
 
 Expression NthRoot::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/opposite.cpp

@@ -69,8 +69,8 @@ Expression OppositeNode::shallowReduce(Context& context, Preferences::AngleUnit
 
 /* Simplification */
 
-Expression Opposite::shallowReduce(Context & context, Preferences::AngleUnit angleUnit) {
-  Expression result = Expression::shallowReduce(context, angleUnit);
+Expression Opposite::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
+  Expression result = Expression::defaultShallowReduce(context, angleUnit);
   if (result.isUndefinedOrAllocationFailure()) {
     return result;
   }

poincare/src/parenthesis.cpp

@@ -32,7 +32,7 @@ Evaluation<T> ParenthesisNode::templatedApproximate(Context& context, Preference
 }
 
 Expression Parenthesis::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) const {
-  Expression e = Expression::shallowReduce(context, angleUnit);
+  Expression e = Expression::defaultShallowReduce(context, angleUnit);
   if (e.isUndefinedOrAllocationFailure()) {
     return e;
   }

poincare/src/permute_coefficient.cpp

@@ -19,7 +19,7 @@ Expression * PermuteCoefficient::clone() const {
 }
 
 Expression PermuteCoefficient::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/power.cpp

@@ -254,7 +254,7 @@ Expression Power::shallowReduce(Context& context, Preferences::AngleUnit angleUn
   return result;
   //TODO
 #if 0
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/prediction_interval.cpp

@@ -26,7 +26,7 @@ int PredictionInterval::polynomialDegree(char symbolName) const {
 }
 
 Expression PredictionInterval::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/real_part.cpp

@@ -17,7 +17,7 @@ Expression * RealPart::clone() const {
 }
 
 Expression RealPart::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/round.cpp

@@ -20,7 +20,7 @@ Expression * Round::clone() const {
 }
 
 Expression Round::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/sine.cpp

@@ -33,7 +33,7 @@ std::complex<T> Sine::computeOnComplex(const std::complex<T> c, Preferences::Ang
 }
 
 Expression Sine::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/square_root.cpp

@@ -37,7 +37,7 @@ std::complex<T> SquareRoot::computeOnComplex(const std::complex<T> c, Preference
 }
 
 Expression SquareRoot::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }

poincare/src/subtraction.cpp

@@ -58,7 +58,7 @@ Expression SubtractionNode::shallowReduce(Context& context, Preferences::AngleUn
 }
 
 Expression Subtraction::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) const {
-  Expression e = Expression::shallowReduce(context, angleUnit);
+  Expression e = Expression::defaultShallowReduce(context, angleUnit);
   if (e.type() == ExpressionNode::Type::AllocationFailure || e.type() == ExpressionNode::Type::Undefined ) { //TODO use Expression method to make the ||
     return e;
   }

poincare/src/tangent.cpp

@@ -34,7 +34,7 @@ std::complex<T> Tangent::computeOnComplex(const std::complex<T> c, Preferences::
 }
 
 Expression Tangent::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) {
-  Expression * e = Expression::shallowReduce(context, angleUnit);
+  Expression * e = Expression::defaultShallowReduce(context, angleUnit);
   if (e != this) {
     return e;
   }