From 42c1cd3e57ed4771ec26389491cafc8ebd730348 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Thu, 3 Mar 2022 23:15:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=20=D0=B7=D0=B0=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D1=8E=D1=89=D0=B5?=
 =?UTF-8?q?=D0=B9=20=D1=84=D0=B8=D0=B3=D0=BA=D1=80=D0=BD=D0=BE=D0=B9=20?=
 =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=B1=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/classes/IoTScenario.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/classes/IoTScenario.cpp b/src/classes/IoTScenario.cpp
index a69bbe7e..f446d6ef 100644
--- a/src/classes/IoTScenario.cpp
+++ b/src/classes/IoTScenario.cpp
@@ -264,9 +264,7 @@ public:
     : 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) {
@@ -553,10 +551,13 @@ public:
         bracketsList.push_back(Expr);
 
         if (CurTok != ';')
-          return Error("Expected '}' or ';' in operation list");
-        getNextToken();
-
+          return Error("Expected ';' in operation list");
+        int ttok = getNextToken();
+        if (!ttok) { Error("Expected '}'"); break; }
+        
         if (CurTok == '}') break;
+
+
       }
     }
  
@@ -689,7 +690,7 @@ public:
           case tok_if: {
             String IDNames = "";  // накопитель встречающихся идентификаторов в условии
             ScenarioElements.push_back(ParseIfExpr(&IDNames)); 
-            Serial.printf("vvvvvvvvvvvvvvvv %s", IDNames.c_str());
+            //Serial.printf("vvvvvvvvvvvvvvvv %s", IDNames.c_str());
             break;
           }
           default:         getNextToken(); break;