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

Format with clang

Browse Source
This commit is contained in:
wingphil
2025-03-07 17:08:05 +00:00
parent 9874ecde82
commit a6f77250b5
3 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/shuntingYard.hpp
View File

@@ -627,15 +627,18 @@ std::string calculate(const std::string & expr) {
}
void skipBrackets(const std::string & expr, size_t & pos, const int direction) {
int i = pos;
int i = pos;
char open = '(', close = ')';
if (direction == -1) {
open = ')'; close = '(';
open = ')';
close = '(';
}
size_t depth = 1;
while ((i >= 0) && (i < expr.size()) && depth > 0) {
if (expr[i] == open) depth++;
if (expr[i] == close) depth--;
if (expr[i] == open)
depth++;
if (expr[i] == close)
depth--;
i += direction;
}
if (depth > 0) {
@@ -644,7 +647,6 @@ void skipBrackets(const std::string & expr, size_t & pos, const int direction) {
} else {
pos = i - direction * 2;
}
}
// check for multiple instances of <cond> ? <expr1> : <expr2>
@@ -726,7 +728,7 @@ std::string compute(const std::string & expr) {
if (cond.length() == 0) {
return "";
} else if (cond[0] == '1') {
expr_new.erase(c, e + 1 - c); // remove second expression after colon
expr_new.erase(c, e + 1 - c); // remove second expression after colon
expr_new.erase(s, q + 1 - s); // remove condition before questionmark
} else if (cond[0] == '0') {
expr_new.erase(s, c + 1 - s); // remove condition and first expression