Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
Matthew Kennedy 2020-12-25 05:40:54 -08:00 committed by GitHub
parent 3727233e11
commit 17554539d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions

View File

@ -140,7 +140,7 @@ void LECalculator::push(le_action_e action, float value) {
} }
} }
static FsioValue doBinaryBoolean(le_action_e action, float lhs, float rhs) { static FsioResult doBinaryBoolean(le_action_e action, float lhs, float rhs) {
bool v1 = float2bool(lhs); bool v1 = float2bool(lhs);
bool v2 = float2bool(rhs); bool v2 = float2bool(rhs);
@ -154,7 +154,7 @@ static FsioValue doBinaryBoolean(le_action_e action, float lhs, float rhs) {
} }
} }
static FsioValue doBinaryNumeric(le_action_e action, float v1, float v2) { static FsioResult doBinaryNumeric(le_action_e action, float v1, float v2) {
// Process based on the action type // Process based on the action type
switch (action) { switch (action) {
case LE_OPERATOR_ADDITION: case LE_OPERATOR_ADDITION:
@ -185,7 +185,7 @@ static FsioValue doBinaryNumeric(le_action_e action, float v1, float v2) {
/** /**
* @return true in case of error, false otherwise * @return true in case of error, false otherwise
*/ */
FsioValue LECalculator::processElement(LEElement *element DECLARE_ENGINE_PARAMETER_SUFFIX) { FsioResult LECalculator::processElement(LEElement *element DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if EFI_PROD_CODE #if EFI_PROD_CODE
efiAssert(CUSTOM_ERR_ASSERT, getCurrentRemainingStack() > 64, "FSIO logic", unexpected); efiAssert(CUSTOM_ERR_ASSERT, getCurrentRemainingStack() > 64, "FSIO logic", unexpected);
#endif #endif
@ -303,7 +303,7 @@ float LECalculator::getValue(float selfValue DECLARE_ENGINE_PARAMETER_SUFFIX) {
if (element->action == LE_METHOD_SELF) { if (element->action == LE_METHOD_SELF) {
push(element->action, selfValue); push(element->action, selfValue);
} else { } else {
FsioValue result = processElement(element PASS_ENGINE_PARAMETER_SUFFIX); FsioResult result = processElement(element PASS_ENGINE_PARAMETER_SUFFIX);
if (!result) { if (!result) {
// error already reported // error already reported

View File

@ -64,7 +64,7 @@ typedef enum {
} le_action_e; } le_action_e;
using FsioValue = expected<float>; using FsioResult = expected<float>;
class LEElement { class LEElement {
public: public:
@ -116,7 +116,7 @@ public:
int currentCalculationLogPosition; int currentCalculationLogPosition;
private: private:
void push(le_action_e action, float value); void push(le_action_e action, float value);
FsioValue processElement(LEElement *element DECLARE_ENGINE_PARAMETER_SUFFIX); FsioResult processElement(LEElement *element DECLARE_ENGINE_PARAMETER_SUFFIX);
float pop(le_action_e action); float pop(le_action_e action);
LEElement *first; LEElement *first;
calc_stack_t stack; calc_stack_t stack;

View File

@ -114,7 +114,7 @@ static LEElement * mainRelayLogic;
static Logging *logger; static Logging *logger;
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
FsioValue getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) { FsioResult getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) {
efiAssert(CUSTOM_ERR_ASSERT, engine!=NULL, "getLEValue", unexpected); efiAssert(CUSTOM_ERR_ASSERT, engine!=NULL, "getLEValue", unexpected);
switch (action) { switch (action) {
case LE_METHOD_FAN: case LE_METHOD_FAN:

View File

@ -15,7 +15,7 @@
#define TEST_POOL_SIZE 256 #define TEST_POOL_SIZE 256
FsioValue getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) { FsioResult getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) {
switch(action) { switch(action) {
case LE_METHOD_FAN: case LE_METHOD_FAN:
return engine->fsioState.mockFan; return engine->fsioState.mockFan;