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

Set remapped type for previously undefined types for StructuredDataDef

Browse Source
This commit is contained in:
Jan 2022-03-22 12:14:30 +01:00
parent dc075847ff
commit 2fa1144425
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataDefScopeSequences.cpp
View File

@ -47,7 +47,12 @@ namespace sdd::def_scope_sequences
if (existingType != state->m_def_types_by_name.end()) if (existingType != state->m_def_types_by_name.end())
{ {
if (existingType->second.m_category == CommonStructuredDataTypeCategory::UNKNOWN) if (existingType->second.m_category == CommonStructuredDataTypeCategory::UNKNOWN)
existingType->second = CommonStructuredDataType(CommonStructuredDataTypeCategory::ENUM, newEnumIndex); {
assert(existingType->second.m_info.type_index < state->m_undefined_types.size());
auto& undefinedType = state->m_undefined_types[existingType->second.m_info.type_index];
undefinedType.m_mapped_type = CommonStructuredDataType(CommonStructuredDataTypeCategory::ENUM, newEnumIndex);
existingType->second = undefinedType.m_mapped_type;
}
else else
throw ParsingException(nameToken.GetPos(), "Type with this name has already been defined"); throw ParsingException(nameToken.GetPos(), "Type with this name has already been defined");
} }
@ -89,7 +94,12 @@ namespace sdd::def_scope_sequences
if (existingType != state->m_def_types_by_name.end()) if (existingType != state->m_def_types_by_name.end())
{ {
if (existingType->second.m_category == CommonStructuredDataTypeCategory::UNKNOWN) if (existingType->second.m_category == CommonStructuredDataTypeCategory::UNKNOWN)
existingType->second = CommonStructuredDataType(CommonStructuredDataTypeCategory::STRUCT, newStructIndex); {
assert(existingType->second.m_info.type_index < state->m_undefined_types.size());
auto& undefinedType = state->m_undefined_types[existingType->second.m_info.type_index];
undefinedType.m_mapped_type = CommonStructuredDataType(CommonStructuredDataTypeCategory::STRUCT, newStructIndex);
existingType->second = undefinedType.m_mapped_type;
}
else else
throw ParsingException(nameToken.GetPos(), "Type with this name has already been defined"); throw ParsingException(nameToken.GetPos(), "Type with this name has already been defined");
} }