Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ScriptCore: Properly use nullable

Browse Source
This commit is contained in:
Simon Lübeß
2024-01-12 00:17:40 +01:00
parent 3d0c010139
commit 55b4be05c2
6 changed files with 109 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ScriptCore/Serialization/DeserializationObject.cs
+5 -2
View File
@@ -277,7 +277,7 @@ public class DeserializationObject
object currentValue = field.GetValue(obj);
object deserializeValue = DeserializeField(currentValue, field.FieldType, field.Name);
object? deserializeValue = DeserializeField(currentValue, field.FieldType, field.Name);
if (deserializeValue != NoValueDeserialized)
{
@@ -347,7 +347,10 @@ public class DeserializationObject
}
if (fieldType.IsValueType)
{
return DeserializeStruct(fieldName, fieldValue);
// Null Value doesn't make any sense, because we need a value to deserialize into!
Debug.Assert(fieldValue != null);
return DeserializeStruct(fieldName, fieldValue!);
}
if (fieldType.IsClass)
{
ScriptCore/Serialization/DictionarySerializer.cs
+4 -4
View File
@@ -79,9 +79,9 @@ public static class DictionarySerializer
return null;
// Get serialization container for the instance
DeserializationObject deserializedObject = container.GetDeserializedObject(id);
DeserializationObject? deserializedObject = container.GetDeserializedObject(id);
Type type = deserializedObject.StoredType;
Type? type = deserializedObject?.StoredType;
if (type?.IsAssignableTo(fieldType) != true)
return DeserializationObject.NoValueDeserialized;
@@ -89,7 +89,7 @@ public static class DictionarySerializer
Type keyType = fieldType.GetGenericArguments()[0];
Type valueType = fieldType.GetGenericArguments()[1];
int count = deserializedObject.GetFieldValue<int>("Count", SerializationType.Int32);
int count = deserializedObject!.GetFieldValue<int>("Count", SerializationType.Int32);
// Create instance, pass in capacity
object? instance = ActivatorExtension.CreateInstanceSafe(type, count);
@@ -103,7 +103,7 @@ public static class DictionarySerializer
deserializedObject.PushScope(i.ToString());
object? key = deserializedObject.DeserializeField(null, keyType, "Key");
object value = deserializedObject.DeserializeField(null, valueType, "Value");
object? value = deserializedObject.DeserializeField(null, valueType, "Value");
if (key != null)
{
ScriptCore/Serialization/SerializedObject.cs
+17 -15
View File
@@ -18,7 +18,7 @@ public class SerializedObject
private Stack<string> _structScope = new();
private string _structScopeName;
private string _structScopeName = "";
private delegate void SerializeMethod(SerializedObject container, string fieldName, object? fieldValue, Type fieldType);
@@ -86,7 +86,7 @@ public class SerializedObject
_structScopeName = _structScopeName.Remove(_structScopeName.Length - scopeToRemove.Length - 1);
}
public void AddField(string fieldName, SerializationType serializationType, object value, string? fullTypeName = null)
public void AddField(string fieldName, SerializationType serializationType, object? value, string? fullTypeName = null)
{
string completeFieldName = $"{_structScopeName}{fieldName}";
@@ -107,14 +107,14 @@ public class SerializedObject
if (!EntitySerializer.SerializeField(field))
continue;
object fieldValue = field.GetValue(obj);
object? fieldValue = field.GetValue(obj);
Type fieldType = fieldValue?.GetType() ?? field.FieldType;
SerializeField(field.Name, fieldValue, fieldType);
}
}
private bool TryCustomSerializer(string fieldName, object fieldValue, Type fieldType)
private bool TryCustomSerializer(string fieldName, object? fieldValue, Type fieldType)
{
try
{
@@ -142,11 +142,12 @@ public class SerializedObject
return false;
}
public void SerializeField(string fieldName, object fieldValue, Type fieldType)
public void SerializeField(string fieldName, object? fieldValue, Type fieldType)
{
if (fieldType.IsPrimitive || fieldType == typeof(decimal))
{
SerializePrimitive(fieldName, fieldValue, fieldType);
// Primitives can't be null
SerializePrimitive(fieldName, fieldValue!, fieldType);
}
else if (fieldType == typeof(string))
{
@@ -158,14 +159,14 @@ public class SerializedObject
}
else if (fieldType.IsArray)
{
Array myArray = fieldValue as Array;
Array? myArray = fieldValue as Array;
if (myArray?.Rank > 1)
{
throw new NotImplementedException("Serializing multidimensional arrays is not yet supported.");
}
SerializeList(fieldName, fieldValue, fieldType, fieldType.GetElementType());
SerializeList(fieldName, fieldValue, fieldType, fieldType.GetElementType()!);
}
else if (fieldType.IsGenericType)
{
@@ -191,7 +192,8 @@ public class SerializedObject
if (TryCustomSerializer(fieldName, fieldValue, fieldType))
return;
SerializeStruct(fieldName, fieldValue, fieldType);
// Value Types cant be null
SerializeStruct(fieldName, fieldValue!, fieldType);
}
else if (fieldType.IsClass)
{
@@ -206,7 +208,7 @@ public class SerializedObject
}
}
public void SerializeList(string fieldName, object listObject, Type fieldType, Type elementType)
public void SerializeList(string fieldName, object? listObject, Type fieldType, Type elementType)
{
if (listObject == null)
{
@@ -274,9 +276,9 @@ public class SerializedObject
AddField(fieldName, type, fieldValue);
}
public void SerializeEnum(string fieldName, object fieldValue, Type fieldType)
public void SerializeEnum(string fieldName, object? fieldValue, Type fieldType)
{
AddField(fieldName, SerializationType.Enum, fieldValue.ToString());
AddField(fieldName, SerializationType.Enum, fieldValue?.ToString());
}
public void SerializeStruct(string fieldName, object fieldValue, Type fieldType)
@@ -288,15 +290,15 @@ public class SerializedObject
PopScope();
}
public void SerializeClass(string fieldName, object fieldValue, Type fieldType)
public void SerializeClass(string fieldName, object? fieldValue, Type fieldType)
{
if (typeof(Entity).IsAssignableFrom(fieldType))
{
AddField(fieldName, SerializationType.EntityReference, ((Entity)fieldValue)?.UUID ?? UUID.Zero, fieldValue?.GetType().FullName);
AddField(fieldName, SerializationType.EntityReference, ((Entity?)fieldValue)?.UUID ?? UUID.Zero, fieldValue?.GetType().FullName);
}
else if (fieldType.IsSubclassOf(typeof(Component)))
{
AddField(fieldName, SerializationType.ComponentReference, ((Component)fieldValue)?.UUID ?? UUID.Zero, fieldValue?.GetType().FullName);
AddField(fieldName, SerializationType.ComponentReference, ((Component?)fieldValue)?.UUID ?? UUID.Zero, fieldValue?.GetType().FullName);
}
else
{