andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 08:19:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

allow multiple instances of "?:" in a schedule

Browse Source
This commit is contained in:
MichaelDvP
2024-06-27 08:28:38 +02:00
parent a46b9c60dd
commit 266a7a4e9b
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/web/shuntingYard.hpp
View File

@@ -558,16 +558,33 @@ std::string calculate(const std::string & expr) {
} }
return stack.back(); return stack.back();
} }
// check for <expr> ? <expr1> : <expr2>
// check for multiple instances of <cond> ? <expr1> : <expr2>
std::string compute(const std::string & expr) { std::string compute(const std::string & expr) {
auto q = expr.find_first_of("?"); auto expr_new = expr;
auto p = expr.find_first_of(":", q); // positions: q-questionmark, c-colon
if (p != std::string::npos && q != std::string::npos) { auto q = expr_new.find_first_of("?");
if (calculate(expr.substr(0, q))[0] == '1') { while (q != std::string::npos) {
return calculate(expr.substr(q + 1, p - q - 1)); // find corresponding colon
auto c1 = expr_new.find_first_of(":", q + 1);
auto q1 = expr_new.find_first_of("?", q + 1);
while (q1 < c1 && q1 != std::string::npos && c1 != std::string::npos) {
q1 = expr_new.find_first_of("?", q1 + 1);
c1 = expr_new.find_first_of(":", c1 + 1);
}
if (c1 == std::string::npos) {
return ""; // error: missing colon
}
std::string cond = calculate(expr_new.substr(0, q));
if (cond[0] == '1') {
expr_new.erase(c1); // remove second expression after colon
expr_new.erase(0, q + 1); // remove condition before questionmark
} else if (cond[0] == '0') {
expr_new.erase(0, c1 + 1); // remove condition and first expression
} else { } else {
return calculate(expr.substr(p + 1)); return ""; // error
} }
q = expr_new.find_first_of("?"); // search next instance
} }
return calculate(expr); return calculate(expr_new);
} }