Change to Nullable<T>.GetValueOrDefault() instead of Nullable<T>.Value

hadashiA · Dec 14, 2024 · 406f673 · 406f673
1 parent 4a3101d
commit 406f673
Show file tree

Hide file tree

Showing 28 changed files with 32 additions and 32 deletions.
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/BooleanFormatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/BooleanFormatter.cs
@@ -27,13 +27,13 @@ public class NullableBooleanFormatter : IYamlFormatter<bool?>
 
         public void Serialize(ref Utf8YamlEmitter emitter, bool? value, YamlSerializationContext context)
         {
-            if (value == null)
+            if (value.HasValue)
             {
-                emitter.WriteNull();
+                emitter.WriteBool(value.GetValueOrDefault());
             }
             else
             {
-                emitter.WriteBool(value.Value);
+                emitter.WriteNull();
             }
         }
 

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/ByteFormatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/ByteFormatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, byte? value, YamlSerializatio
         {
             if (value.HasValue)
             {
-                emitter.WriteInt32(value.Value);
+                emitter.WriteInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/CharFormatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/CharFormatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, char? value, YamlSerializatio
         {
             if (value.HasValue)
             {
-                emitter.WriteInt32(value.Value);
+                emitter.WriteInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/DateTimeFormatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/DateTimeFormatter.cs
@@ -56,7 +56,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, DateTime? value, YamlSerializ
             if (value.HasValue)
             {
                 var buf = context.GetBuffer64();
-                if (Utf8Formatter.TryFormat(value.Value, buf, out var bytesWritten, new StandardFormat('O')))
+                if (Utf8Formatter.TryFormat(value.GetValueOrDefault(), buf, out var bytesWritten, new StandardFormat('O')))
                 {
                     emitter.WriteScalar(buf[..bytesWritten]);
                 }

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/Float32Formatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/Float32Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, float? value, YamlSerializati
         {
             if (value.HasValue)
             {
-                emitter.WriteFloat(value.Value);
+                emitter.WriteFloat(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/Float64Formatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/Float64Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, double? value, YamlSerializat
         {
             if (value.HasValue)
             {
-                emitter.WriteDouble(value.Value);
+                emitter.WriteDouble(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/Int16Formatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/Int16Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, short? value, YamlSerializati
         {
             if (value.HasValue)
             {
-                emitter.WriteInt32(value.Value);
+                emitter.WriteInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/Int32Formatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/Int32Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, int? value, YamlSerialization
         {
             if (value.HasValue)
             {
-                emitter.WriteInt32(value.Value);
+                emitter.WriteInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/Int64Formatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/Int64Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, long? value, YamlSerializatio
         {
             if (value.HasValue)
             {
-                emitter.WriteInt64(value.Value);
+                emitter.WriteInt64(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/NullableFormatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/NullableFormatter.cs
@@ -44,7 +44,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, T? value, YamlSerializationCo
         {
             if (value.HasValue)
             {
-                underlyingFormatter.Serialize(ref emitter, value.Value, context);
+                underlyingFormatter.Serialize(ref emitter, value.GetValueOrDefault(), context);
             }
             else
             {

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/SByteFormatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/SByteFormatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, sbyte? value, YamlSerializati
         {
             if (value.HasValue)
             {
-                emitter.WriteInt32(value.Value);
+                emitter.WriteInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/UInt16Formatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/UInt16Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, ushort? value, YamlSerializat
         {
             if (value.HasValue)
             {
-                emitter.WriteUInt32(value.Value);
+                emitter.WriteUInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/UInt32Formatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/UInt32Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, uint? value, YamlSerializatio
         {
             if (value.HasValue)
             {
-                emitter.WriteUInt32(value.Value);
+                emitter.WriteUInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/UInt64Formatter.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/UInt64Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, ulong? value, YamlSerializati
         {
             if (value.HasValue)
             {
-                emitter.WriteUInt64(value.Value);
+                emitter.WriteUInt64(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/BooleanFormatter.cs b/VYaml/Serialization/Formatters/BooleanFormatter.cs
@@ -27,13 +27,13 @@ public class NullableBooleanFormatter : IYamlFormatter<bool?>
 
         public void Serialize(ref Utf8YamlEmitter emitter, bool? value, YamlSerializationContext context)
         {
-            if (value == null)
+            if (value.HasValue)
             {
-                emitter.WriteNull();
+                emitter.WriteBool(value.GetValueOrDefault());
             }
             else
             {
-                emitter.WriteBool(value.Value);
+                emitter.WriteNull();
             }
         }
 

diff --git a/VYaml/Serialization/Formatters/ByteFormatter.cs b/VYaml/Serialization/Formatters/ByteFormatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, byte? value, YamlSerializatio
         {
             if (value.HasValue)
             {
-                emitter.WriteInt32(value.Value);
+                emitter.WriteInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/CharFormatter.cs b/VYaml/Serialization/Formatters/CharFormatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, char? value, YamlSerializatio
         {
             if (value.HasValue)
             {
-                emitter.WriteInt32(value.Value);
+                emitter.WriteInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/DateTimeFormatter.cs b/VYaml/Serialization/Formatters/DateTimeFormatter.cs
@@ -56,7 +56,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, DateTime? value, YamlSerializ
             if (value.HasValue)
             {
                 var buf = context.GetBuffer64();
-                if (Utf8Formatter.TryFormat(value.Value, buf, out var bytesWritten, new StandardFormat('O')))
+                if (Utf8Formatter.TryFormat(value.GetValueOrDefault(), buf, out var bytesWritten, new StandardFormat('O')))
                 {
                     emitter.WriteScalar(buf[..bytesWritten]);
                 }

diff --git a/VYaml/Serialization/Formatters/Float32Formatter.cs b/VYaml/Serialization/Formatters/Float32Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, float? value, YamlSerializati
         {
             if (value.HasValue)
             {
-                emitter.WriteFloat(value.Value);
+                emitter.WriteFloat(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/Float64Formatter.cs b/VYaml/Serialization/Formatters/Float64Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, double? value, YamlSerializat
         {
             if (value.HasValue)
             {
-                emitter.WriteDouble(value.Value);
+                emitter.WriteDouble(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/Int16Formatter.cs b/VYaml/Serialization/Formatters/Int16Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, short? value, YamlSerializati
         {
             if (value.HasValue)
             {
-                emitter.WriteInt32(value.Value);
+                emitter.WriteInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/Int32Formatter.cs b/VYaml/Serialization/Formatters/Int32Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, int? value, YamlSerialization
         {
             if (value.HasValue)
             {
-                emitter.WriteInt32(value.Value);
+                emitter.WriteInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/Int64Formatter.cs b/VYaml/Serialization/Formatters/Int64Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, long? value, YamlSerializatio
         {
             if (value.HasValue)
             {
-                emitter.WriteInt64(value.Value);
+                emitter.WriteInt64(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/NullableFormatter.cs b/VYaml/Serialization/Formatters/NullableFormatter.cs
@@ -44,7 +44,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, T? value, YamlSerializationCo
         {
             if (value.HasValue)
             {
-                underlyingFormatter.Serialize(ref emitter, value.Value, context);
+                underlyingFormatter.Serialize(ref emitter, value.GetValueOrDefault(), context);
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/SByteFormatter.cs b/VYaml/Serialization/Formatters/SByteFormatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, sbyte? value, YamlSerializati
         {
             if (value.HasValue)
             {
-                emitter.WriteInt32(value.Value);
+                emitter.WriteInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/UInt16Formatter.cs b/VYaml/Serialization/Formatters/UInt16Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, ushort? value, YamlSerializat
         {
             if (value.HasValue)
             {
-                emitter.WriteUInt32(value.Value);
+                emitter.WriteUInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/UInt32Formatter.cs b/VYaml/Serialization/Formatters/UInt32Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, uint? value, YamlSerializatio
         {
             if (value.HasValue)
             {
-                emitter.WriteUInt32(value.Value);
+                emitter.WriteUInt32(value.GetValueOrDefault());
             }
             else
             {

diff --git a/VYaml/Serialization/Formatters/UInt64Formatter.cs b/VYaml/Serialization/Formatters/UInt64Formatter.cs
@@ -29,7 +29,7 @@ public void Serialize(ref Utf8YamlEmitter emitter, ulong? value, YamlSerializati
         {
             if (value.HasValue)
             {
-                emitter.WriteUInt64(value.Value);
+                emitter.WriteUInt64(value.GetValueOrDefault());
             }
             else
             {
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 if (value.HasValue)
                 {
-                    emitter.WriteInt32(value.Value);
+                    emitter.WriteInt32(value.GetValueOrDefault());
                 }
                 else
                 {
@@ Expand Down @@