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

- a bit of cleanup.

Browse source
This commit is contained in:
Christoph Oelckers 2016-10-09 22:01:23 +02:00
parent ad43f2bc7e
commit 4ecd7dd13a
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/zscript/zcc_compile.cpp
View file

@ -1123,12 +1123,14 @@ void ZCCCompiler::CompileAllFields()
} }
} }
} }
// report all entries // This really should never happen, but if it does, let's better print an error.
if (Structs.Size() > 0) for (auto s : Structs)
{ {
Error(s.strct, "Unable to resolve all fields for struct %s", FName(s->NodeName).GetChars());
} }
if (Classes.Size() > 0) for (auto s : Classes)
{ {
Error(s.cls, "Unable to resolve all fields for class %s", FName(s->NodeName).GetChars());
} }
} }
@ -1142,7 +1144,6 @@ void ZCCCompiler::CompileAllFields()
bool ZCCCompiler::CompileFields(PStruct *type, TArray<ZCC_VarDeclarator *> &Fields, PClass *Outer, bool forstruct) bool ZCCCompiler::CompileFields(PStruct *type, TArray<ZCC_VarDeclarator *> &Fields, PClass *Outer, bool forstruct)
{ {
Printf("Adding fields to %s, original size is %d\n", type->TypeName.GetChars(), type->Size);
while (Fields.Size() > 0) while (Fields.Size() > 0)
{ {
auto field = Fields[0]; auto field = Fields[0];
@ -1190,18 +1191,9 @@ bool ZCCCompiler::CompileFields(PStruct *type, TArray<ZCC_VarDeclarator *> &Fiel
} }
type->AddField(name->Name, thisfieldtype, varflags); type->AddField(name->Name, thisfieldtype, varflags);
Printf("Added field %s, new size is %d\n", FName(name->Name).GetChars(), type->Size);
name = static_cast<ZCC_VarName*>(name->SiblingNext); name = static_cast<ZCC_VarName*>(name->SiblingNext);
} while (name != field->Names); } while (name != field->Names);
Fields.Delete(0); Fields.Delete(0);
}
if (Fields.Size() > 0)
{
Printf("%d fields unprocessed\n", Fields.Size());
} }
return Fields.Size() == 0; return Fields.Size() == 0;
} }
@ -1363,7 +1355,6 @@ PType *ZCCCompiler::DetermineType(PType *outertype, ZCC_VarDeclarator *field, ZC
PType *ZCCCompiler::ResolveUserType(ZCC_BasicType *type, PSymbolTable *symt) PType *ZCCCompiler::ResolveUserType(ZCC_BasicType *type, PSymbolTable *symt)
{ {
Printf("Resolving user type %s\n", FName(type->UserType->Id).GetChars());
// Check the symbol table for the identifier. // Check the symbol table for the identifier.
PSymbolTable *table; PSymbolTable *table;
PSymbol *sym = symt->FindSymbolInTable(type->UserType->Id, table); PSymbol *sym = symt->FindSymbolInTable(type->UserType->Id, table);