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

allow brackets in conditions (idea from philwingfield)

Browse Source
This commit is contained in:
MichaelDvP
2025-03-08 16:50:12 +01:00
parent 85c78bc8e9
commit 72feefe709
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/shuntingYard.hpp
View File

@@ -93,6 +93,9 @@ std::deque<Token> exprToTokens(const std::string & expr) {
} else if (strncmp(p, "pow", 3) == 0) { } else if (strncmp(p, "pow", 3) == 0) {
p += 2; p += 2;
tokens.emplace_back(Token::Type::Unary, "p", 5); tokens.emplace_back(Token::Type::Unary, "p", 5);
} else if (strncmp(p, "hex", 3) == 0) {
p += 2;
tokens.emplace_back(Token::Type::Unary, "h", 5);
} else if (*p >= 'a' && *p <= 'z') { } else if (*p >= 'a' && *p <= 'z') {
const auto * b = p; const auto * b = p;
while ((*p >= 'a' && *p <= 'z') || (*p == '_')) { while ((*p >= 'a' && *p <= 'z') || (*p == '_')) {
@@ -490,6 +493,9 @@ std::string calculate(const std::string & expr) {
case 'p': case 'p':
stack.push_back(to_string(std::pow(std::stod(rhs), 2))); stack.push_back(to_string(std::pow(std::stod(rhs), 2)));
break; break;
case 'h':
stack.push_back(to_string(std::stoi(rhs, 0, 16)));
break;
} }
} break; } break;
case Token::Type::Compare: { case Token::Type::Compare: {
@@ -694,14 +700,29 @@ std::string compute(const std::string & expr) {
if (c1 == std::string::npos) { if (c1 == std::string::npos) {
return ""; // error: missing colon return ""; // error: missing colon
} }
std::string cond = calculate(expr_new.substr(0, q)); auto s = q; // start search brackets
int br = 0; // count brackets
while (s > 0 && (br || expr_new[s - 1] != '(')) {
s--;
br += (expr_new[s] == '(' ? -1 : expr_new[s] == ')' ? 1 : 0);
}
std::string cond = calculate(expr_new.substr(s, q - s));
if (cond.length() == 0) { if (cond.length() == 0) {
return ""; return "";
} else if (cond[0] == '1') { } else if (cond[0] == '1') {
expr_new.erase(c1); // remove second expression after colon auto e = expr_new.length(); // end
expr_new.erase(0, q + 1); // remove condition before questionmark if (s) { // there was a opening bracket, find the closing one
e = c1;
br = 0;
while (e < expr_new.length() && (br || expr_new[e + 1] != ')')) {
e++;
br += (expr_new[e] == ')' ? -1 : expr_new[e] == '(' ? 1 : 0);
}
}
expr_new.erase(c1, e + 1 - c1); // remove second expression after colon
expr_new.erase(s, q + 1 - s); // remove condition before questionmark
} else if (cond[0] == '0') { } else if (cond[0] == '0') {
expr_new.erase(0, c1 + 1); // remove condition and first expression expr_new.erase(s, c1 + 1 - s); // remove condition and first expression
} else { } else {
return ""; // error return ""; // error
} }