Merge pull request #11 from Cysharp/object-to-value

Chagne ReadWriter method name, Write/ReadObject -> Write/ReadValue
Cysharp · Sep 30, 2022 · dd4ea81 · dd4ea81
2 parents cbc70e0 + 8b0497b
commit dd4ea81
Show file tree

Hide file tree

Showing 14 changed files with 182 additions and 180 deletions.
diff --git a/sandbox/SandboxConsoleApp/Program.cs b/sandbox/SandboxConsoleApp/Program.cs
@@ -1,4 +1,5 @@
 #pragma warning disable CS8600
+#pragma warning disable CS0169
 
 using MemoryPack;
 using MemoryPack.Formatters;
@@ -20,6 +21,7 @@
 using System.Xml.Linq;
 
 
+Console.WriteLine("foo");
 
 // ---
 

diff --git a/src/MemoryPack.Core/Formatters/ImmutableCollectionFormatters.cs b/src/MemoryPack.Core/Formatters/ImmutableCollectionFormatters.cs
@@ -110,7 +110,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref Immutab
 
             if (length == 1)
             {
-                var item = reader.ReadObject<T>();
+                var item = reader.ReadValue<T>();
                 value = ImmutableList.Create(item);
                 return;
             }
@@ -183,7 +183,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref Immutab
 
             if (length == 1)
             {
-                var item = reader.ReadObject<T>();
+                var item = reader.ReadValue<T>();
                 value = ImmutableQueue.Create(item);
                 return;
             }
@@ -272,7 +272,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref Immutab
 
             if (length == 1)
             {
-                var item = reader.ReadObject<T>();
+                var item = reader.ReadValue<T>();
                 value = ImmutableStack.Create(item);
                 return;
             }
@@ -398,7 +398,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref Immutab
 
             if (length == 1)
             {
-                var item = reader.ReadObject<T>();
+                var item = reader.ReadValue<T>();
                 value = ImmutableHashSet.Create(item);
                 return;
             }
@@ -508,7 +508,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref Immutab
 
             if (length == 1)
             {
-                var item = reader.ReadObject<T>();
+                var item = reader.ReadValue<T>();
                 value = ImmutableSortedSet.Create(item);
                 return;
             }
@@ -562,7 +562,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref IImmuta
 
             if (length == 1)
             {
-                var item = reader.ReadObject<T>();
+                var item = reader.ReadValue<T>();
                 value = ImmutableList.Create(item);
                 return;
             }
@@ -635,7 +635,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref IImmuta
 
             if (length == 1)
             {
-                var item = reader.ReadObject<T>();
+                var item = reader.ReadValue<T>();
                 value = ImmutableQueue.Create(item);
                 return;
             }
@@ -724,7 +724,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref IImmuta
 
             if (length == 1)
             {
-                var item = reader.ReadObject<T>();
+                var item = reader.ReadValue<T>();
                 value = ImmutableStack.Create(item);
                 return;
             }
@@ -850,7 +850,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref IImmuta
 
             if (length == 1)
             {
-                var item = reader.ReadObject<T>();
+                var item = reader.ReadValue<T>();
                 value = ImmutableHashSet.Create(item);
                 return;
             }

diff --git a/src/MemoryPack.Core/Formatters/InterfaceCollectionFormatters.cs b/src/MemoryPack.Core/Formatters/InterfaceCollectionFormatters.cs
@@ -414,8 +414,8 @@ public override void Serialize<TBufferWriter>(ref MemoryPackWriter<TBufferWriter
             }
 
             writer.WriteObjectHeader(2);
-            writer.WriteObject(value.Key);
-            writer.WriteObject<IEnumerable<TElement>>(value); // write as IEnumerable<TElement>
+            writer.WriteValue(value.Key);
+            writer.WriteValue<IEnumerable<TElement>>(value); // write as IEnumerable<TElement>
         }
 
         public override void Deserialize(ref MemoryPackReader reader, scoped ref IGrouping<TKey, TElement>? value)
@@ -428,7 +428,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref IGroupi
 
             if (count != 2) MemoryPackSerializationException.ThrowInvalidPropertyCount(2, count);
 
-            var key = reader.ReadObject<TKey>();
+            var key = reader.ReadValue<TKey>();
             var values = reader.ReadArray<TElement>() as IEnumerable<TElement>;
 
             if (key == null) MemoryPackSerializationException.ThrowDeserializeObjectIsNull(nameof(key));

diff --git a/src/MemoryPack.Core/Formatters/KeyValuePairFormatter.cs b/src/MemoryPack.Core/Formatters/KeyValuePairFormatter.cs
@@ -11,8 +11,8 @@ public override void Serialize<TBufferWriter>(ref MemoryPackWriter<TBufferWriter
         }
 
         writer.WriteObjectHeader(2);
-        writer.WriteObject(value.Key);
-        writer.WriteObject(value.Value);
+        writer.WriteValue(value.Key);
+        writer.WriteValue(value.Value);
     }
 
     public override void Deserialize(ref MemoryPackReader reader, scoped ref KeyValuePair<TKey?, TValue?> value)
@@ -32,8 +32,8 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref KeyValu
         if (count != 2) MemoryPackSerializationException.ThrowInvalidPropertyCount(2, count);
 
         value = new KeyValuePair<TKey?, TValue?>(
-            reader.ReadObject<TKey>(),
-            reader.ReadObject<TValue>()
+            reader.ReadValue<TKey>(),
+            reader.ReadValue<TValue>()
         );
     }
 }
diff --git a/src/MemoryPack.Core/Formatters/LazyFormatter.cs b/src/MemoryPack.Core/Formatters/LazyFormatter.cs
@@ -11,7 +11,7 @@ public override void Serialize<TBufferWriter>(ref MemoryPackWriter<TBufferWriter
         }
 
         writer.WriteObjectHeader(1);
-        writer.WriteObject(value.Value);
+        writer.WriteValue(value.Value);
     }
 
     public override void Deserialize(ref MemoryPackReader reader, scoped ref Lazy<T?>? value)
@@ -24,7 +24,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref Lazy<T?
 
         if (count != 1) MemoryPackSerializationException.ThrowInvalidPropertyCount(1, count);
 
-        var v = reader.ReadObject<T>();
+        var v = reader.ReadValue<T>();
         value = new Lazy<T?>(v);
     }
 }
diff --git a/src/MemoryPack.Core/Formatters/NullableFormatter.cs b/src/MemoryPack.Core/Formatters/NullableFormatter.cs
@@ -26,7 +26,7 @@ public override void Serialize<TBufferWriter>(ref MemoryPackWriter<TBufferWriter
             writer.WriteObjectHeader(1);
         }
 
-        writer.WriteObject(value.Value);
+        writer.WriteValue(value.Value);
     }
 
     public override void Deserialize(ref MemoryPackReader reader, scoped ref T? value)
@@ -45,6 +45,6 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref T? valu
 
         if (count != 1) MemoryPackSerializationException.ThrowInvalidPropertyCount(1, count);
 
-        value = reader.ReadObject<T>();
+        value = reader.ReadValue<T>();
     }
 }