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

Добавляем контроль закрывающей фигкрной скобки

Browse Source
This commit is contained in:
biver
2022-03-03 23:15:11 +03:00
parent 1ac32e6711
commit 42c1cd3e57
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/classes/IoTScenario.cpp
View File

@@ -264,9 +264,7 @@ public:
: Cond(cond), Then(then), Else(_else) { : Cond(cond), Then(then), Else(_else) {
if (IDNames) { if (IDNames) {
_IDNames = *IDNames; _IDNames = *IDNames;
//Serial.printf("eeeeeeeeeeeeee %s\n", _IDNames.c_str());
} else _IDNames = ""; } else _IDNames = "";
Serial.printf("eeeeeeeeeeeeee\n");
} }
bool hasEventIdName(String eventIdName) { bool hasEventIdName(String eventIdName) {
@@ -553,10 +551,13 @@ public:
bracketsList.push_back(Expr); bracketsList.push_back(Expr);
if (CurTok != ';') if (CurTok != ';')
return Error("Expected '}' or ';' in operation list"); return Error("Expected ';' in operation list");
getNextToken(); int ttok = getNextToken();
if (!ttok) { Error("Expected '}'"); break; }
if (CurTok == '}') break; if (CurTok == '}') break;
} }
} }
@@ -689,7 +690,7 @@ public:
case tok_if: { case tok_if: {
String IDNames = ""; // накопитель встречающихся идентификаторов в условии String IDNames = ""; // накопитель встречающихся идентификаторов в условии
ScenarioElements.push_back(ParseIfExpr(&IDNames)); ScenarioElements.push_back(ParseIfExpr(&IDNames));
Serial.printf("vvvvvvvvvvvvvvvv %s", IDNames.c_str()); //Serial.printf("vvvvvvvvvvvvvvvv %s", IDNames.c_str());
break; break;
} }
default: getNextToken(); break; default: getNextToken(); break;