From 64d959af1090f5d7101c3c78153106871db7e902 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 28 May 2022 19:04:40 +0300 Subject: Autocommit at 28.05.2022 @ 19:04 --- src/Models/CellFormula.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/Models/CellFormula.cpp') diff --git a/src/Models/CellFormula.cpp b/src/Models/CellFormula.cpp index be50ef7..09883c2 100644 --- a/src/Models/CellFormula.cpp +++ b/src/Models/CellFormula.cpp @@ -9,6 +9,12 @@ CellFormula::CellFormula(const char* str) : referencedCells(), formula(), rawFor double CellFormula::calculate(unsigned index) { double lval = formula[index].left->getNumeralValue(); + if (formula[index].right & branch) { + switch (formula[index++].right & !branch) { + case plus: lval += formula[index].left->getNumeralValue(); break; + } + } + switch(formula[index].right) { case plus: return lval + calculate(index++); case minus: return lval - calculate(index++); -- cgit v1.3.1-23-gd82d