zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-02 22:01:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The compile context for constant evaluation did not initialize its Version member.

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-03 08:44:38 +02:00
parent f7f9746a0f
commit 5cee2b5803
7 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/engine/sc_man.h
View file

@ -12,19 +12,19 @@ struct VersionInfo
uint16_t minor; uint16_t minor;
uint32_t revision; uint32_t revision;
bool operator <=(const VersionInfo& o) const constexpr bool operator <=(const VersionInfo& o) const
{ {
return o.major > this->major || (o.major == this->major && o.minor > this->minor) || (o.major == this->major && o.minor == this->minor && o.revision >= this->revision); return o.major > this->major || (o.major == this->major && o.minor > this->minor) || (o.major == this->major && o.minor == this->minor && o.revision >= this->revision);
} }
bool operator >=(const VersionInfo& o) const constexpr bool operator >=(const VersionInfo& o) const
{ {
return o.major < this->major || (o.major == this->major && o.minor < this->minor) || (o.major == this->major && o.minor == this->minor && o.revision <= this->revision); return o.major < this->major || (o.major == this->major && o.minor < this->minor) || (o.major == this->major && o.minor == this->minor && o.revision <= this->revision);
} }
bool operator > (const VersionInfo& o) const constexpr bool operator > (const VersionInfo& o) const
{ {
return o.major < this->major || (o.major == this->major && o.minor < this->minor) || (o.major == this->major && o.minor == this->minor && o.revision < this->revision); return o.major < this->major || (o.major == this->major && o.minor < this->minor) || (o.major == this->major && o.minor == this->minor && o.revision < this->revision);
} }
bool operator < (const VersionInfo& o) const constexpr bool operator < (const VersionInfo& o) const
{ {
return o.major > this->major || (o.major == this->major && o.minor > this->minor) || (o.major == this->major && o.minor == this->minor && o.revision > this->revision); return o.major > this->major || (o.major == this->major && o.minor > this->minor) || (o.major == this->major && o.minor == this->minor && o.revision > this->revision);
} }
@ -32,7 +32,7 @@ struct VersionInfo
}; };
// Cannot be a constructor because Lemon would puke on it. // Cannot be a constructor because Lemon would puke on it.
inline VersionInfo MakeVersion(unsigned int ma, unsigned int mi, unsigned int re = 0) constexpr VersionInfo MakeVersion(unsigned int ma, unsigned int mi, unsigned int re = 0)
{ {
return{ (uint16_t)ma, (uint16_t)mi, (uint32_t)re }; return{ (uint16_t)ma, (uint16_t)mi, (uint32_t)re };
} }

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

@ -104,8 +104,8 @@ FCompileContext::FCompileContext(PNamespace *cg, PFunction *fnc, PPrototype *ret
if (fnc != nullptr) Class = fnc->OwningClass; if (fnc != nullptr) Class = fnc->OwningClass;
} }
FCompileContext::FCompileContext(PNamespace *cg, PContainerType *cls, bool fromdecorate) FCompileContext::FCompileContext(PNamespace *cg, PContainerType *cls, bool fromdecorate, const VersionInfo& info)
: ReturnProto(nullptr), Function(nullptr), Class(cls), FromDecorate(fromdecorate), StateIndex(-1), StateCount(0), Lump(-1), CurGlobals(cg) : ReturnProto(nullptr), Function(nullptr), Class(cls), FromDecorate(fromdecorate), StateIndex(-1), StateCount(0), Lump(-1), CurGlobals(cg), Version(info)
{ {
} }

2
src/common/scripting/backend/codegen.h
View file

@ -93,7 +93,7 @@ struct FCompileContext
FString VersionString; FString VersionString;
FCompileContext(PNamespace *spc, PFunction *func, PPrototype *ret, bool fromdecorate, int stateindex, int statecount, int lump, const VersionInfo &ver); FCompileContext(PNamespace *spc, PFunction *func, PPrototype *ret, bool fromdecorate, int stateindex, int statecount, int lump, const VersionInfo &ver);
FCompileContext(PNamespace *spc, PContainerType *cls, bool fromdecorate); // only to be used to resolve constants! FCompileContext(PNamespace *spc, PContainerType *cls, bool fromdecorate, const VersionInfo& ver); // only to be used to resolve constants!
PSymbol *FindInClass(FName identifier, PSymbolTable *&symt); PSymbol *FindInClass(FName identifier, PSymbolTable *&symt);
PSymbol *FindInSelfClass(FName identifier, PSymbolTable *&symt); PSymbol *FindInSelfClass(FName identifier, PSymbolTable *&symt);

12
src/common/scripting/frontend/zcc_compile.cpp
View file

@ -68,7 +68,7 @@ const char * ZCCCompiler::GetStringConst(FxExpression *ex, FCompileContext &ctx)
int ZCCCompiler::IntConstFromNode(ZCC_TreeNode *node, PContainerType *cls) int ZCCCompiler::IntConstFromNode(ZCC_TreeNode *node, PContainerType *cls)
{ {
FCompileContext ctx(OutNamespace, cls, false); FCompileContext ctx(OutNamespace, cls, false, mVersion);
FxExpression *ex = new FxIntCast(ConvertNode(node), false); FxExpression *ex = new FxIntCast(ConvertNode(node), false);
ex = ex->Resolve(ctx); ex = ex->Resolve(ctx);
if (ex == nullptr) return 0; if (ex == nullptr) return 0;
@ -82,7 +82,7 @@ int ZCCCompiler::IntConstFromNode(ZCC_TreeNode *node, PContainerType *cls)
FString ZCCCompiler::StringConstFromNode(ZCC_TreeNode *node, PContainerType *cls) FString ZCCCompiler::StringConstFromNode(ZCC_TreeNode *node, PContainerType *cls)
{ {
FCompileContext ctx(OutNamespace, cls, false); FCompileContext ctx(OutNamespace, cls, false, mVersion);
FxExpression *ex = new FxStringCast(ConvertNode(node)); FxExpression *ex = new FxStringCast(ConvertNode(node));
ex = ex->Resolve(ctx); ex = ex->Resolve(ctx);
if (ex == nullptr) return ""; if (ex == nullptr) return "";
@ -1144,7 +1144,7 @@ void ZCCCompiler::AddConstant(ZCC_ConstantWork &constant)
bool ZCCCompiler::CompileConstant(ZCC_ConstantWork *work) bool ZCCCompiler::CompileConstant(ZCC_ConstantWork *work)
{ {
FCompileContext ctx(OutNamespace, work->cls, false); FCompileContext ctx(OutNamespace, work->cls, false, mVersion);
FxExpression *exp = ConvertNode(work->node->Value); FxExpression *exp = ConvertNode(work->node->Value);
try try
{ {
@ -1185,7 +1185,7 @@ void ZCCCompiler::CompileArrays(ZCC_StructWork *work)
ConvertNodeList(values, sas->Values); ConvertNodeList(values, sas->Values);
bool fail = false; bool fail = false;
FCompileContext ctx(OutNamespace, work->Type(), false); FCompileContext ctx(OutNamespace, work->Type(), false, mVersion);
char *destmem = (char *)ClassDataAllocator.Alloc(values.Size() * ztype->Align); char *destmem = (char *)ClassDataAllocator.Alloc(values.Size() * ztype->Align);
memset(destmem, 0, values.Size() * ztype->Align); memset(destmem, 0, values.Size() * ztype->Align);
@ -2014,7 +2014,7 @@ PType *ZCCCompiler::ResolveArraySize(PType *baseType, ZCC_Expression *arraysize,
indices = std::move(fixedIndices); indices = std::move(fixedIndices);
} }
FCompileContext ctx(OutNamespace, cls, false); FCompileContext ctx(OutNamespace, cls, false, mVersion);
for (auto index : indices) for (auto index : indices)
{ {
// There is no float->int casting here. // There is no float->int casting here.
@ -2347,7 +2347,7 @@ void ZCCCompiler::CompileFunction(ZCC_StructWork *c, ZCC_FuncDeclarator *f, bool
FxExpression *x = new FxTypeCast(ConvertNode(p->Default), type, false); FxExpression *x = new FxTypeCast(ConvertNode(p->Default), type, false);
FCompileContext ctx(OutNamespace, c->Type(), false); FCompileContext ctx(OutNamespace, c->Type(), false, mVersion);
x = x->Resolve(ctx); x = x->Resolve(ctx);
if (x != nullptr) if (x != nullptr)

2
src/r_data/models.cpp
View file

@ -280,7 +280,7 @@ void RenderFrameModels(FModelRenderer *renderer, FLevelLocals *Level, const FSpr
//[SM] - if we added any models for the frame to also render, then we also need to update modelsAmount for this smf //[SM] - if we added any models for the frame to also render, then we also need to update modelsAmount for this smf
if (actor->modelData != nullptr) if (actor->modelData != nullptr)
{ {
if (actor->modelData->modelIDs.Size() > modelsamount) if (actor->modelData->modelIDs.Size() > (unsigned)modelsamount)
modelsamount = actor->modelData->modelIDs.Size(); modelsamount = actor->modelData->modelIDs.Size();
} }

2
src/scripting/decorate/thingdef_exp.cpp
View file

@ -83,7 +83,7 @@ FxExpression *ParseExpression (FScanner &sc, PClassActor *cls, PNamespace *spc)
if (spc) if (spc)
{ {
PClassType *vmtype = nullptr == cls ? nullptr : cls->VMType; PClassType *vmtype = nullptr == cls ? nullptr : cls->VMType;
FCompileContext ctx(spc, vmtype, true); FCompileContext ctx(spc, vmtype, true, MakeVersion(0,0));
data = data->Resolve(ctx); data = data->Resolve(ctx);
} }

6
src/scripting/zscript/zcc_compile_doom.cpp
View file

@ -242,7 +242,7 @@ void ZCCDoomCompiler::DispatchProperty(FPropertyInfo *prop, ZCC_PropertyStmt *pr
const char * p = prop->params; const char * p = prop->params;
auto exp = property->Values; auto exp = property->Values;
FCompileContext ctx(OutNamespace, bag.Info->VMType, false); FCompileContext ctx(OutNamespace, bag.Info->VMType, false, mVersion);
while (true) while (true)
{ {
FPropParam conv; FPropParam conv;
@ -425,7 +425,7 @@ void ZCCDoomCompiler::DispatchScriptProperty(PProperty *prop, ZCC_PropertyStmt *
} }
auto exp = property->Values; auto exp = property->Values;
FCompileContext ctx(OutNamespace, bag.Info->VMType, false); FCompileContext ctx(OutNamespace, bag.Info->VMType, false, mVersion);
for (auto f : prop->Variables) for (auto f : prop->Variables)
{ {
void *addr; void *addr;
@ -907,7 +907,7 @@ void ZCCDoomCompiler::CompileStates()
{ {
state.sprite = GetSpriteIndex(sl->Sprite->GetChars()); state.sprite = GetSpriteIndex(sl->Sprite->GetChars());
} }
FCompileContext ctx(OutNamespace, c->Type(), false); FCompileContext ctx(OutNamespace, c->Type(), false, mVersion);
if (CheckRandom(sl->Duration)) if (CheckRandom(sl->Duration))
{ {
auto func = static_cast<ZCC_ExprFuncCall *>(sl->Duration); auto func = static_cast<ZCC_ExprFuncCall *>(sl->Duration);