andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: Support nested conditionals in shuntingYard

Browse Source
This commit is contained in:
wingphil
2025-03-07 16:53:41 +00:00
parent 45eca462e7
commit 9874ecde82
2 changed files with 65 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
test/test_api/test_shuntingYard.hpp
View File

@@ -80,38 +80,44 @@ void shuntingYard_test12() {
void shuntingYard_test13() {
std::string expected_result = "5";
std::string test_value = "1 < 2 ? (3 < 4 ? 5 : 6) : 7";
//TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
std::string test_value = "1<2?(3<4?5:6):7";
TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
}
void shuntingYard_test14() {
std::string expected_result = "6";
std::string test_value = "1 < 2 ? (3 > 4 ? 5 : 6) : 7";
//TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
std::string expected_result = "7";
std::string test_value = "1>2?(3<4?5:6):7";
TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
}
void shuntingYard_test15() {
std::string expected_result = "3";
std::string test_value = "1 < 2 ? 3 : (4 < 5 ? 6 : 7)";
std::string expected_result = "6";
std::string test_value = "1<2?(3>4?5:6):7";
TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
}
void shuntingYard_test16() {
std::string expected_result = "6";
std::string test_value = "1 > 2 ? 3 : (4 < 5 ? 6 : 7)";
//TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
std::string expected_result = "3";
std::string test_value = "1<2?3:(4<5?6:7)";
TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
}
void shuntingYard_test17() {
std::string expected_result = "7";
std::string test_value = "1 > 2 ? 3 : (4 > 5 ? 6 : 7)";
//TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
std::string expected_result = "6";
std::string test_value = "1>2?3:(4<5?6:7)";
TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
}
void shuntingYard_test18() {
std::string expected_result = "7";
std::string test_value = "1>2?3:(4>5?6:7)";
TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
}
void shuntingYard_test19() {
std::string expected_result = "44";
std::string test_value = "(1 > 2 ? 3 : 4) + (10 > 20 ? 30 : 40)";
//TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
std::string test_value = "(1>2?3:4)+(10>20?30:40)";
TEST_ASSERT_EQUAL_STRING(expected_result.c_str(), compute(test_value).c_str());
}
void run_shuntingYard_tests() {
@@ -133,4 +139,5 @@ void run_shuntingYard_tests() {
RUN_TEST(shuntingYard_test16);
RUN_TEST(shuntingYard_test17);
RUN_TEST(shuntingYard_test18);
RUN_TEST(shuntingYard_test19);
}