Fix switch #325

polystat · Aug 28, 2022 · 9980639 · 9980639 · 0pdd · Aug 28, 2022
1 parent 69a9762
commit 9980639
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 2 deletions.
diff --git a/project/src/transpiler/transpile_helper.cpp b/project/src/transpiler/transpile_helper.cpp
@@ -598,9 +598,20 @@ EOObject GetSwitchEOObject(const SwitchStmt *p_stmt) {
       eq_obj.nested.push_back(GetStmtEOObject(case_stmt->getLHS()));
       cond_obj.nested.push_back(
           GetCaseCondEOObject(all_cases, switch_expr_object, 0));
-      if_obj.nested.push_back(cond_obj);
+      if (nested != nullptr &&
+          nested->getStmtClass() == Stmt::DefaultStmtClass) {
+        EOObject always_true_obj{"or"};
+        always_true_obj.nested.push_back(cond_obj);
+        always_true_obj.nested.emplace_back("TRUE", EOObjectType::EO_LITERAL);
+        if_obj.nested.push_back(always_true_obj);
+        const auto *def_stmt = dyn_cast<DefaultStmt>(nested);
+        nested = def_stmt->getSubStmt();
+      } else {
+        if_obj.nested.push_back(cond_obj);
+      }
       EOObject buffer_obj{"seq"};
-      if (nested != nullptr) {
+      if (nested != nullptr &&
+          nested->getStmtClass() != Stmt::DefaultStmtClass) {
         buffer_obj.nested.push_back(GetStmtEOObject(nested));
       }
       auto tmp = stmt;
@@ -614,6 +625,27 @@ EOObject GetSwitchEOObject(const SwitchStmt *p_stmt) {
       buffer_obj.nested.emplace_back("TRUE", EOObjectType::EO_LITERAL);
       if_obj.nested.push_back(buffer_obj);
       seq_object.nested.push_back(if_obj);
+
+      if (nested != nullptr &&
+          nested->getStmtClass() == Stmt::DefaultStmtClass) {
+        const auto *default_stmt = dyn_cast<DefaultStmt>(nested);
+        EOObject buffer_obj_def{"seq"};
+        if (default_stmt->getSubStmt() != nullptr) {
+          buffer_obj_def.nested.push_back(
+              GetStmtEOObject(default_stmt->getSubStmt()));
+        }
+        auto tmp_def = stmt;
+        tmp_def++;
+        while (tmp_def != end &&
+               (*tmp_def)->getStmtClass() != Stmt::CaseStmtClass &&
+               (*tmp_def)->getStmtClass() != Stmt::DefaultStmtClass) {
+          buffer_obj_def.nested.push_back(GetStmtEOObject(*tmp_def));
+          tmp_def++;
+        }
+        buffer_obj_def.nested.push_back(set_flag_object);
+        buffer_obj_def.nested.emplace_back("TRUE", EOObjectType::EO_LITERAL);
+        seq_object.nested.push_back(buffer_obj_def);
+      }
     } else if ((*stmt)->getStmtClass() == Stmt::DefaultStmtClass) {
       const auto *default_stmt = dyn_cast<DefaultStmt>(*stmt);
       EOObject buffer_obj{"seq"};

diff --git a/.../bad/operators/switch/switch01/switch01.c → ...and_if_else/switch/c2eo-result/switch01.c b/.../bad/operators/switch/switch01/switch01.c → ...and_if_else/switch/c2eo-result/switch01.c
diff --git a/.../bad/operators/switch/switch02/switch02.c → ...and_if_else/switch/c2eo-result/switch02.c b/.../bad/operators/switch/switch02/switch02.c → ...and_if_else/switch/c2eo-result/switch02.c
diff --git a/project/tests/main/switch_and_if_else/switch/switch01.c b/project/tests/main/switch_and_if_else/switch/switch01.c
@@ -0,0 +1,73 @@
+#include <stdio.h>
+
+int x;
+int t;
+
+void op1() {
+  t = 1;
+  printf("%d\n", t);
+}
+void op23() {
+  t = 23;
+  printf("%d\n", t);
+}
+void op4() {
+  t = 4;
+  printf("%d\n", t);
+}
+void op5() {
+  t = 5;
+  printf("%d\n", t);
+}
+void op10() {
+  t = 10;
+  printf("%d\n", t);
+}
+
+void test_switch() {
+  switch (x) {
+  case 1:
+    op1();
+    break;
+  case 2:
+  case 3:
+    op23();
+    break;
+  case 4:
+    op4();
+  case 5:
+    op5();
+    break;
+  case 6:
+  default:
+    op10();
+    break;
+  }
+}
+
+int main() {
+  x = 0;
+  printf("%d\n", x);
+  test_switch();
+  x = 1;
+  printf("%d\n", x);
+  test_switch();
+  x = 2;
+  printf("%d\n", x);
+  test_switch();
+  x = 3;
+  printf("%d\n", x);
+  test_switch();
+  x = 4;
+  printf("%d\n", x);
+  test_switch();
+  x = 5;
+  printf("%d\n", x);
+  test_switch();
+  x = 6;
+  printf("%d\n", x);
+  test_switch();
+  x = 7;
+  printf("%d\n", x);
+  test_switch();
+}
diff --git a/project/tests/main/switch_and_if_else/switch/switch02.c b/project/tests/main/switch_and_if_else/switch/switch02.c
@@ -0,0 +1,69 @@
+#include <stdio.h>
+
+int x;
+int t;
+
+void op1() {
+  t = 1;
+  printf("%d\n", t);
+}
+void op23() {
+  t = 23;
+  printf("%d\n", t);
+}
+void op4() {
+  t = 4;
+  printf("%d\n", t);
+}
+void op5() {
+  t = 5;
+  printf("%d\n", t);
+}
+void op10() {
+  t = 10;
+  printf("%d\n", t);
+}
+
+void test_switch() {
+  switch (x) {
+  case 1:
+    op1();
+  case 2:
+  case 3:
+    op23();
+  case 4:
+    op4();
+  case 5:
+    op5();
+  case 6:
+  default:
+    op10();
+  }
+}
+
+int main() {
+  x = 0;
+  printf("%d\n", x);
+  test_switch();
+  x = 1;
+  printf("%d\n", x);
+  test_switch();
+  x = 2;
+  printf("%d\n", x);
+  test_switch();
+  x = 3;
+  printf("%d\n", x);
+  test_switch();
+  x = 4;
+  printf("%d\n", x);
+  test_switch();
+  x = 5;
+  printf("%d\n", x);
+  test_switch();
+  x = 6;
+  printf("%d\n", x);
+  test_switch();
+  x = 7;
+  printf("%d\n", x);
+  test_switch();
+}