zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 15:22:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- reorder evaluation for 'if' statements to handle the condition first.

Browse source 
Otherwise this won't emit errors if a bad condition is used with an empty conditional part.
This commit is contained in:
Christoph Oelckers 2021-08-10 19:03:40 +02:00
parent 55520ed7d0
commit 03b7324f71
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/scripting/backend/codegen.cpp
View file

@ -9823,6 +9823,8 @@ FxExpression *FxIfStatement::Resolve(FCompileContext &ctx)
{ {
CHECKRESOLVED(); CHECKRESOLVED();
SAFE_RESOLVE(Condition, ctx);
if (WhenTrue == nullptr && WhenFalse == nullptr) if (WhenTrue == nullptr && WhenFalse == nullptr)
{ // We don't do anything either way, so disappear { // We don't do anything either way, so disappear
delete this; delete this;
@ -9830,8 +9832,6 @@ FxExpression *FxIfStatement::Resolve(FCompileContext &ctx)
return new FxNop(ScriptPosition); return new FxNop(ScriptPosition);
} }
SAFE_RESOLVE(Condition, ctx);
if (Condition->ValueType != TypeBool) if (Condition->ValueType != TypeBool)
{ {
Condition = new FxBoolCast(Condition, false); Condition = new FxBoolCast(Condition, false);