Skip to content

Commit dd4ea81

Browse files
neueccneuecc
authored
Merge pull request #11 from Cysharp/object-to-value
Chagne ReadWriter method name, Write/ReadObject -> Write/ReadValue
2 parents cbc70e0 + 8b0497b commit dd4ea81

14 files changed

+182
-180
lines changed

‎sandbox/SandboxConsoleApp/Program.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#pragma warning disable CS8600
2+
#pragma warning disable CS0169
23

34
using MemoryPack;
45
using MemoryPack.Formatters;
@@ -20,6 +21,7 @@
2021
using System.Xml.Linq;
2122

2223

24+
Console.WriteLine("foo");
2325

2426
// ---
2527

‎src/MemoryPack.Core/Formatters/ImmutableCollectionFormatters.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref Immutab
110110

111111
if (length == 1)
112112
{
113-
var item = reader.ReadObject<T>();
113+
var item = reader.ReadValue<T>();
114114
value = ImmutableList.Create(item);
115115
return;
116116
}
@@ -183,7 +183,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref Immutab
183183

184184
if (length == 1)
185185
{
186-
var item = reader.ReadObject<T>();
186+
var item = reader.ReadValue<T>();
187187
value = ImmutableQueue.Create(item);
188188
return;
189189
}
@@ -272,7 +272,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref Immutab
272272

273273
if (length == 1)
274274
{
275-
var item = reader.ReadObject<T>();
275+
var item = reader.ReadValue<T>();
276276
value = ImmutableStack.Create(item);
277277
return;
278278
}
@@ -398,7 +398,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref Immutab
398398

399399
if (length == 1)
400400
{
401-
var item = reader.ReadObject<T>();
401+
var item = reader.ReadValue<T>();
402402
value = ImmutableHashSet.Create(item);
403403
return;
404404
}
@@ -508,7 +508,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref Immutab
508508

509509
if (length == 1)
510510
{
511-
var item = reader.ReadObject<T>();
511+
var item = reader.ReadValue<T>();
512512
value = ImmutableSortedSet.Create(item);
513513
return;
514514
}
@@ -562,7 +562,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref IImmuta
562562

563563
if (length == 1)
564564
{
565-
var item = reader.ReadObject<T>();
565+
var item = reader.ReadValue<T>();
566566
value = ImmutableList.Create(item);
567567
return;
568568
}
@@ -635,7 +635,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref IImmuta
635635

636636
if (length == 1)
637637
{
638-
var item = reader.ReadObject<T>();
638+
var item = reader.ReadValue<T>();
639639
value = ImmutableQueue.Create(item);
640640
return;
641641
}
@@ -724,7 +724,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref IImmuta
724724

725725
if (length == 1)
726726
{
727-
var item = reader.ReadObject<T>();
727+
var item = reader.ReadValue<T>();
728728
value = ImmutableStack.Create(item);
729729
return;
730730
}
@@ -850,7 +850,7 @@ public override void Deserialize(ref MemoryPackReader reader, scoped ref IImmuta
850850

851851
if (length == 1)
852852
{
853-
var item = reader.ReadObject<T>();
853+
var item = reader.ReadValue<T>();
854854
value = ImmutableHashSet.Create(item);
855855
return;
856856
}

‎src/MemoryPack.Core/Formatters/InterfaceCollectionFormatters.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,8 @@ public override void Serialize<TBufferWriter>(ref MemoryPackWriter<TBufferWriter
414414
}
415415

416416
writer.WriteObjectHeader(2);
417-
writer.WriteObject(value.Key);
418-
writer.WriteObject<IEnumerable<TElement>>(value); // write as IEnumerable<TElement>
417+
writer.WriteValue(value.Key);
418+
writer.WriteValue<IEnumerable<TElement>>(value); // write as IEnumerable<TElement>
419419
}
420420

421421
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
428428

429429
if (count != 2) MemoryPackSerializationException.ThrowInvalidPropertyCount(2, count);
430430

431-
var key = reader.ReadObject<TKey>();
431+
var key = reader.ReadValue<TKey>();
432432
var values = reader.ReadArray<TElement>() as IEnumerable<TElement>;
433433

434434
if (key == null) MemoryPackSerializationException.ThrowDeserializeObjectIsNull(nameof(key));

‎src/MemoryPack.Core/Formatters/KeyValuePairFormatter.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public override void Serialize<TBufferWriter>(ref MemoryPackWriter<TBufferWriter
1111
}
1212

1313
writer.WriteObjectHeader(2);
14-
writer.WriteObject(value.Key);
15-
writer.WriteObject(value.Value);
14+
writer.WriteValue(value.Key);
15+
writer.WriteValue(value.Value);
1616
}
1717

1818
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
3232
if (count != 2) MemoryPackSerializationException.ThrowInvalidPropertyCount(2, count);
3333

3434
value = new KeyValuePair<TKey?, TValue?>(
35-
reader.ReadObject<TKey>(),
36-
reader.ReadObject<TValue>()
35+
reader.ReadValue<TKey>(),
36+
reader.ReadValue<TValue>()
3737
);
3838
}
3939
}

‎src/MemoryPack.Core/Formatters/LazyFormatter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public override void Serialize<TBufferWriter>(ref MemoryPackWriter<TBufferWriter
1111
}
1212

1313
writer.WriteObjectHeader(1);
14-
writer.WriteObject(value.Value);
14+
writer.WriteValue(value.Value);
1515
}
1616

1717
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?
2424

2525
if (count != 1) MemoryPackSerializationException.ThrowInvalidPropertyCount(1, count);
2626

27-
var v = reader.ReadObject<T>();
27+
var v = reader.ReadValue<T>();
2828
value = new Lazy<T?>(v);
2929
}
3030
}

‎src/MemoryPack.Core/Formatters/NullableFormatter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public override void Serialize<TBufferWriter>(ref MemoryPackWriter<TBufferWriter
2626
writer.WriteObjectHeader(1);
2727
}
2828

29-
writer.WriteObject(value.Value);
29+
writer.WriteValue(value.Value);
3030
}
3131

3232
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
4545

4646
if (count != 1) MemoryPackSerializationException.ThrowInvalidPropertyCount(1, count);
4747

48-
value = reader.ReadObject<T>();
48+
value = reader.ReadValue<T>();
4949
}
5050
}

0 commit comments

Comments
 (0)