iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Добавляем &(и) и |(или) в сценарии

Browse Source
This commit is contained in:
biver
2022-02-25 21:51:20 +03:00
parent 6a3f8542c5
commit c024ef6673
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/classes/IoTScenario.cpp
View File

@@ -153,6 +153,13 @@ public:
else val.valD = 3.4E+38; else val.valD = 3.4E+38;
break; break;
case '|':
val.valD = lhs->valD || rhs->valD;
break;
case '&':
val.valD = lhs->valD && rhs->valD;
break;
default: default:
break; break;
} }
@@ -652,17 +659,19 @@ public:
IoTScenario::IoTScenario() { IoTScenario::IoTScenario() {
// Задаём стандартные бинарные операторы. // Задаём стандартные бинарные операторы.
// 1 - наименьший приоритет. // 1 - наименьший приоритет.
BinopPrecedence['='] = 1; BinopPrecedence['='] = 1;
BinopPrecedence[tok_equal] = 3; // == BinopPrecedence['|'] = 5;
BinopPrecedence[tok_notequal] = 4; // != BinopPrecedence['&'] = 6;
BinopPrecedence[tok_lesseq] = 5; // <= BinopPrecedence[tok_equal] = 10; // ==
BinopPrecedence[tok_greateq] = 6; // >= BinopPrecedence[tok_notequal] = 11; // !=
BinopPrecedence['<'] = 10; BinopPrecedence[tok_lesseq] = 15; // <=
BinopPrecedence['>'] = 10; BinopPrecedence[tok_greateq] = 16; // >=
BinopPrecedence['+'] = 20; BinopPrecedence['<'] = 20;
BinopPrecedence['-'] = 20; BinopPrecedence['>'] = 21;
BinopPrecedence['/'] = 35; BinopPrecedence['+'] = 25;
BinopPrecedence['*'] = 40; // highest. BinopPrecedence['-'] = 26;
BinopPrecedence['/'] = 27;
BinopPrecedence['*'] = 28; // highest.
} }
IoTScenario::~IoTScenario() {} IoTScenario::~IoTScenario() {}