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-09-03 21:32:39 +03:00
parent 80607c593b
commit a010859c06
2 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/classes/IoTScenario.h
View File

@@ -47,16 +47,16 @@ class IoTScenario {
/// identifierexpr /// identifierexpr
/// ::= identifier /// ::= identifier
/// ::= identifier '(' expression* ')' /// ::= identifier '(' expression* ')'
ExprAST *ParseIdentifierExpr(String *IDNames); ExprAST *ParseIdentifierExpr(String *IDNames, bool callFromCondition);
/// numberexpr ::= number /// numberexpr ::= number
ExprAST *ParseNumberExpr(); ExprAST *ParseNumberExpr();
/// parenexpr ::= '(' expression ')' /// parenexpr ::= '(' expression ')'
ExprAST *ParseParenExpr(); ExprAST *ParseParenExpr(String *IDNames, bool callFromCondition);
/// bracketsexpr ::= '{' expression '}' /// bracketsexpr ::= '{' expression '}'
ExprAST *ParseBracketsExpr(); ExprAST *ParseBracketsExpr(String *IDNames, bool callFromCondition);
/// quotesexpr ::= '"' expression '"' /// quotesexpr ::= '"' expression '"'
ExprAST *ParseQuotesExpr(); ExprAST *ParseQuotesExpr();
@@ -68,16 +68,16 @@ class IoTScenario {
/// ::= identifierexpr /// ::= identifierexpr
/// ::= numberexpr /// ::= numberexpr
/// ::= parenexpr /// ::= parenexpr
ExprAST *ParsePrimary(String *IDNames); ExprAST *ParsePrimary(String *IDNames, bool callFromCondition);
/// binoprhs /// binoprhs
/// ::= ('+' primary)* /// ::= ('+' primary)*
ExprAST *ParseBinOpRHS(int ExprPrec, ExprAST *LHS, String *IDNames); ExprAST *ParseBinOpRHS(int ExprPrec, ExprAST *LHS, String *IDNames, bool callFromCondition);
/// expression /// expression
/// ::= primary binoprhs /// ::= primary binoprhs
/// ///
ExprAST *ParseExpression(String *IDNames); ExprAST *ParseExpression(String *IDNames, bool callFromCondition);
int getLastChar(); int getLastChar();
fs::File file; fs::File file;

68
src/classes/IoTScenario.cpp
View File

@@ -728,7 +728,7 @@ ExprAST *IoTScenario::Error(const char *Str) {
/// identifierexpr /// identifierexpr
/// ::= identifier /// ::= identifier
/// ::= identifier '(' expression* ')' /// ::= identifier '(' expression* ')'
ExprAST *IoTScenario::ParseIdentifierExpr(String *IDNames) { ExprAST *IoTScenario::ParseIdentifierExpr(String *IDNames, bool callFromCondition) {
String IdName = IdentifierStr; String IdName = IdentifierStr;
String Cmd = ""; String Cmd = "";
IoTItem *tmpItem = findIoTItem(IdName); IoTItem *tmpItem = findIoTItem(IdName);
@@ -754,7 +754,7 @@ ExprAST *IoTScenario::ParseIdentifierExpr(String *IDNames) {
std::vector<ExprAST *> Args; std::vector<ExprAST *> Args;
if (CurTok != ')') { if (CurTok != ')') {
while (1) { while (1) {
ExprAST *Arg = ParseExpression(IDNames); ExprAST *Arg = ParseExpression(IDNames, callFromCondition);
if (!Arg) return nullptr; if (!Arg) return nullptr;
Args.push_back(Arg); Args.push_back(Arg);
@@ -783,9 +783,9 @@ ExprAST *IoTScenario::ParseNumberExpr() {
} }
/// parenexpr ::= '(' expression ')' /// parenexpr ::= '(' expression ')'
ExprAST *IoTScenario::ParseParenExpr() { ExprAST *IoTScenario::ParseParenExpr(String *IDNames, bool callFromCondition) {
getNextToken(); // получаем (. getNextToken(); // получаем (.
ExprAST *V = ParseExpression(nullptr); ExprAST *V = ParseExpression(IDNames, callFromCondition);
if (!V) return nullptr; if (!V) return nullptr;
if (CurTok != ')') if (CurTok != ')')
@@ -795,28 +795,31 @@ ExprAST *IoTScenario::ParseParenExpr() {
} }
/// bracketsexpr ::= '{' expression '}' /// bracketsexpr ::= '{' expression '}'
ExprAST *IoTScenario::ParseBracketsExpr() { ExprAST *IoTScenario::ParseBracketsExpr(String *IDNames, bool callFromCondition) {
getNextToken(); // получаем {. getNextToken(); // получаем {.
std::vector<ExprAST *> bracketsList; std::vector<ExprAST *> bracketsList;
if (CurTok != '}') {
while (1) { while (CurTok != '}') {
ExprAST *Expr = ParseExpression(nullptr); ExprAST *Expr = ParseExpression(IDNames, callFromCondition);
if (!Expr) return nullptr; if (!Expr) return nullptr;
bracketsList.push_back(Expr); bracketsList.push_back(Expr);
if (CurTok != ';') //if (CurTok == '}') break;
return Error("Expected ';' in operation list");
int ttok = getNextToken(); Serial.printf("ParseBracketsExpr CurTok = %d \n", CurTok);
if (!ttok) {
Error("Expected '}'");
break;
//if (CurTok != ';')
// return Error("Expected ';' in operation list");
//int ttok = getNextToken();
if (CurTok == tok_eof) {
return Error("Expected '}'");
} }
if (CurTok == '}') break;
} }
}
//getNextToken(); // получаем }. getNextToken(); // получаем }.
return new BracketsExprAST(bracketsList); return new BracketsExprAST(bracketsList);
} }
@@ -833,14 +836,14 @@ ExprAST *IoTScenario::ParseIfExpr(String *IDNames) {
getNextToken(); // Получаем if. getNextToken(); // Получаем if.
// условие. // условие.
ExprAST *Cond = ParseExpression(IDNames); ExprAST *Cond = ParseExpression(IDNames, true);
if (!Cond) return nullptr; if (!Cond) return nullptr;
if (CurTok != tok_then) if (CurTok != tok_then)
return Error("expected then"); return Error("expected then");
getNextToken(); // Получаем then getNextToken(); // Получаем then
ExprAST *Then = ParseExpression(nullptr); ExprAST *Then = ParseExpression(IDNames, false);
if (!Then) return nullptr; if (!Then) return nullptr;
// if (CurTok != tok_else) // if (CurTok != tok_else)
@@ -848,7 +851,8 @@ ExprAST *IoTScenario::ParseIfExpr(String *IDNames) {
ExprAST *Else = nullptr; ExprAST *Else = nullptr;
if (CurTok == tok_else) { if (CurTok == tok_else) {
getNextToken(); getNextToken();
Else = ParseExpression(nullptr); Else = ParseExpression(IDNames, false);
if (!Else) return nullptr;
} }
return new IfExprAST(Cond, Then, Else, IDNames); return new IfExprAST(Cond, Then, Else, IDNames);
@@ -858,24 +862,24 @@ ExprAST *IoTScenario::ParseIfExpr(String *IDNames) {
/// ::= identifierexpr /// ::= identifierexpr
/// ::= numberexpr /// ::= numberexpr
/// ::= parenexpr /// ::= parenexpr
ExprAST *IoTScenario::ParsePrimary(String *IDNames) { ExprAST *IoTScenario::ParsePrimary(String *IDNames, bool callFromCondition) {
switch (CurTok) { switch (CurTok) {
default: default:
Serial.println(CurTok); Serial.println(CurTok);
return Error("unknown token when expecting an expression"); return Error("unknown token when expecting an expression");
case tok_identifier: { case tok_identifier: {
if (IDNames) { if (callFromCondition && IDNames) {
String tmpstr = *IDNames; String tmpstr = *IDNames;
*IDNames = tmpstr + " " + IdentifierStr + " "; *IDNames = tmpstr + " " + IdentifierStr + " ";
} }
return ParseIdentifierExpr(IDNames); return ParseIdentifierExpr(IDNames, callFromCondition);
} }
case tok_number: case tok_number:
return ParseNumberExpr(); return ParseNumberExpr();
case '(': case '(':
return ParseParenExpr(); return ParseParenExpr(IDNames, callFromCondition);
case '{': case '{':
return ParseBracketsExpr(); return ParseBracketsExpr(IDNames, callFromCondition);
case tok_string: case tok_string:
return ParseQuotesExpr(); return ParseQuotesExpr();
case tok_if: case tok_if:
@@ -885,7 +889,7 @@ ExprAST *IoTScenario::ParsePrimary(String *IDNames) {
/// binoprhs /// binoprhs
/// ::= ('+' primary)* /// ::= ('+' primary)*
ExprAST *IoTScenario::ParseBinOpRHS(int ExprPrec, ExprAST *LHS, String *IDNames) { ExprAST *IoTScenario::ParseBinOpRHS(int ExprPrec, ExprAST *LHS, String *IDNames, bool callFromCondition) {
// Если это бинарный оператор, получаем его приоритет // Если это бинарный оператор, получаем его приоритет
while (1) { while (1) {
int TokPrec = GetTokPrecedence(); int TokPrec = GetTokPrecedence();
@@ -900,14 +904,14 @@ ExprAST *IoTScenario::ParseBinOpRHS(int ExprPrec, ExprAST *LHS, String *IDNames)
getNextToken(); // eat binop getNextToken(); // eat binop
// Разобрать первичное выражение после бинарного оператора // Разобрать первичное выражение после бинарного оператора
ExprAST *RHS = ParsePrimary(IDNames); ExprAST *RHS = ParsePrimary(IDNames, callFromCondition);
if (!RHS) return nullptr; if (!RHS) return nullptr;
// Если BinOp связан с RHS меньшим приоритетом, чем оператор после RHS, // Если BinOp связан с RHS меньшим приоритетом, чем оператор после RHS,
// то берём часть вместе с RHS как LHS. // то берём часть вместе с RHS как LHS.
int NextPrec = GetTokPrecedence(); int NextPrec = GetTokPrecedence();
if (TokPrec < NextPrec) { if (TokPrec < NextPrec) {
RHS = ParseBinOpRHS(TokPrec + 1, RHS, IDNames); RHS = ParseBinOpRHS(TokPrec + 1, RHS, IDNames, callFromCondition);
if (RHS == nullptr) return nullptr; if (RHS == nullptr) return nullptr;
} }
@@ -919,10 +923,10 @@ ExprAST *IoTScenario::ParseBinOpRHS(int ExprPrec, ExprAST *LHS, String *IDNames)
/// expression /// expression
/// ::= primary binoprhs /// ::= primary binoprhs
/// ///
ExprAST *IoTScenario::ParseExpression(String *IDNames) { ExprAST *IoTScenario::ParseExpression(String *IDNames, bool callFromCondition) {
ExprAST *LHS = ParsePrimary(IDNames); ExprAST *LHS = ParsePrimary(IDNames, callFromCondition);
if (!LHS) return nullptr; if (!LHS) return nullptr;
return ParseBinOpRHS(0, LHS, IDNames); return ParseBinOpRHS(0, LHS, IDNames, callFromCondition);
} }