Autocommit at 29.05.2022 @ 09:19

2 files changed, 5 insertions, 8 deletions

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();
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index 082cf03..d716787 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,7 +4,7 @@ int main() {
 	Table table(5, 5);
 	table.putCell(0, 0, "8");
 	table.putCell(0, 1, "3");
-	table.putCell(0, 2, "= 9 * 10");
+	table.putCell(0, 2, "= 9 * 10 + R0C0 * R0C1");
 	UserInterface ui(&table);
 	ui.run();
 }