zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-05-30 08:31:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: ZScript did not properly fill in tentatively created classes from defaults processing.

Browse source 
The proper setup for such classes was only done in CreateDerivedClass, but not in FindClassTentative itself. This extends CreateDerivedClass to allow it to create a class without fully initializing it.
This commit is contained in:
Christoph Oelckers 2016-11-12 13:09:19 +01:00
parent e009cbec9e
commit 479b216c06
4 changed files with 36 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/scripting/zscript/zcc_compile.cpp
View file

@ -89,10 +89,6 @@ void ZCCCompiler::ProcessClass(ZCC_Class *cnode, PSymbolTreeNode *treenode)
PSymbolTreeNode *childnode;
ZCC_Enum *enumType = nullptr;
FString name;
name << "nodes - " << FName(cnode->NodeName);
cls->TreeNodes.SetName(name);
// Need to check if the class actually has a body.
if (node != nullptr) do
{
@ -418,7 +414,6 @@ void ZCCCompiler::CreateStructTypes()
s->Outer = s->OuterDef == nullptr? nullptr : s->OuterDef->Type;
s->strct->Type = NewStruct(s->NodeName(), s->Outer);
s->strct->Symbol = new PSymbolType(s->NodeName(), s->Type());
s->Type()->Symbols.SetName(FName(s->NodeName()));
GlobalSymbols.AddSymbol(s->strct->Symbol);
for (auto e : s->Enums)
@ -486,6 +481,7 @@ void ZCCCompiler::CreateClassTypes()
if (me == nullptr)
{
Error(c->cls, "Unknown native class %s", c->NodeName().GetChars());
// Create a placeholder so that the compiler can continue looking for errors.
me = parent->FindClassTentative(c->NodeName());
}
else if (me->bRuntimeClass)
@ -523,12 +519,25 @@ void ZCCCompiler::CreateClassTypes()
}
// We will never get here if the name is a duplicate, so we can just do the assignment.
c->cls->Type = parent->FindClassTentative(c->NodeName());
try
{
c->cls->Type = parent->CreateDerivedClass(c->NodeName(), TentativeClass);
if (c->Type() == nullptr)
{
Error(c->cls, "Class name %s already exists", c->NodeName().GetChars());
}
}
catch (CRecoverableError &err)
{
Error(c->cls, "%s", err.GetMessage());
// create a placeholder so that the compiler can continue looking for errors.
c->cls->Type = nullptr;
}
}
if (c->Type() == nullptr) c->cls->Type = parent->FindClassTentative(c->NodeName());
c->Type()->bExported = true; // this class is accessible to script side type casts. (The reason for this flag is that types like PInt need to be skipped.)
c->cls->Symbol = new PSymbolType(c->NodeName(), c->Type());
GlobalSymbols.AddSymbol(c->cls->Symbol);
c->Type()->Symbols.SetName(c->NodeName());
Classes.Push(c);
OrigClasses.Delete(i--);
donesomething = true;
@ -553,7 +562,6 @@ void ZCCCompiler::CreateClassTypes()
c->cls->Type = RUNTIME_CLASS(DObject)->FindClassTentative(c->NodeName());
c->cls->Symbol = new PSymbolType(c->NodeName(), c->Type());
GlobalSymbols.AddSymbol(c->cls->Symbol);
c->Type()->Symbols.SetName(c->NodeName());
Classes.Push(c);
OrigClasses.Delete(i--);
donesomething = true;
@ -569,7 +577,6 @@ void ZCCCompiler::CreateClassTypes()
Error(c->cls, "Class %s has circular inheritance", FName(c->NodeName()).GetChars());
c->cls->Type = RUNTIME_CLASS(DObject)->FindClassTentative(c->NodeName());
c->cls->Symbol = new PSymbolType(c->NodeName(), c->Type());
c->Type()->Symbols.SetName(FName(c->NodeName()).GetChars());
GlobalSymbols.AddSymbol(c->cls->Symbol);
Classes.Push(c);
}

1
src/scripting/zscript/zcc_parser.cpp
View file

@ -375,7 +375,6 @@ static void DoParse(int lumpnum)
}
PSymbolTable symtable;
symtable.SetName("Global_Node");
ZCCCompiler cc(state, NULL, symtable, GlobalSymbols, lumpnum);
cc.Compile();