From d2cdb5796067925ef58cba9e38976792b26a2fc5 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 29 May 2022 13:09:42 +0300 Subject: Autocommit at 29.05.2022 @ 13:09 --- src/Generic/String/String.cpp | 19 +++++++++++++++++-- src/Generic/String/String.h | 2 ++ src/Models/Table.cpp | 5 +++-- 3 files changed, 22 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Generic/String/String.cpp b/src/Generic/String/String.cpp index d9cc235..ed096e8 100644 --- a/src/Generic/String/String.cpp +++ b/src/Generic/String/String.cpp @@ -59,6 +59,17 @@ String& String::operator+=(const char* str) { return *this; } +/*! + * Converts the number to a C-style string and then uses += to append it. + */ +String& String::operator+=(int number) { + if (number < 0) { + *this += "-"; + number *= -1; + } + return *this += (unsigned)number; +} + /*! * Converts the number to a C-style string and then uses += to append it. */ @@ -81,8 +92,12 @@ String& String::operator+=(unsigned number) { * Converts the number to a C-style string and then uses += to append it. */ String& String::operator+=(double number) { - if (number < 0) *this += "-"; - return ((*this += (unsigned)number) += ".") += (unsigned)((number - (unsigned)number) * DOUBLE_PRECISION); + if (number < 0) { + *this += "-"; + number *= -1; + } + return ((*this += (unsigned)number) += ".") + += (unsigned)((number - (unsigned)number) * DOUBLE_PRECISION); } String::String() : String("") {} diff --git a/src/Generic/String/String.h b/src/Generic/String/String.h index f30151a..c520bc9 100644 --- a/src/Generic/String/String.h +++ b/src/Generic/String/String.h @@ -32,6 +32,8 @@ public: //! Appends a C-style string String& operator+=(const char* str); //! Appends a number + String& operator+=(int number); + //! Appends a number String& operator+=(unsigned number); //! Appends a number String& operator+=(double number); diff --git a/src/Models/Table.cpp b/src/Models/Table.cpp index afb77b1..132559f 100644 --- a/src/Models/Table.cpp +++ b/src/Models/Table.cpp @@ -31,9 +31,10 @@ void Table::putCell(unsigned row, unsigned col, const char* rawValue) { if (containsNumber(rawValue)) { double doubleParse = atof(rawValue); + unsigned intPart = abs(doubleParse); - newCell = (abs(doubleParse) - (unsigned)(abs(doubleParse)) > 0.00001) - ? (Cell*)new CellDouble(doubleParse) : (Cell*)new CellInt(intParse); + newCell = (abs(doubleParse) - intPart > 0.00001) + ? (Cell*)new CellDouble(doubleParse) : (Cell*)new CellInt(intPart); } else { newCell = (*rawValue == '=') -- cgit v1.3.1-26-gb76a