From cf8dc3ded8dc7999c90cfc6840ad0b41be627034 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 29 May 2022 09:19:15 +0300 Subject: Autocommit at 29.05.2022 @ 09:19 --- src/Models/CellFormula.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/Models/CellFormula.cpp') diff --git a/src/Models/CellFormula.cpp b/src/Models/CellFormula.cpp index 6090fd6..99938ff 100644 --- a/src/Models/CellFormula.cpp +++ b/src/Models/CellFormula.cpp @@ -23,10 +23,10 @@ double CellFormula::calculate(unsigned index) { } switch(formula[index].right) { - case '+' : return lval + calculate(index++); - case '-' : return lval - calculate(index++); - case '*' : return lval * calculate(index++); - case '/' : return lval / calculate(index++); + case '+' : return lval + calculate(++index); + case '-' : return lval - calculate(++index); + case '*' : return lval * calculate(++index); + case '/' : return lval / calculate(++index); case '^' : case '\0' : default : return lval; @@ -45,9 +45,6 @@ double CellFormula::getNumeralValue() { } String CellFormula::getValueForPrint() { - for (unsigned i = 0; i < formula.get_count(); i++) - std::cout << "[" << formula[i].left->getValueForPrint() << " " << (int)formula[i].right << std::endl; - return 90; return String() += calculate(); } -- cgit v1.3.1-23-gd82d