From 256cf5203d4c3bb4bdecc0c84c7c680d95dfed65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Mon, 13 Aug 2018 16:54:40 +0200
Subject: [PATCH] [poincare] Fix various bugs

---
 poincare/include/poincare/integer.h | 12 ++++++++----
 poincare/src/integer.cpp            | 28 +++++++++++-----------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/poincare/include/poincare/integer.h b/poincare/include/poincare/integer.h
index cab24cd2e..e43c39683 100644
--- a/poincare/include/poincare/integer.h
+++ b/poincare/include/poincare/integer.h
@@ -139,10 +139,14 @@ public:
     stream << " numberOfDigits=\"" << m_numberOfDigits << "\"";
     stream << " negative=\"" << m_negative << "\"";
     stream << " digits=\"";
-    for (int i=0; i<m_numberOfDigits; i++) {
-      stream << m_digits[i];
-      if (i != (m_numberOfDigits-1)) {
-        stream << ",";
+    if (isInfinity()) {
+      stream << "nullptr";
+    } else {
+      for (int i=0; i<m_numberOfDigits; i++) {
+        stream << m_digits[i];
+        if (i != (m_numberOfDigits-1)) {
+          stream << ",";
+        }
       }
     }
     stream << "\"";
diff --git a/poincare/src/integer.cpp b/poincare/src/integer.cpp
index 56fe3b381..b2ce2d6fe 100644
--- a/poincare/src/integer.cpp
+++ b/poincare/src/integer.cpp
@@ -421,7 +421,7 @@ Expression IntegerNode::setSign(Sign s, Context & context, Preferences::AngleUni
 }
 
 void IntegerNode::setNegative(bool negative) {
-  if (numberOfDigits() > 0) { // Zero cannot be negative
+  if (numberOfDigits() == 0) { // Zero cannot be negative
     return;
   }
   m_negative = negative;
@@ -453,32 +453,26 @@ Integer::Integer(const native_uint_t * digits, size_t numberOfDigits, bool negat
 }
 
 Integer::Integer(const char * digits, size_t length, bool negative) :
-  Number(nullptr)
+  Integer(0)
 {
   if (digits != nullptr && digits[0] == '-') {
     negative = true;
     digits++;
     length--;
   }
-  native_uint_t buffer[IntegerNode::k_maxNumberOfDigits];
-  double_native_uint_t d = 0;
-  int size = 0;
+
+  //Integer result = Integer(0);
+
   if (digits != nullptr) {
-    for (size_t s = 0; s < length; s++) {
-      if (d*10+(*digits-'0') > 0xFFFFFFFF) {
-        buffer[size++] = d;
-        d = 0;
-      }
-      if (size >= NaturalIntegerAbstract::k_maxNumberOfDigits) {
-        *this = Overflow();
-        return;
-      }
-      d = 10*d+(*digits-'0');
+    Integer base(10);
+    for (size_t i = 0; i < length; i++) {
+      *this = Multiplication(*this, base);
+      *this = Addition(*this, Integer(*digits-'0'));
       digits++;
     }
   }
-  buffer[size++] = d;
-  new (this) Integer(buffer, size, negative);
+
+  setNegative(isZero() ? false : negative);
 }
 
 Integer::Integer(const NaturalIntegerAbstract * naturalInteger) :