rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2014-10-04 17:03:07 -05:00
parent 19389bc033
commit ca21cb349e
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
firmware/controllers/core/logic_expression.cpp
View File

@ -8,6 +8,27 @@
#include "main.h"
#include "logic_expression.h"
LENameOrdinalPair * LE_FIRST = NULL;
/**
* the main point of these static fields is that their constructor would register
* them in the magic list of operator name/ordinal pairs
*/
static LENameOrdinalPair leAnd(LE_OPERATOR_AND, "and");
static LENameOrdinalPair leOr(LE_OPERATOR_OR, "or");
static LENameOrdinalPair leMore(LE_OPERATOR_MORE, ">");
static LENameOrdinalPair leMoreOrEqual(LE_OPERATOR_MORE_OR_EQUAL, ">=");
LENameOrdinalPair::LENameOrdinalPair(le_action_e action, const char *name) {
this->next = NULL;
this->action = action;
this->name = name;
if (LE_FIRST != NULL) {
LE_FIRST->next = this;
}
LE_FIRST = this;
}
LEElement::LEElement() {
action = LE_UNDEFINED;
next = NULL;
@ -156,10 +177,12 @@ const char *processToken(const char *line, char *buffer) {
}
le_action_e parseAction(const char * line) {
if (strEqualCaseInsensitive("or", line)) {
return LE_OPERATOR_OR;
} else if (strEqualCaseInsensitive("AND", line)) {
return LE_OPERATOR_AND;
LENameOrdinalPair *pair = LE_FIRST;
while (pair != NULL) {
if (strEqualCaseInsensitive(pair->name, line)) {
// return pair->action;
}
pair = pair->next;
}
return LE_UNDEFINED;
}

9
firmware/controllers/core/logic_expression.h
View File

@ -72,6 +72,15 @@ private:
FLStack<float, MAX_STACK_DEPTH> stack;
};
class LENameOrdinalPair {
public:
LENameOrdinalPair(le_action_e action, const char *name);
LENameOrdinalPair *next;
le_action_e action;
const char *name;
};
const char *processToken(const char *line, char *buffer);
bool isNumeric(const char* line);
le_action_e parseAction(const char * line);