From e8f80d969c9280fbb13a9f8a62391e9f211f7786 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 29 May 2022 14:35:08 +0300 Subject: Autocommit at 29.05.2022 @ 14:35 --- src/Models/CellFormula.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/Models/CellFormula.cpp') diff --git a/src/Models/CellFormula.cpp b/src/Models/CellFormula.cpp index b85d790..6aaeefd 100644 --- a/src/Models/CellFormula.cpp +++ b/src/Models/CellFormula.cpp @@ -17,7 +17,6 @@ double CellFormula::calculate(unsigned index) { while (formula[index].right < 0) { switch (-formula[index++].right) { case '+' : lval += formula[index].left->getNumeralValue(); break; - case '-' : lval -= formula[index].left->getNumeralValue(); break; case '*' : lval *= formula[index].left->getNumeralValue(); break; case '/' : lval /= formula[index].left->getNumeralValue(); break; case '^' : lval = pow(lval, formula[index].left->getNumeralValue()); break; @@ -26,7 +25,6 @@ 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 pow(lval, calculate(++index)); @@ -89,7 +87,7 @@ void CellFormula::parseAndSetValue(const char* str) { if (currOp == '-') { formula.add({cellToAdd, '+'}); localCells.add(CellDouble(-1.0)); - formula.add({&localCells[localCells.get_count() - 1], '*'}); + formula.add({&localCells[localCells.get_count() - 1], '*' * -1}); } else formula.add({cellToAdd, currOp}); } -- cgit v1.3.1-23-gd82d