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

Добавляем возможность использования вложенных IF

Browse Source
This commit is contained in:
biver
2022-03-03 22:58:39 +03:00
parent 3704988d9b
commit 1ac32e6711
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/classes/IoTScenario.cpp
View File

@@ -260,8 +260,14 @@ class IfExprAST : public ExprAST {
String _IDNames; String _IDNames;
public: public:
IfExprAST(ExprAST *cond, ExprAST *then, ExprAST *_else, String IDNames) IfExprAST(ExprAST *cond, ExprAST *then, ExprAST *_else, String *IDNames)
: Cond(cond), Then(then), Else(_else), _IDNames(IDNames) {} : Cond(cond), Then(then), Else(_else) {
if (IDNames) {
_IDNames = *IDNames;
//Serial.printf("eeeeeeeeeeeeee %s\n", _IDNames.c_str());
} else _IDNames = "";
Serial.printf("eeeeeeeeeeeeee\n");
}
bool hasEventIdName(String eventIdName) { bool hasEventIdName(String eventIdName) {
Serial.printf("Call from BinaryExprAST _IDNames:%s\n", _IDNames.c_str()); Serial.printf("Call from BinaryExprAST _IDNames:%s\n", _IDNames.c_str());
@@ -579,7 +585,7 @@ public:
getNextToken(); // Получаем then getNextToken(); // Получаем then
ExprAST *Then = ParseExpression(nullptr); ExprAST *Then = ParseExpression(nullptr);
if (Then == 0) return 0; if (!Then) return 0;
//if (CurTok != tok_else) //if (CurTok != tok_else)
// return Error("expected else"); // return Error("expected else");
@@ -589,7 +595,7 @@ public:
Else = ParseExpression(nullptr); Else = ParseExpression(nullptr);
} }
return new IfExprAST(Cond, Then, Else, *IDNames); return new IfExprAST(Cond, Then, Else, IDNames);
} }
/// primary /// primary
@@ -646,7 +652,7 @@ public:
LHS = new BinaryExprAST(BinOp, LHS, RHS); LHS = new BinaryExprAST(BinOp, LHS, RHS);
} }
} }
/// expression /// expression
/// ::= primary binoprhs /// ::= primary binoprhs
@@ -682,7 +688,8 @@ public:
//case ';': getNextToken(); break; // игнорируем верхнеуровневые точки с запятой. //case ';': getNextToken(); break; // игнорируем верхнеуровневые точки с запятой.
case tok_if: { case tok_if: {
String IDNames = ""; // накопитель встречающихся идентификаторов в условии String IDNames = ""; // накопитель встречающихся идентификаторов в условии
ScenarioElements.push_back(ParseExpression(&IDNames)); ScenarioElements.push_back(ParseIfExpr(&IDNames));
Serial.printf("vvvvvvvvvvvvvvvv %s", IDNames.c_str());
break; break;
} }
default: getNextToken(); break; default: getNextToken(); break;