zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-06-04 19:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- scriptified ArtiHealingRadius.

Browse source 
- allow switch/case with names.
- fixed break jump target handling for switch/case. This only worked when the break was in the outermost compound statement, those in inner ones were missed.
This commit is contained in:
Christoph Oelckers 2016-11-27 00:18:07 +01:00
parent 796c262285
commit 69d4d36429
9 changed files with 151 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/scripting/codegeneration/codegen.cpp
View file

@ -8338,7 +8338,7 @@ bool FxCompoundStatement::CheckLocalVariable(FName name)
FxSwitchStatement::FxSwitchStatement(FxExpression *cond, FArgumentList &content, const FScriptPosition &pos)
: FxExpression(EFX_SwitchStatement, pos)
{
Condition = new FxIntCast(cond, false);
Condition = cond;
Content = std::move(content);
}
@ -8352,6 +8352,12 @@ FxExpression *FxSwitchStatement::Resolve(FCompileContext &ctx)
CHECKRESOLVED();
SAFE_RESOLVE(Condition, ctx);
if (Condition->ValueType != TypeName)
{
Condition = new FxIntCast(Condition, false);
SAFE_RESOLVE(Condition, ctx);
}
if (Content.Size() == 0)
{
ScriptPosition.Message(MSG_WARNING, "Empty switch statement");
@ -8370,15 +8376,15 @@ FxExpression *FxSwitchStatement::Resolve(FCompileContext &ctx)
}
}
auto outerctrl = ctx.ControlStmt;
ctx.ControlStmt = this;
for (auto &line : Content)
{
// Do not resolve breaks, they need special treatment inside switch blocks.
if (line->ExprType != EFX_JumpStatement || static_cast<FxJumpStatement *>(line)->Token != TK_Break)
{
SAFE_RESOLVE(line, ctx);
line->NeedResult = false;
}
SAFE_RESOLVE(line, ctx);
line->NeedResult = false;
}
ctx.ControlStmt = outerctrl;
if (Condition->isConstant())
{
@ -8398,6 +8404,12 @@ FxExpression *FxSwitchStatement::Resolve(FCompileContext &ctx)
auto casestmt = static_cast<FxCaseStatement *>(content[i]);
if (casestmt->Condition == nullptr) defaultindex = i;
else if (casestmt->CaseValue == static_cast<FxConstant *>(Condition)->GetValue().GetInt()) caseindex = i;
if (casestmt->Condition && casestmt->Condition->ValueType != Condition->ValueType)
{
casestmt->Condition->ScriptPosition.Message(MSG_ERROR, "Type mismatch in case statement");
delete this;
return nullptr;
}
}
if (content[i]->ExprType == EFX_JumpStatement && static_cast<FxJumpStatement *>(content[i])->Token == TK_Break)
{
@ -8478,7 +8490,6 @@ ExpEmit FxSwitchStatement::Emit(VMFunctionBuilder *build)
ca.jumpaddress = build->Emit(OP_JMP, 0);
}
size_t DefaultAddress = build->Emit(OP_JMP, 0);
TArray<size_t> BreakAddresses;
bool defaultset = false;
for (auto line : Content)
@ -8504,22 +8515,14 @@ ExpEmit FxSwitchStatement::Emit(VMFunctionBuilder *build)
}
break;
case EFX_JumpStatement:
if (static_cast<FxJumpStatement *>(line)->Token == TK_Break)
{
BreakAddresses.Push(build->Emit(OP_JMP, 0));
break;
}
// fall through for continue.
default:
line->Emit(build);
break;
}
}
for (auto addr : BreakAddresses)
for (auto addr : Breaks)
{
build->BackpatchToHere(addr);
build->BackpatchToHere(addr->Address);
}
if (!defaultset) build->BackpatchToHere(DefaultAddress);
Content.DeleteAndClear();
@ -8555,7 +8558,7 @@ bool FxSwitchStatement::CheckReturn()
FxCaseStatement::FxCaseStatement(FxExpression *cond, const FScriptPosition &pos)
: FxExpression(EFX_CaseStatement, pos)
{
Condition = cond? new FxIntCast(cond, false) : nullptr;
Condition = cond;
}
FxCaseStatement::~FxCaseStatement()
@ -8576,7 +8579,17 @@ FxExpression *FxCaseStatement::Resolve(FCompileContext &ctx)
delete this;
return nullptr;
}
CaseValue = static_cast<FxConstant *>(Condition)->GetValue().GetInt();
// Case labels can be ints or names.
if (Condition->ValueType != TypeName)
{
Condition = new FxIntCast(Condition, false);
SAFE_RESOLVE(Condition, ctx);
CaseValue = static_cast<FxConstant *>(Condition)->GetValue().GetInt();
}
else
{
CaseValue = static_cast<FxConstant *>(Condition)->GetValue().GetName();
}
}
return this;
}
@ -8747,10 +8760,13 @@ bool FxIfStatement::CheckReturn()
FxExpression *FxLoopStatement::Resolve(FCompileContext &ctx)
{
auto outerctrl = ctx.ControlStmt;
auto outer = ctx.Loop;
ctx.ControlStmt = this;
ctx.Loop = this;
auto x = DoResolve(ctx);
ctx.Loop = outer;
ctx.ControlStmt = outerctrl;
return x;
}
@ -9074,9 +9090,17 @@ FxExpression *FxJumpStatement::Resolve(FCompileContext &ctx)
{
CHECKRESOLVED();
if (ctx.Loop != nullptr)
if (ctx.ControlStmt != nullptr)
{
ctx.Loop->Jumps.Push(this);
if (ctx.ControlStmt == ctx.Loop || Token == TK_Continue)
{
ctx.Loop->Jumps.Push(this);
}
else
{
// break in switch.
static_cast<FxSwitchStatement*>(ctx.ControlStmt)->Breaks.Push(this);
}
return this;
}
else

3
src/scripting/codegeneration/codegen.h
View file

@ -72,6 +72,7 @@ typedef TDeletingArray<FxExpression*> FArgumentList;
struct FCompileContext
{
FxExpression *ControlStmt = nullptr;
FxLoopStatement *Loop = nullptr;
FxCompoundStatement *Block = nullptr;
PPrototype *ReturnProto;
@ -1656,6 +1657,8 @@ class FxSwitchStatement : public FxExpression
TArray<CaseAddr> CaseAddresses;
public:
TArray<FxJumpStatement *> Breaks;
FxSwitchStatement(FxExpression *cond, FArgumentList &content, const FScriptPosition &pos);
~FxSwitchStatement();
FxExpression *Resolve(FCompileContext&);