zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-31 09:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- addressed more shadowed variables in common code.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-24 09:56:02 +01:00
parent 0bb4ec7c33
commit 9e14b168bb
39 changed files with 193 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

22
source/common/scripting/backend/codegen.cpp
View file

@ -522,10 +522,10 @@ FxExpression *FxConstant::MakeConstant(PSymbol *sym, const FScriptPosition &pos)
}
else
{
PSymbolConstString *csym = dyn_cast<PSymbolConstString>(sym);
if (csym != nullptr)
PSymbolConstString *csymbol = dyn_cast<PSymbolConstString>(sym);
if (csymbol != nullptr)
{
x = new FxConstant(csym->Str, pos);
x = new FxConstant(csymbol->Str, pos);
}
else
{
@ -5134,7 +5134,7 @@ ExpEmit FxNew::Emit(VMFunctionBuilder *build)
int outerside = -1;
if (!val->isConstant())
{
int outerside = FScopeBarrier::SideFromFlags(CallingFunction->Variants[0].Flags);
outerside = FScopeBarrier::SideFromFlags(CallingFunction->Variants[0].Flags);
if (outerside == FScopeBarrier::Side_Virtual)
outerside = FScopeBarrier::SideFromObjectFlags(CallingFunction->OwningClass->ScopeFlags);
}
@ -5569,8 +5569,6 @@ FxExpression *FxRandomPick::Resolve(FCompileContext &ctx)
ExpEmit FxRandomPick::Emit(VMFunctionBuilder *build)
{
unsigned i;
assert(choices.Size() > 0);
// Call BuiltinRandom to generate a random number.
@ -5603,7 +5601,7 @@ ExpEmit FxRandomPick::Emit(VMFunctionBuilder *build)
// Allocate space for the jump table.
size_t jumptable = build->Emit(OP_JMP, 0);
for (i = 1; i < choices.Size(); ++i)
for (unsigned i = 1; i < choices.Size(); ++i)
{
build->Emit(OP_JMP, 0);
}
@ -5639,7 +5637,7 @@ ExpEmit FxRandomPick::Emit(VMFunctionBuilder *build)
}
}
// Backpatch each case (except the last, since it ends here) to jump to here.
for (i = 0; i < choices.Size() - 1; ++i)
for (unsigned i = 0; i < choices.Size() - 1; ++i)
{
build->BackpatchToHere(finishes[i]);
}
@ -7855,8 +7853,8 @@ FxExpression *FxFunctionCall::Resolve(FCompileContext& ctx)
}
else if (!ArgList.Size())
{
auto cls = static_cast<PClassType*>(ctx.Class)->Descriptor;
ArgList.Push(new FxConstant(cls, NewClassPointer(cls), ScriptPosition));
auto clss = static_cast<PClassType*>(ctx.Class)->Descriptor;
ArgList.Push(new FxConstant(clss, NewClassPointer(clss), ScriptPosition));
}
func = new FxNew(ArgList[0]);
@ -8369,8 +8367,8 @@ isresolved:
if (!novirtual || !(afd->Variants[0].Flags & VARF_Virtual))
{
auto clstype = PType::toClass(ctx.Class);
auto ccls = PType::toClass(cls);
if (clstype == nullptr || ccls == nullptr || !clstype->Descriptor->IsDescendantOf(ccls->Descriptor))
auto cclss = PType::toClass(cls);
if (clstype == nullptr || cclss == nullptr || !clstype->Descriptor->IsDescendantOf(cclss->Descriptor))
{
ScriptPosition.Message(MSG_ERROR, "Cannot call non-static function %s::%s from here", cls->TypeName.GetChars(), MethodName.GetChars());
delete this;