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

Add support for nested user types

Browse source 
The grammar already understood these constructs. Now the compiler does too.
This commit is contained in:
Marisa Heit 2022-08-03 23:28:41 -05:00 committed by Christoph Oelckers
parent ef0e9c025e
commit 66460bfeb8
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1813,7 +1813,7 @@ PType *ZCCCompiler::DetermineType(PType *outertype, ZCC_TreeNode *field, FName n
{ {
Error(field, "%s: @ not allowed for user scripts", name.GetChars()); Error(field, "%s: @ not allowed for user scripts", name.GetChars());
} }
retval = ResolveUserType(btype, outertype? &outertype->Symbols : nullptr, true); retval = ResolveUserType(btype, btype->UserType, outertype? &outertype->Symbols : nullptr, true);
break; break;
case ZCC_UserType: case ZCC_UserType:
@ -1837,7 +1837,7 @@ PType *ZCCCompiler::DetermineType(PType *outertype, ZCC_TreeNode *field, FName n
break; break;
default: default:
retval = ResolveUserType(btype, outertype ? &outertype->Symbols : nullptr, false); retval = ResolveUserType(btype, btype->UserType, outertype ? &outertype->Symbols : nullptr, false);
break; break;
} }
break; break;
@ -1936,18 +1936,25 @@ PType *ZCCCompiler::DetermineType(PType *outertype, ZCC_TreeNode *field, FName n
// //
// ZCCCompiler :: ResolveUserType // ZCCCompiler :: ResolveUserType
// //
// resolves a user type and returns a matching PType
//
//========================================================================== //==========================================================================
PType *ZCCCompiler::ResolveUserType(ZCC_BasicType *type, PSymbolTable *symt, bool nativetype) /**
* Resolves a user type and returns a matching PType.
*
* @param type The tree node with the identifiers to look for.
* @param type The current identifier being looked for. This must be in type's UserType list.
* @param symt The symbol table to search in. If id is the first identifier and not found in symt, then OutNamespace will also be searched.
* @param nativetype Distinguishes between searching for a native type or a user type.
* @returns the PType found for this user type
*/
PType *ZCCCompiler::ResolveUserType(ZCC_BasicType *type, ZCC_Identifier *id, PSymbolTable *symt, bool nativetype)
{ {
// Check the symbol table for the identifier. // Check the symbol table for the identifier.
PSymbol *sym = nullptr; PSymbol *sym = nullptr;
// We first look in the current class and its parents, and then in the current namespace and its parents. // We first look in the current class and its parents, and then in the current namespace and its parents.
if (symt != nullptr) sym = symt->FindSymbol(type->UserType->Id, true); if (symt != nullptr) sym = symt->FindSymbol(id->Id, true);
if (sym == nullptr) sym = OutNamespace->Symbols.FindSymbol(type->UserType->Id, true); if (sym == nullptr && type->UserType == id) sym = OutNamespace->Symbols.FindSymbol(id->Id, true);
if (sym != nullptr && sym->IsKindOf(RUNTIME_CLASS(PSymbolType))) if (sym != nullptr && sym->IsKindOf(RUNTIME_CLASS(PSymbolType)))
{ {
auto ptype = static_cast<PSymbolType *>(sym)->Type; auto ptype = static_cast<PSymbolType *>(sym)->Type;
@ -1957,6 +1964,21 @@ PType *ZCCCompiler::ResolveUserType(ZCC_BasicType *type, PSymbolTable *symt, boo
return TypeError; return TypeError;
} }
if (id->SiblingNext != type->UserType)
{
assert(id->SiblingNext->NodeType == AST_Identifier);
ptype = ResolveUserType(
type,
static_cast<ZCC_Identifier *>(id->SiblingNext),
&ptype->Symbols,
nativetype
);
if (ptype == TypeError)
{
return ptype;
}
}
if (ptype->isEnum()) if (ptype->isEnum())
{ {
if (!nativetype) return TypeSInt32; // hack this to an integer until we can resolve the enum mess. if (!nativetype) return TypeSInt32; // hack this to an integer until we can resolve the enum mess.
@ -1976,7 +1998,6 @@ PType *ZCCCompiler::ResolveUserType(ZCC_BasicType *type, PSymbolTable *symt, boo
return TypeError; return TypeError;
} }
//========================================================================== //==========================================================================
// //
// ZCCCompiler :: ResolveArraySize // ZCCCompiler :: ResolveArraySize

2
src/common/scripting/frontend/zcc_compile.h
View file

@ -134,7 +134,7 @@ protected:
FString FlagsToString(uint32_t flags); FString FlagsToString(uint32_t flags);
PType *DetermineType(PType *outertype, ZCC_TreeNode *field, FName name, ZCC_Type *ztype, bool allowarraytypes, bool formember); PType *DetermineType(PType *outertype, ZCC_TreeNode *field, FName name, ZCC_Type *ztype, bool allowarraytypes, bool formember);
PType *ResolveArraySize(PType *baseType, ZCC_Expression *arraysize, PContainerType *cls, bool *nosize); PType *ResolveArraySize(PType *baseType, ZCC_Expression *arraysize, PContainerType *cls, bool *nosize);
PType *ResolveUserType(ZCC_BasicType *type, PSymbolTable *sym, bool nativetype); PType *ResolveUserType(ZCC_BasicType *type, ZCC_Identifier *id, PSymbolTable *sym, bool nativetype);
TArray<ZCC_StructWork *> OrderStructs(); TArray<ZCC_StructWork *> OrderStructs();
void AddStruct(TArray<ZCC_StructWork *> &new_order, ZCC_StructWork *struct_def); void AddStruct(TArray<ZCC_StructWork *> &new_order, ZCC_StructWork *struct_def);
ZCC_StructWork *StructTypeToWork(const PStruct *type) const; ZCC_StructWork *StructTypeToWork(const PStruct *type) const;