zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed nested structs breaking the ZScript compiler under certain circumstances.

Browse source
This commit is contained in:
Chronos Ouroboros 2020-08-15 10:35:21 -03:00 committed by Christoph Oelckers
parent b8bf812433
commit 0f86f3a62a
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/scripting/core/types.h
View file

@ -101,6 +101,7 @@ public:
VersionInfo mVersion = { 0,0,0 }; VersionInfo mVersion = { 0,0,0 };
uint8_t loadOp, storeOp, moveOp, RegType, RegCount; uint8_t loadOp, storeOp, moveOp, RegType, RegCount;
EScopeFlags ScopeFlags = (EScopeFlags)0; EScopeFlags ScopeFlags = (EScopeFlags)0;
bool SizeKnown = true;
PType(unsigned int size = 1, unsigned int align = 1); PType(unsigned int size = 1, unsigned int align = 1);
virtual ~PType(); virtual ~PType();

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

@ -1476,8 +1476,12 @@ bool ZCCCompiler::CompileFields(PContainerType *type, TArray<ZCC_VarDeclarator *
auto name = field->Names; auto name = field->Names;
do do
{ {
if (fieldtype->Size == 0 && !(varflags & VARF_Native)) // Size not known yet. if ((fieldtype->Size == 0 || !fieldtype->SizeKnown) && !(varflags & VARF_Native)) // Size not known yet.
{ {
if (type != nullptr)
{
type->SizeKnown = false;
}
return false; return false;
} }
@ -1532,6 +1536,10 @@ bool ZCCCompiler::CompileFields(PContainerType *type, TArray<ZCC_VarDeclarator *
if (OutNamespace->Symbols.AddSymbol(f) == nullptr) if (OutNamespace->Symbols.AddSymbol(f) == nullptr)
{ // name is already in use { // name is already in use
if (type != nullptr)
{
type->SizeKnown = false;
}
f->Destroy(); f->Destroy();
return false; return false;
} }
@ -1565,6 +1573,12 @@ bool ZCCCompiler::CompileFields(PContainerType *type, TArray<ZCC_VarDeclarator *
} while (name != field->Names); } while (name != field->Names);
Fields.Delete(0); Fields.Delete(0);
} }
if (type != nullptr)
{
type->SizeKnown = Fields.Size() == 0;
}
return Fields.Size() == 0; return Fields.Size() == 0;
} }