Rim/gsc-tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

fix decompiler empty switch cases

Browse Source
This commit is contained in:
xensik 2022-07-29 11:43:07 +02:00
parent 3236e6e079
commit ced80282e8
10 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/h1/xsk/decompiler.cpp
View File

@ -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)
end--;
while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
end++;
// TODO: fix more than 1 empty case at 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'

9
src/h2/xsk/decompiler.cpp
View File

@ -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)
end--;
while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
end++;
// TODO: fix more than 1 empty case at 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'

9
src/iw5/xsk/decompiler.cpp
View File

@ -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)
end--;
while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
end++;
// TODO: fix more than 1 empty case at 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'

9
src/iw6/xsk/decompiler.cpp
View File

@ -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)
end--;
while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
end++;
// TODO: fix more than 1 empty case at 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'

9
src/iw7/xsk/decompiler.cpp
View File

@ -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)
end--;
while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
end++;
// TODO: fix more than 1 empty case at 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'

9
src/iw8/xsk/decompiler.cpp
View File

@ -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)
end--;
while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
end++;
// TODO: fix more than 1 empty case at 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'

9
src/s1/xsk/decompiler.cpp
View File

@ -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)
end--;
while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
end++;
// TODO: fix more than 1 empty case at 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'

9
src/s2/xsk/decompiler.cpp
View File

@ -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)
end--;
while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
end++;
// TODO: fix more than 1 empty case at 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'

9
src/s4/xsk/decompiler.cpp
View File

@ -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)
end--;
while (stmt->list.size() > (end + 1) && stmt->list.at(end) != ast::kind::asm_endswitch)
end++;
// TODO: fix more than 1 empty case at 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'

9
src/t6/xsk/decompiler.cpp
View File

@ -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'