first commit

Author: PhilippGrulich

nautilus-api/test/ExecutionTests/ControlFlowFunctions.hpp

@@ -11,8 +11,7 @@ namespace nautilus::engine {
         return iw + 42;
     }
 
-    val<int32_t> ifThenElseCondition() {
-        val<int32_t> value = val<int32_t>(1);
+    val<int32_t> ifThenElseCondition(val<int32_t> value) {
         val<int32_t> iw = val<int32_t>(1);
         if (value == 42) {
             iw = iw + 1;
@@ -22,9 +21,7 @@ namespace nautilus::engine {
         return iw + 42;
     }
 
-    val<int32_t> nestedIfThenElseCondition() {
-        val<int32_t> value = val<int32_t>(1);
-        val<int32_t> iw = val<int32_t>(1);
+    val<int32_t> nestedIfThenElseCondition(val<int32_t> value, val<int32_t> iw) {
         if (value == 42) {
         } else {
             if (iw == 8) {
@@ -36,9 +33,7 @@ namespace nautilus::engine {
     }
 
 
-    val<int32_t> nestedIfNoElseCondition() {
-        val<int32_t> value = val<int32_t>(1);
-        val<int32_t> iw = val<int32_t>(1);
+    val<int32_t> nestedIfNoElseCondition(val<int32_t> value, val<int32_t> iw) {
         if (value == 42) {
             iw = iw + 4;
         } else {

nautilus-api/test/ExecutionTests/Executions.cpp

@@ -1,5 +1,5 @@
 #include <catch2/catch_all.hpp>
-#include <engine/engine.hpp>
+#include "engine/engine.hpp"
 #include "ExpressionFunctions.hpp"
 #include "ControlFlowFunctions.hpp"
 #include "LoopFunctions.hpp"
@@ -41,8 +41,7 @@ namespace nautilus::engine {
             REQUIRE(f((int8_t) 7) == 14);
             REQUIRE(f((int8_t) -7) == 0);
             REQUIRE(f((int8_t) -14) == -7);
-        }
-        SECTION("castInt8ToInt64Test2") {
+        }SECTION("castInt8ToInt64Test2") {
             auto f = engine.registerFunction(castInt8ToInt64AddExpression2);
             REQUIRE(f((int8_t) 8) == 50);
             REQUIRE(f((int8_t) -2) == 40);
@@ -56,23 +55,29 @@ namespace nautilus::engine {
             REQUIRE(f(1) == 43);
         }SECTION("ifThenElseConditionTest") {
             auto f = engine.registerFunction(ifThenElseCondition);
-            REQUIRE(f() == 85);
+            REQUIRE(f(1) == 85);
+            REQUIRE(f(42) == 44);
         }SECTION("nestedIfThenElseCondition") {
             auto f = engine.registerFunction(nestedIfThenElseCondition);
-            REQUIRE(f() == 5);
+            REQUIRE(f(1, 1) == 5);
+            REQUIRE(f(42, 1) == 3);
+            REQUIRE(f(1, 8) == 10);
         }SECTION("nestedIfNoElseCondition") {
             auto f = engine.registerFunction(nestedIfNoElseCondition);
-            REQUIRE(f() == 12);
-        }SECTION("andFunction") {
-            auto f = engine.registerFunction(andFunction);
-            REQUIRE(f(42) == true);
-            REQUIRE(f(1) == false);
+            REQUIRE(f(1, 1) == 12);
+            REQUIRE(f(42, 1) == 7);
+            REQUIRE(f(42, 10) == 16);
+            REQUIRE(f(1, -1) == 10);
         } SECTION("deeplyNestedIfElseIfCondition") {
             auto f = engine.registerFunction(deeplyNestedIfElseIfCondition);
             REQUIRE(f() == 17);
         }SECTION("deeplyNestedIfElseCondition") {
             auto f = engine.registerFunction(deeplyNestedIfElseCondition);
             REQUIRE(f() == 12);
+        }SECTION("andFunction") {
+            auto f = engine.registerFunction(andFunction);
+            REQUIRE(f(42) == true);
+            REQUIRE(f(1) == false);
         }SECTION("andCondition") {
             auto f = engine.registerFunction(andCondition);
             REQUIRE(f(42, 42) == 1);