From b4ea4d9dab39656d5b58702a4a87d4e97ae0ec50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Fri, 7 Sep 2018 16:27:22 +0200
Subject: [PATCH] [poincare] uninline methods in Evaluation and subclasses

---
 poincare/include/poincare/complex.h        | 2 +-
 poincare/include/poincare/evaluation.h     | 4 +---
 poincare/include/poincare/matrix_complex.h | 7 ++-----
 poincare/src/complex.cpp                   | 5 +++++
 poincare/src/evaluation.cpp                | 9 +++++++++
 poincare/src/matrix_complex.cpp            | 9 +++++++++
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/poincare/include/poincare/complex.h b/poincare/include/poincare/complex.h
index 0356b78de..414de4e8f 100644
--- a/poincare/include/poincare/complex.h
+++ b/poincare/include/poincare/complex.h
@@ -41,7 +41,7 @@ template<typename T>
 class Complex : public Evaluation<T> {
 public:
   Complex(ComplexNode<T> * n) : Evaluation<T>(n) {}
-  Complex(T a, T b = 0.0) : Complex(std::complex<T>(a, b)) {}
+  Complex(T a, T b = 0.0);
   Complex(std::complex<T> c);
   static Complex<T> Undefined() {
     return Complex<T>(NAN, NAN);
diff --git a/poincare/include/poincare/evaluation.h b/poincare/include/poincare/evaluation.h
index 85981c00a..bee05eed1 100644
--- a/poincare/include/poincare/evaluation.h
+++ b/poincare/include/poincare/evaluation.h
@@ -49,9 +49,7 @@ public:
   }
 
   /* Hierarchy */
-  Evaluation<T> childAtIndex(int i) const {
-    return Evaluation<T>(static_cast<EvaluationNode<T> *>(TreeByReference::childAtIndex(i).node()));
-  }
+  Evaluation<T> childAtIndex(int i) const;
   typename Poincare::EvaluationNode<T>::Type type() const { return node()->type(); }
   bool isUndefined() const { return node()->isUndefined(); }
   T toScalar() const { return node()->toScalar(); }
diff --git a/poincare/include/poincare/matrix_complex.h b/poincare/include/poincare/matrix_complex.h
index f3da6a383..2702bd175 100644
--- a/poincare/include/poincare/matrix_complex.h
+++ b/poincare/include/poincare/matrix_complex.h
@@ -56,12 +56,9 @@ class MatrixComplex : public Evaluation<T> {
   friend class MatrixComplexNode<T>;
 public:
   MatrixComplex(MatrixComplexNode<T> * node) : Evaluation<T>(node) {}
-  MatrixComplex() : Evaluation<T>(TreePool::sharedPool()->createTreeNode<MatrixComplexNode<T> >()) {}
+  MatrixComplex();
   MatrixComplex(std::complex<T> * operands, int numberOfRows, int numberOfColumns);
-  static MatrixComplex<T> Undefined() {
-    std::complex<T> undef = std::complex<T>(NAN, NAN);
-    return MatrixComplex<T>((std::complex<T> *)&undef, 1, 1);
-  }
+  static MatrixComplex<T> Undefined();
   static MatrixComplex<T> createIdentity(int dim);
   MatrixComplex<T> inverse() const { return node()->inverse(); }
   MatrixComplex<T> transpose() const { return node()->transpose(); }
diff --git a/poincare/src/complex.cpp b/poincare/src/complex.cpp
index 854b22ca1..f7330cf88 100644
--- a/poincare/src/complex.cpp
+++ b/poincare/src/complex.cpp
@@ -105,6 +105,9 @@ Expression ComplexNode<T>::complexToExpression(Preferences::ComplexFormat comple
   }
 }
 
+template <typename T>
+Complex<T>::Complex(T a, T b) : Complex(std::complex<T>(a, b)) {}
+
 template <typename T>
 Complex<T>::Complex(std::complex<T> c) :
   Evaluation<T>(TreePool::sharedPool()->createTreeNode<ComplexNode<T>>())
@@ -114,6 +117,8 @@ Complex<T>::Complex(std::complex<T> c) :
 
 template class ComplexNode<float>;
 template class ComplexNode<double>;
+template Complex<float>::Complex(float a, float b);
+template Complex<double>::Complex(double a, double b);
 template Complex<float>::Complex(std::complex<float> c);
 template Complex<double>::Complex(std::complex<double> c);
 
diff --git a/poincare/src/evaluation.cpp b/poincare/src/evaluation.cpp
index 6f5a5809b..b0be70e18 100644
--- a/poincare/src/evaluation.cpp
+++ b/poincare/src/evaluation.cpp
@@ -3,11 +3,20 @@
 
 namespace Poincare {
 
+template<typename T>
+Evaluation<T> Evaluation<T>::childAtIndex(int i) const {
+  TreeByReference c = TreeByReference::childAtIndex(i);
+  return static_cast<Evaluation<T> &>(c);
+}
+
 template<typename T>
 Expression Evaluation<T>::complexToExpression(Preferences::ComplexFormat complexFormat) const {
   return node()->complexToExpression(complexFormat);
 }
 
+template Evaluation<float> Evaluation<float>::childAtIndex(int i) const;
+template Evaluation<double> Evaluation<double>::childAtIndex(int i) const;
+
 template Expression Evaluation<float>::complexToExpression(Preferences::ComplexFormat) const;
 template Expression Evaluation<double>::complexToExpression(Preferences::ComplexFormat) const;
 
diff --git a/poincare/src/matrix_complex.cpp b/poincare/src/matrix_complex.cpp
index f31934ef0..46e55958b 100644
--- a/poincare/src/matrix_complex.cpp
+++ b/poincare/src/matrix_complex.cpp
@@ -128,6 +128,15 @@ MatrixComplex<T>::MatrixComplex(std::complex<T> * operands, int numberOfRows, in
   setDimensions(numberOfRows, numberOfColumns);
 }
 
+template<typename T>
+MatrixComplex<T>::MatrixComplex() : Evaluation<T>(TreePool::sharedPool()->createTreeNode<MatrixComplexNode<T> >()) {}
+
+template<typename T>
+MatrixComplex<T> MatrixComplex<T>::Undefined() {
+  std::complex<T> undef = std::complex<T>(NAN, NAN);
+  return MatrixComplex<T>((std::complex<T> *)&undef, 1, 1);
+}
+
 template<typename T>
 MatrixComplex<T> MatrixComplex<T>::createIdentity(int dim) {
   MatrixComplex<T> result;