Website Summary Files Commits Branches @commit @diff @stats
path: root / src
diff options
context:
space:
mode:
2 files changed, 2 insertions, 1 deletions
-rw-r--r--src/Models/CellFormula.cpp2
-rw-r--r--src/main.cpp1
diff --git a/src/Models/CellFormula.cpp b/src/Models/CellFormula.cpp
index 98e1abb..fda6ed2 100644
--- a/src/Models/CellFormula.cpp
+++ b/src/Models/CellFormula.cpp
@@ -48,7 +48,7 @@ double CellFormula::getNumeralValue() {
String CellFormula::getValueForPrint() {
for (unsigned i = 0; i < formula.get_count(); i++)
- std::cout << "[" << formula[i].left->getNumeralValue() << " " << formula[i].right << std::endl;
+ std::cout << "[" << formula[i].left->getNumeralValue() << " " << ((formula[i].right < 0) ? (int)formula[i].right : (char)formula[i].right) << std::endl;
return String() += calculate();
}
diff --git a/src/main.cpp b/src/main.cpp
index c5bbbae..77d9421 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,6 +6,7 @@ int main() {
table.putCell(0, 1, "3");
table.putCell(0, 2, "String");
table.putCell(0, 3, "= 3 * R0C1 + R0C0 ^ R0C1 * 9 - 10 + 1");
+ // table.putCell(0, 3, "= 1 + 2 * 3 + 4 + 5");
UserInterface ui(&table);
ui.run();
}