Website Summary Files Commits Branches @commit @diff @stats
path: root / src / Models / CellFormula.cpp
diff options
context:
space:
mode:
Commit72577fbf92c626d8f9cfb123a3e8301d108a63d6 (patch)
Author
 Syndamia <kamen@syndamia.com>
2022-05-29 13:44:54 +0300
Committer
 Syndamia <kamen@syndamia.com>
2022-05-29 13:44:54 +0300
Files64d74c8fe10cbcf50e62de195ed36ca92648c302 /src/Models/CellFormula.cpp
FMI-OOP-P2_Tables-72577fbf92c626d8f9cfb123a3e8301d108a63d6.tar
FMI-OOP-P2_Tables-72577fbf92c626d8f9cfb123a3e8301d108a63d6.tar.gz
FMI-OOP-P2_Tables-72577fbf92c626d8f9cfb123a3e8301d108a63d6.zip
Parent5c142c6d6eea8a1d1847a5fe774be4741a7ee0f3 (diff)
Autocommit at 29.05.2022 @ 13:44
1 files changed, 2 insertions, 2 deletions
-rw-r--r--src/Models/CellFormula.cpp4
diff --git a/src/Models/CellFormula.cpp b/src/Models/CellFormula.cpp
index fda6ed2..439b21f 100644
--- a/src/Models/CellFormula.cpp
+++ b/src/Models/CellFormula.cpp
@@ -80,11 +80,11 @@ void CellFormula::parseAndSetValue(const char* str) {
currOp = *str;
}
- if (currOp == '^') currOp *= -1;
- else if ((currOp == '+' || currOp == '-') && formula.get_count() != 0) {
+ if ((currOp == '+' || currOp == '-') && formula.get_count() != 0) {
Pair<Cell*, char>& prev = formula[formula.get_count() - 1];
if (prev.right == '*' || prev.right == '/') prev.right *= -1;
}
+ if (currOp == '^' || currOp == '-') currOp *= -1;
formula.add({cellToAdd, currOp});
}