fix decompiler empty switch cases

src/h1/xsk/decompiler.cpp

@@ -2504,12 +2504,13 @@ void decompiler::decompile_switch(const ast::stmt_list::ptr& stmt, std::size_t s
 
     end = find_location_index(stmt, end_loc); // update end
 
-    // fix empty cases at end
-    if (stmt->list.at(end) == ast::kind::asm_endswitch)
+    while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
+        end++;
+
+    if (stmt->list.at(end) != ast::kind::asm_endswitch)
+        decomp_error("bad empty cases in switch block!");
+
     end--;
-
-    // TODO: fix more than 1 empty case at end
-
     stmt->list.erase(stmt->list.begin() + start); // remove 'switch'
     stmt->list.erase(stmt->list.begin() + end); // remove 'endswitch'
 

src/h2/xsk/decompiler.cpp

@@ -2504,12 +2504,13 @@ void decompiler::decompile_switch(const ast::stmt_list::ptr& stmt, std::size_t s
 
     end = find_location_index(stmt, end_loc); // update end
 
-    // fix empty cases at end
-    if (stmt->list.at(end) == ast::kind::asm_endswitch)
+    while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
+        end++;
+
+    if (stmt->list.at(end) != ast::kind::asm_endswitch)
+        decomp_error("bad empty cases in switch block!");
+
     end--;
-
-    // TODO: fix more than 1 empty case at end
-
     stmt->list.erase(stmt->list.begin() + start); // remove 'switch'
     stmt->list.erase(stmt->list.begin() + end); // remove 'endswitch'
 

src/iw5/xsk/decompiler.cpp

@@ -2498,12 +2498,13 @@ void decompiler::decompile_switch(const ast::stmt_list::ptr& stmt, std::size_t s
 
     end = find_location_index(stmt, end_loc); // update end
 
-    // fix empty cases at end
-    if (stmt->list.at(end) == ast::kind::asm_endswitch)
+    while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
+        end++;
+
+    if (stmt->list.at(end) != ast::kind::asm_endswitch)
+        decomp_error("bad empty cases in switch block!");
+
     end--;
-
-    // TODO: fix more than 1 empty case at end
-
     stmt->list.erase(stmt->list.begin() + start); // remove 'switch'
     stmt->list.erase(stmt->list.begin() + end); // remove 'endswitch'
 

src/iw6/xsk/decompiler.cpp

@@ -2498,12 +2498,13 @@ void decompiler::decompile_switch(const ast::stmt_list::ptr& stmt, std::size_t s
 
     end = find_location_index(stmt, end_loc); // update end
 
-    // fix empty cases at end
-    if (stmt->list.at(end) == ast::kind::asm_endswitch)
+    while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
+        end++;
+
+    if (stmt->list.at(end) != ast::kind::asm_endswitch)
+        decomp_error("bad empty cases in switch block!");
+
     end--;
-
-    // TODO: fix more than 1 empty case at end
-
     stmt->list.erase(stmt->list.begin() + start); // remove 'switch'
     stmt->list.erase(stmt->list.begin() + end); // remove 'endswitch'
 

src/iw7/xsk/decompiler.cpp

@@ -2498,12 +2498,13 @@ void decompiler::decompile_switch(const ast::stmt_list::ptr& stmt, std::size_t s
 
     end = find_location_index(stmt, end_loc); // update end
 
-    // fix empty cases at end
-    if (stmt->list.at(end) == ast::kind::asm_endswitch)
+    while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
+        end++;
+
+    if (stmt->list.at(end) != ast::kind::asm_endswitch)
+        decomp_error("bad empty cases in switch block!");
+
     end--;
-
-    // TODO: fix more than 1 empty case at end
-
     stmt->list.erase(stmt->list.begin() + start); // remove 'switch'
     stmt->list.erase(stmt->list.begin() + end); // remove 'endswitch'
 

src/iw8/xsk/decompiler.cpp

@@ -2535,12 +2535,13 @@ void decompiler::decompile_switch(const ast::stmt_list::ptr& stmt, std::size_t s
 
     end = find_location_index(stmt, end_loc); // update end
 
-    // fix empty cases at end
-    if (stmt->list.at(end) == ast::kind::asm_endswitch)
+    while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
+        end++;
+
+    if (stmt->list.at(end) != ast::kind::asm_endswitch)
+        decomp_error("bad empty cases in switch block!");
+
     end--;
-
-    // TODO: fix more than 1 empty case at end
-
     stmt->list.erase(stmt->list.begin() + start); // remove 'switch'
     stmt->list.erase(stmt->list.begin() + end); // remove 'endswitch'
 

src/s1/xsk/decompiler.cpp

@@ -2504,12 +2504,13 @@ void decompiler::decompile_switch(const ast::stmt_list::ptr& stmt, std::size_t s
 
     end = find_location_index(stmt, end_loc); // update end
 
-    // fix empty cases at end
-    if (stmt->list.at(end) == ast::kind::asm_endswitch)
+    while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
+        end++;
+
+    if (stmt->list.at(end) != ast::kind::asm_endswitch)
+        decomp_error("bad empty cases in switch block!");
+
     end--;
-
-    // TODO: fix more than 1 empty case at end
-
     stmt->list.erase(stmt->list.begin() + start); // remove 'switch'
     stmt->list.erase(stmt->list.begin() + end); // remove 'endswitch'
 

src/s2/xsk/decompiler.cpp

@@ -2511,12 +2511,13 @@ void decompiler::decompile_switch(const ast::stmt_list::ptr& stmt, std::size_t s
 
     end = find_location_index(stmt, end_loc); // update end
 
-    // fix empty cases at end
-    if (stmt->list.at(end) == ast::kind::asm_endswitch)
+    while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
+        end++;
+
+    if (stmt->list.at(end) != ast::kind::asm_endswitch)
+        decomp_error("bad empty cases in switch block!");
+
     end--;
-
-    // TODO: fix more than 1 empty case at end
-
     stmt->list.erase(stmt->list.begin() + start); // remove 'switch'
     stmt->list.erase(stmt->list.begin() + end); // remove 'endswitch'
 

src/s4/xsk/decompiler.cpp

@@ -2535,12 +2535,13 @@ void decompiler::decompile_switch(const ast::stmt_list::ptr& stmt, std::size_t s
 
    end = find_location_index(stmt, end_loc); // update end
 
-    // fix empty cases at end
-    if (stmt->list.at(end) == ast::kind::asm_endswitch)
+    while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
+        end++;
+
+    if (stmt->list.at(end) != ast::kind::asm_endswitch)
+        decomp_error("bad empty cases in switch block!");
+
     end--;
-
-    // TODO: fix more than 1 empty case at end
-
     stmt->list.erase(stmt->list.begin() + start); // remove 'switch'
     stmt->list.erase(stmt->list.begin() + end); // remove 'endswitch'
 

src/t6/xsk/decompiler.cpp

@@ -1915,10 +1915,13 @@ void decompiler::decompile_switch(const ast::stmt_list::ptr& stmt, std::size_t s
 
     end = find_location_index(stmt, end_loc); // update end
 
-    // fix empty cases at end
-    if (stmt->list.at(end) == ast::kind::asm_endswitch)
-        end--;
+    while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
+        end++;
 
+    if (stmt->list.at(end) != ast::kind::asm_endswitch)
+        decomp_error("bad empty cases in switch block!");
+
+    end--;
     stmt->list.erase(stmt->list.begin() + start); // remove 'switch'
     stmt->list.erase(stmt->list.begin() + end); // remove 'endswitch'