release 1.7.5

Author: jagt

DataConfig/Source/DataConfigCore/Private/DataConfig/Deserialize/Handlers/Common/DcCoreTypesDeserializers.cpp

@@ -36,7 +36,7 @@ struct FDcScopedSkipStructHandler
 			FDcScopedSkipStructHandler ScopedSkipStructHandler(Ctx.bSkipStructHandlers);\
 			return DcDeserializeUtils::RecursiveDeserialize(Ctx);\
 		}\
-	} while(0)
+	} while (0)
 
 FDcResult HandlerGuidDeserialize(FDcDeserializeContext& Ctx)
 {

DataConfig/Source/DataConfigCore/Private/DataConfig/Deserialize/Handlers/MsgPack/DcMsgPackTransientDeserializers.cpp

@@ -113,7 +113,7 @@ static FORCEINLINE_DEBUGGABLE FDcResult ReadTransientMulticastScriptDelegate(FDc
 	using FInvocationAccess = DcSerDeCommon::FMulticastScriptDelegateAccess::TypeInvocationAccess;
 	DC_TRY(Reader->ReadArrayRoot());
 
-	while(true)
+	while (true)
 	{
 		EDcDataEntry Next;
 		DC_TRY(Reader->PeekRead(&Next));

DataConfig/Source/DataConfigCore/Private/DataConfig/Diagnostic/DcDiagnosticReadWrite.cpp

@@ -44,6 +44,7 @@ static FDcDiagnosticDetail _ReadWriteDetails[] = {
 	{ PipeReadWriteMismatch, TEXT("Pipe visit read write mismatch. Reader peeks '{0}' but writer rejects it.") },
 	//	skip
 	{ SkipOutOfRange, TEXT("Skipping out of range, Container actual length : {0}") },
+	{ SkipNotSupported, TEXT("Skipping not supported") },
 };
 
 FDcDiagnosticGroup Details = {

DataConfig/Source/DataConfigCore/Private/DataConfig/Json/DcJsonReader.cpp

@@ -350,7 +350,7 @@ FDcResult TDcJsonReader<CharType>::SetNewString(const CharType* InStrPtr, int32
 template <typename CharType>
 FDcResult TDcJsonReader<CharType>::Coercion(EDcDataEntry ToEntry, bool* OutPtr)
 {
-	if(bNeedConsumeToken)
+	if (bNeedConsumeToken)
 	{
 		DC_TRY(ConsumeEffectiveToken());
 		bNeedConsumeToken = false;

DataConfig/Source/DataConfigCore/Private/DataConfig/Json/DcJsonWriter.cpp

@@ -530,7 +530,7 @@ void TDcJsonWriter<CharType>::FormatDiagnostic(FDcDiagnostic& Diag)
 
 	TDcSourceView<CharType> View{Sb.GetData(), Sb.Len()};
 	TDcSourceRef<CharType> SpanRef{&View, Sb.Len() - 1, 1};
-	FString FormatHeader(TEXT("Json Last Writes:"));
+	FString FormatHeader(TEXT("JSON Last Writes:"));
 	OutHighlight.Formatted = Highlighter.FormatHighlight(SpanRef, INDEX_NONE, &FormatHeader);
 
 	if (OutHighlight.Formatted.IsEmpty())

DataConfig/Source/DataConfigCore/Private/DataConfig/Property/DcPropertyReadStates.cpp

@@ -71,7 +71,7 @@ FDcResult FDcReadStateClass::PeekRead(FDcPropertyReader* Parent, EDcDataEntry* O
 	}
 	else if (State == EState::ExpectEnd)
 	{
-		ReadOut(OutPtr,EDcDataEntry::ClassEnd);
+		ReadOut(OutPtr, EDcDataEntry::ClassEnd);
 		return DcOk();
 	}
 	else if (State == EState::ExpectNone)

DataConfig/Source/DataConfigCore/Private/DataConfig/Property/DcPropertyReadStates.h

@@ -234,7 +234,7 @@ struct FDcReadStateArray : public FDcBaseReadState
 		ArrayProperty = InArrayProperty;
 	}
 
-	FDcReadStateArray(FProperty* InInnerProperty, void *InArray, EArrayPropertyFlags InArrayFlags)
+	FDcReadStateArray(FProperty* InInnerProperty, void* InArray, EArrayPropertyFlags InArrayFlags)
 		: ArrayHelper(FScriptArrayHelper::CreateHelperFormInnerProperty(InInnerProperty, InArray, InArrayFlags))
 	{
 		ArrayName = DC_TRANSIENT_ARRAY;

DataConfig/Source/DataConfigCore/Private/DataConfig/Property/DcPropertyReader.cpp

@@ -72,7 +72,7 @@ FDcReadStateArray& PushArrayPropertyState(FDcPropertyReader* Reader, void* InArr
 	return Emplace<FDcReadStateArray>(GetTopStorage(Reader), InArrayPtr, InArrayProperty);
 }
 
-FDcReadStateArray& PushArrayPropertyState(FDcPropertyReader* Reader, FProperty* InInnerProperty, void *InArray, EArrayPropertyFlags InArrayFlags)
+FDcReadStateArray& PushArrayPropertyState(FDcPropertyReader* Reader, FProperty* InInnerProperty, void* InArray, EArrayPropertyFlags InArrayFlags)
 {
 	Reader->States.AddUninitialized();
 	return Emplace<FDcReadStateArray>(GetTopStorage(Reader), InInnerProperty, InArray, InArrayFlags);
@@ -107,7 +107,7 @@ FDcReadStateScalar& PushScalarPropertyState(FDcPropertyReader* Reader, void* InP
 FDcReadStateScalar& PushScalarArrayPropertyState(FDcPropertyReader* Reader, void* InPtr, FProperty* InField)
 {
 	Reader->States.AddUninitialized();
-	return Emplace<FDcReadStateScalar>(GetTopStorage(Reader), FDcReadStateScalar::Array, InPtr, InField);;
+	return Emplace<FDcReadStateScalar>(GetTopStorage(Reader), FDcReadStateScalar::Array, InPtr, InField);
 }
 
 void PopState(FDcPropertyReader* Reader)

DataConfig/Source/DataConfigCore/Private/DataConfig/Property/DcPropertyWriteStates.cpp

@@ -574,28 +574,7 @@ FDcResult FDcWriteStateMap::WriteDataEntry(FDcPropertyWriter* Parent, FFieldClas
 
 FDcResult FDcWriteStateMap::SkipWrite(FDcPropertyWriter* Parent)
 {
-	if (State == EState::ExpectKeyOrEnd)
-	{
-		State = EState::ExpectValue;
-		return DcOk();
-	}
-	else if (State == EState::ExpectValue)
-	{
-		++Index;
-
-		if (Index >= MapHelper.Num())
-			return DC_FAIL(DcDReadWrite, SkipOutOfRange)
-				<< MapHelper.Num() << Parent->FormatHighlight();
-
-		State = EState::ExpectKeyOrEnd;
-		return DcOk();
-	}
-	else
-	{
-		return DC_FAIL(DcDReadWrite, InvalidStateWithExpect2)
-			<< (int)EState::ExpectKeyOrEnd << (int)EState::ExpectValue << (int)State
-			<< Parent->FormatHighlight();
-	}
+	return DC_FAIL(DcDReadWrite, SkipNotSupported);
 }
 
 FDcResult FDcWriteStateMap::PeekWriteProperty(FDcPropertyWriter* Parent, FFieldVariant* OutProperty)
@@ -725,18 +704,7 @@ FDcResult FDcWriteStateArray::WriteDataEntry(FDcPropertyWriter* Parent, FFieldCl
 
 FDcResult FDcWriteStateArray::SkipWrite(FDcPropertyWriter* Parent)
 {
-	if (State != EState::ExpectItemOrEnd)
-		return DC_FAIL(DcDReadWrite, InvalidStateWithExpect)
-			<< (int)EState::ExpectItemOrEnd << (int)State
-			<< Parent->FormatHighlight();
-
-	++Index;
-
-	if (Index >= ArrayHelper.Num())
-		return DC_FAIL(DcDReadWrite, SkipOutOfRange)
-			<< ArrayHelper.Num() << Parent->FormatHighlight();
-
-	return DcOk();
+	return DC_FAIL(DcDReadWrite, SkipNotSupported);
 }
 
 FDcResult FDcWriteStateArray::PeekWriteProperty(FDcPropertyWriter* Parent, FFieldVariant* OutProperty)
@@ -856,18 +824,7 @@ FDcResult FDcWriteStateSet::WriteDataEntry(FDcPropertyWriter* Parent, FFieldClas
 
 FDcResult FDcWriteStateSet::SkipWrite(FDcPropertyWriter* Parent)
 {
-	if (State != EState::ExpectItemOrEnd)
-		return DC_FAIL(DcDReadWrite, InvalidStateWithExpect)
-			<< (int)EState::ExpectItemOrEnd << (int)State
-			<< Parent->FormatHighlight();
-
-	++Index;
-
-	if (Index >= SetHelper.Num())
-		return DC_FAIL(DcDReadWrite, SkipOutOfRange)
-			<< SetHelper.Num() << Parent->FormatHighlight();
-
-	return DcOk();
+	return DC_FAIL(DcDReadWrite, SkipNotSupported);
 }
 
 FDcResult FDcWriteStateSet::PeekWriteProperty(FDcPropertyWriter* Parent, FFieldVariant* OutProperty)

DataConfig/Source/DataConfigCore/Private/DataConfig/SerDe/DcSerDeUtils.cpp

@@ -58,7 +58,7 @@ FDcResult TryStaticFindFirstObject(UClass* Class, const TCHAR* Name, bool bExact
 	}
 }
 
-FDcResult TryStaticFindObject(UClass* Class, const FName& PackageName, const FName& AssetName, bool ExactClass, UObject*& OutObject)
+FDcResult TryStaticFindObject(UClass* Class, const FName& PackageName, const FName& AssetName, bool bExactClass, UObject*& OutObject)
 {
 #if UE_VERSION_OLDER_THAN(5, 1, 0)
 	UObject* Ret = nullptr;
@@ -67,11 +67,17 @@ FDcResult TryStaticFindObject(UClass* Class, const FName& PackageName, const FNa
 		 UObject* Package = StaticFindObjectFast(UPackage::StaticClass(),  nullptr, PackageName);
 		 if (Package)
 		 {
-		 	Ret = StaticFindObjectFast(Class, Package, AssetName, ExactClass);
+		 	Ret = StaticFindObjectFast(Class, Package, AssetName, bExactClass);
 		 }
 	}
 #else
-	UObject* Ret = StaticFindObject(Class, FTopLevelAssetPath{PackageName, AssetName}, ExactClass);
+
+#if UE_VERSION_OLDER_THAN(5, 7, 0)
+	UObject* Ret = StaticFindObject(Class, FTopLevelAssetPath{PackageName, AssetName}, bExactClass);
+#else
+	UObject* Ret = StaticFindObject(Class, FTopLevelAssetPath{PackageName, AssetName}, bExactClass ? EFindObjectFlags::ExactClass : EFindObjectFlags::None);
+#endif
+
 #endif
 
 	if (!Ret)
@@ -85,10 +91,16 @@ FDcResult TryStaticFindObject(UClass* Class, const FName& PackageName, const FNa
 	}
 }
 
-FDcResult TryStaticFindObject(UClass* Class, UObject* Outer, const TCHAR* Name, bool ExactClass, UObject*& OutObject)
+FDcResult TryStaticFindObject(UClass* Class, UObject* Outer, const TCHAR* Name, bool bExactClass, UObject*& OutObject)
 {
 	check(Class);
-	UObject* Ret = StaticFindObject(Class, Outer, Name, ExactClass);
+
+#if UE_VERSION_OLDER_THAN(5, 7, 0)
+	UObject* Ret = StaticFindObject(Class, Outer, Name, bExactClass);
+#else
+	UObject* Ret = StaticFindObject(Class, Outer, Name, bExactClass ? EFindObjectFlags::ExactClass : EFindObjectFlags::None);
+#endif
+
 	if (!Ret)
 	{
 		return DC_FAIL(DcDSerDe, UObjectByStrNotFound) << Class->GetFName() << Name;
@@ -291,7 +303,7 @@ FDcResult ReadNoopConsumeValue(FDcReader* Reader)
 	EDcDataEntry Next;
 	DC_TRY(Reader->PeekRead(&Next));
 
-	switch(Next)
+	switch (Next)
 	{
 		case EDcDataEntry::ArrayRoot:
 		{