zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 16:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

ZoneCodeGenerator: Fix forward declarations not being resolved for typedefs

Browse Source
This commit is contained in:
Jan 2019-12-05 02:54:56 +01:00
parent ffda895f95
commit 42e571427b
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/ZoneCodeGenerator/Parsing/C_Header/Impl/HeaderParserState.cs
View File

@ -11,7 +11,7 @@ namespace ZoneCodeGenerator.Parsing.C_Header.Impl
class HeaderParserState : IHeaderParserState class HeaderParserState : IHeaderParserState
{ {
private const int DefaultPack = 8; private const int DefaultPack = 8;
private readonly Block defaultBlock; private readonly Block defaultBlock;
private readonly Stack<int> packStack; private readonly Stack<int> packStack;
private readonly Stack<Block> blockStack; private readonly Stack<Block> blockStack;
@ -78,8 +78,9 @@ namespace ZoneCodeGenerator.Parsing.C_Header.Impl
{ {
var existingForwardDeclaration = forwardDeclarations[forwardDeclaration.FullName]; var existingForwardDeclaration = forwardDeclarations[forwardDeclaration.FullName];
if(existingForwardDeclaration.Type != forwardDeclaration.Type) if (existingForwardDeclaration.Type != forwardDeclaration.Type)
throw new ParserException($"Forward declaration of type '{forwardDeclaration.FullName}' already done with different type."); throw new ParserException(
$"Forward declaration of type '{forwardDeclaration.FullName}' already done with different type.");
} }
else else
{ {
@ -91,7 +92,8 @@ namespace ZoneCodeGenerator.Parsing.C_Header.Impl
{ {
var currentNamespaceTypename = Namespace.Combine(CurrentNamespace, typename); var currentNamespaceTypename = Namespace.Combine(CurrentNamespace, typename);
var baseType = DataTypeBaseType.BASE_TYPES.FirstOrDefault(databaseBaseType => databaseBaseType.Name.Equals(typename)); var baseType =
DataTypeBaseType.BASE_TYPES.FirstOrDefault(databaseBaseType => databaseBaseType.Name.Equals(typename));
if (baseType != null) if (baseType != null)
return baseType; return baseType;
@ -100,7 +102,7 @@ namespace ZoneCodeGenerator.Parsing.C_Header.Impl
{ {
return dataTypes[typename]; return dataTypes[typename];
} }
if (dataTypes.ContainsKey(currentNamespaceTypename)) if (dataTypes.ContainsKey(currentNamespaceTypename))
{ {
return dataTypes[currentNamespaceTypename]; return dataTypes[currentNamespaceTypename];
@ -121,7 +123,7 @@ namespace ZoneCodeGenerator.Parsing.C_Header.Impl
public EnumMember FindEnumMember(string enumMemberName) public EnumMember FindEnumMember(string enumMemberName)
{ {
foreach(var block in blockStack) foreach (var block in blockStack)
{ {
if (!(block is BlockEnum blockEnum)) continue; if (!(block is BlockEnum blockEnum)) continue;
@ -147,7 +149,7 @@ namespace ZoneCodeGenerator.Parsing.C_Header.Impl
private void ResolveForwardDeclarations() private void ResolveForwardDeclarations()
{ {
foreach(var forwardDeclaration in forwardDeclarations.Values) foreach (var forwardDeclaration in forwardDeclarations.Values)
{ {
var foundType = FindType(forwardDeclaration.FullName); var foundType = FindType(forwardDeclaration.FullName);
@ -159,19 +161,25 @@ namespace ZoneCodeGenerator.Parsing.C_Header.Impl
foreach (var dataType in dataTypes.Values) foreach (var dataType in dataTypes.Values)
{ {
if (!(dataType is DataTypeWithMembers dataTypeWithMembers)) continue; if (dataType is DataTypeWithMembers dataTypeWithMembers)
foreach (var variable in dataTypeWithMembers.Members)
{ {
if (variable.VariableType.Type is ForwardDeclaration forwardDeclaration) foreach (var variable in dataTypeWithMembers.Members)
variable.VariableType.Type = forwardDeclaration.ForwardedType; {
if (variable.VariableType.Type is ForwardDeclaration forwardDeclaration)
variable.VariableType.Type = forwardDeclaration.ForwardedType;
}
}
else if (dataType is DataTypeTypedef typeDef)
{
if (typeDef.TypeDefinition.Type is ForwardDeclaration forwardDeclaration)
typeDef.TypeDefinition.Type = forwardDeclaration.ForwardedType;
} }
} }
} }
public void FinishAndSaveTo(IDataRepository dataRepository) public void FinishAndSaveTo(IDataRepository dataRepository)
{ {
if(blockStack.Count > 0) if (blockStack.Count > 0)
throw new ParserException($"Parsing finished but {blockStack.Count} blocks were not closed."); throw new ParserException($"Parsing finished but {blockStack.Count} blocks were not closed.");
ResolveForwardDeclarations(); ResolveForwardDeclarations();
@ -205,4 +213,4 @@ namespace ZoneCodeGenerator.Parsing.C_Header.Impl
return CurrentBlock.GetAvailableTests(); return CurrentBlock.GetAvailableTests();
} }
} }
} }

9
src/ZoneCodeGenerator/Persistence/InMemoryDataRepository.cs
View File

@ -112,7 +112,14 @@ namespace ZoneCodeGenerator.Persistence
{ {
StructureInformation memberStructureInformation = null; StructureInformation memberStructureInformation = null;
if (member.VariableType.Type is DataTypeWithMembers memberType) var memberDataType = member.VariableType.Type;
while (memberDataType is DataTypeTypedef typedef)
{
memberDataType = typedef.TypeDefinition.Type;
}
if (memberDataType is DataTypeWithMembers memberType)
{ {
memberStructureInformation = GetInformationFor(memberType); memberStructureInformation = GetInformationFor(memberType);
} }