jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-08-10 03:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6502 from laurentdong/ExpressionBugFix

Browse Source 
Expression evaluation got exception
This commit is contained in:
Theo Arends 2019-09-28 10:16:43 +02:00 committed by GitHub
commit 42fe7e275b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sonoff/xdrv_10_rules.ino
View File

@ -97,7 +97,7 @@ const char kCompareOperators[] PROGMEM = "=\0>\0<\0|\0==!=>=<=";
#ifdef USE_EXPRESSION #ifdef USE_EXPRESSION
#include <LinkedList.h> // Import LinkedList library #include <LinkedList.h> // Import LinkedList library
const char kExpressionOperators[] PROGMEM = "+-*/%^"; const char kExpressionOperators[] PROGMEM = "+-*/%^\0";
#define EXPRESSION_OPERATOR_ADD 0 #define EXPRESSION_OPERATOR_ADD 0
#define EXPRESSION_OPERATOR_SUBTRACT 1 #define EXPRESSION_OPERATOR_SUBTRACT 1
#define EXPRESSION_OPERATOR_MULTIPLY 2 #define EXPRESSION_OPERATOR_MULTIPLY 2
@ -1062,10 +1062,16 @@ bool findNextOperator(char * &pointer, int8_t &op)
pointer++; pointer++;
continue; continue;
} }
if (char *pch = strchr(kExpressionOperators, *pointer)) { //If it is an operator op = EXPRESSION_OPERATOR_ADD;
op = (int8_t)(pch - kExpressionOperators); const char *pch = kExpressionOperators;
pointer++; char ch;
bSucceed = true; while ((ch = pgm_read_byte(pch++)) != '\0') {
if (ch == *pointer) {
bSucceed = true;
pointer++;
break;
}
op++;
} }
break; break;
} }
@ -1173,7 +1179,7 @@ float evaluateExpression(const char * expression, unsigned int len)
for (int32_t priority = MAX_EXPRESSION_OPERATOR_PRIORITY; priority>0; priority--) { for (int32_t priority = MAX_EXPRESSION_OPERATOR_PRIORITY; priority>0; priority--) {
int index = 0; int index = 0;
while (index < operators.size()) { while (index < operators.size()) {
if (priority == kExpressionOperatorsPriorities[(operators.get(index))]) { //need to calculate the operator first if (priority == pgm_read_byte(kExpressionOperatorsPriorities + operators.get(index))) { //need to calculate the operator first
//get current object value and remove the next object with current operator //get current object value and remove the next object with current operator
va = calculateTwoValues(object_values.get(index), object_values.remove(index + 1), operators.remove(index)); va = calculateTwoValues(object_values.get(index), object_values.remove(index + 1), operators.remove(index));
//Replace the current value with the result //Replace the current value with the result