Website Summary Files Commits Branches @commit @diff @stats
path: root / src / Models / CellFormula.cpp
diff options
context:
space:
mode:
Commit56bdda6704c7009e481667b0e15ea45cbaf986f4 (patch)
Author
 Syndamia <kamen@syndamia.com>
2022-05-29 13:59:59 +0300
Committer
 Syndamia <kamen@syndamia.com>
2022-05-29 13:59:59 +0300
Filesc26b47f3be4c15c3bab0d7569b10814cf59f59b3 /src/Models/CellFormula.cpp
FMI-OOP-P2_Tables-56bdda6704c7009e481667b0e15ea45cbaf986f4.tar
FMI-OOP-P2_Tables-56bdda6704c7009e481667b0e15ea45cbaf986f4.tar.gz
FMI-OOP-P2_Tables-56bdda6704c7009e481667b0e15ea45cbaf986f4.zip
Parent7c70489b77c9fd8e914838bd77a191b18fca57e2 (diff)
Autocommit at 29.05.2022 @ 13:59
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 4473b28..76c9150 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 == '-') && formula.get_count() != 0) {
+ if (currOp == '^') currOp *= -1;
+ else if ((currOp == '+' || currOp == '-') && formula.get_count() != 0) {
Pair<Cell*, char>& prev = formula[formula.get_count() - 1];
if (prev.right == '*' || prev.right == '/' || prev.right == '-') prev.right *= -1;
}
- if (currOp == '^') currOp *= -1;
formula.add({cellToAdd, currOp});
}