fallout2sfall/int2ssl
0
0
Fork 0
mirror of https://github.com/sfall-team/int2ssl.git synced 2026-07-27 16:52:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Handle cases where if/else block with single exprstatement was incorrectly identified as ternary operator (closes #4)

Browse Source
This commit is contained in:
Vlad
2023-06-30 20:51:02 +02:00
committed by GitHub
parent ac48069a21
commit 557e243968
5 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FalloutScriptStore.cpp
+6 -4
View File
@@ -911,17 +911,19 @@ std::string CFalloutScript::GetSource(CNode& node, bool bLabel, uint32_t ulNumAr
}
if (node.m_Type == CNode::TYPE_CONDITIONAL_EXPRESSION)
{
if (node.m_Arguments.size() != 3)
if (node.m_Arguments.size() != 5)
{
printf("Error: Invalid number of arguments in conditional expression\n");
throw std::exception();
}
std::string sPostfix[] = { " if ", " else ", ""};
uint16_t argIdx[] = {2, 1, 3};
strResult = "";
for(uint32_t i = 0; i < node.m_Arguments.size(); i++)
for (uint32_t i = 0; i < 3; i++)
{
bool bParens = ArgNeedParens(node, node.m_Arguments[i], CFalloutScript::RIGHT_ASSOC);
strResult += (bParens ? "(" : "") + GetSource(node.m_Arguments[i], bLabel, ulNumArgs) + (bParens ? ")" : "") + sPostfix[i];
CNode& arg = node.m_Arguments[argIdx[i]];
bool bParens = ArgNeedParens(node, arg, CFalloutScript::RIGHT_ASSOC);
strResult += (bParens ? "(" : "") + GetSource(arg, bLabel, ulNumArgs) + (bParens ? ")" : "") + sPostfix[i];
}
break;
}