Skip to content

Commit bc8feea

Browse files
yfakariyayfakariya
committed
Inlining ByteArrayPacker/StreamPacker.
This commit unifies and inlines packer impls to MessagePackXxxPacker.
1 parent b544276 commit bc8feea

29 files changed

Lines changed: 3334 additions & 4405 deletions

‎src/MsgPack.Silverlight.5/MsgPack.Silverlight.5.csproj‎

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,6 @@
9898
<Compile Include="..\MsgPack\ByteArrayPacker.cs">
9999
<Link>ByteArrayPacker.cs</Link>
100100
</Compile>
101-
<Compile Include="..\MsgPack\ByteArrayPackerWriter.cs">
102-
<Link>ByteArrayPackerWriter.cs</Link>
103-
</Compile>
104-
<Compile Include="..\MsgPack\ByteArrayPackerWriter.TypedWrite.cs">
105-
<Link>ByteArrayPackerWriter.TypedWrite.cs</Link>
106-
</Compile>
107101
<Compile Include="..\MsgPack\ByteArrayUnpacker.cs">
108102
<Link>ByteArrayUnpacker.cs</Link>
109103
</Compile>
@@ -125,18 +119,12 @@
125119
<Compile Include="..\MsgPack\CollectionType.cs">
126120
<Link>CollectionType.cs</Link>
127121
</Compile>
128-
<Compile Include="..\MsgPack\DefaultByteArrayPacker.cs">
129-
<Link>DefaultByteArrayPacker.cs</Link>
130-
</Compile>
131122
<Compile Include="..\MsgPack\DefaultByteArrayUnpacker.cs">
132123
<Link>DefaultByteArrayUnpacker.cs</Link>
133124
</Compile>
134125
<Compile Include="..\MsgPack\DefaultByteArrayUnpacker.Unpacking.cs">
135126
<Link>DefaultByteArrayUnpacker.Unpacking.cs</Link>
136127
</Compile>
137-
<Compile Include="..\MsgPack\DefaultStreamPacker.cs">
138-
<Link>DefaultStreamPacker.cs</Link>
139-
</Compile>
140128
<Compile Include="..\MsgPack\DefaultStreamUnpacker.cs">
141129
<Link>DefaultStreamUnpacker.cs</Link>
142130
</Compile>
@@ -185,6 +173,12 @@
185173
<Compile Include="..\MsgPack\MessageNotSupportedException.cs">
186174
<Link>MessageNotSupportedException.cs</Link>
187175
</Compile>
176+
<Compile Include="..\MsgPack\MessagePackByteArrayPacker.cs">
177+
<Link>MessagePackByteArrayPacker.cs</Link>
178+
</Compile>
179+
<Compile Include="..\MsgPack\MessagePackByteArrayPacker.Pack.cs">
180+
<Link>MessagePackByteArrayPacker.Pack.cs</Link>
181+
</Compile>
188182
<Compile Include="..\MsgPack\MessagePackCode.cs">
189183
<Link>MessagePackCode.cs</Link>
190184
</Compile>
@@ -221,14 +215,11 @@
221215
<Compile Include="..\MsgPack\MessagePackObjectEqualityComparer.cs">
222216
<Link>MessagePackObjectEqualityComparer.cs</Link>
223217
</Compile>
224-
<Compile Include="..\MsgPack\MessagePackPacker.cs">
225-
<Link>MessagePackPacker.cs</Link>
218+
<Compile Include="..\MsgPack\MessagePackStreamPacker.cs">
219+
<Link>MessagePackStreamPacker.cs</Link>
226220
</Compile>
227-
<Compile Include="..\MsgPack\MessagePackPacker`1.cs">
228-
<Link>MessagePackPacker`1.cs</Link>
229-
</Compile>
230-
<Compile Include="..\MsgPack\MessagePackPacker`1.Pack.cs">
231-
<Link>MessagePackPacker`1.Pack.cs</Link>
221+
<Compile Include="..\MsgPack\MessagePackStreamPacker.Pack.cs">
222+
<Link>MessagePackStreamPacker.Pack.cs</Link>
232223
</Compile>
233224
<Compile Include="..\MsgPack\MessagePackString.cs">
234225
<Link>MessagePackString.cs</Link>
@@ -260,9 +251,6 @@
260251
<Compile Include="..\MsgPack\Packer.Factory.cs">
261252
<Link>Packer.Factory.cs</Link>
262253
</Compile>
263-
<Compile Include="..\MsgPack\Packer.Leaf.cs">
264-
<Link>Packer.Leaf.cs</Link>
265-
</Compile>
266254
<Compile Include="..\MsgPack\Packer.Nullable.cs">
267255
<Link>Packer.Nullable.cs</Link>
268256
</Compile>
@@ -278,9 +266,6 @@
278266
<Compile Include="..\MsgPack\PackerUnpackerStreamOptions.cs">
279267
<Link>PackerUnpackerStreamOptions.cs</Link>
280268
</Compile>
281-
<Compile Include="..\MsgPack\PackerWriter.cs">
282-
<Link>PackerWriter.cs</Link>
283-
</Compile>
284269
<Compile Include="..\MsgPack\PackingOptions.cs">
285270
<Link>PackingOptions.cs</Link>
286271
</Compile>
@@ -797,15 +782,6 @@
797782
<Compile Include="..\MsgPack\SingleArrayBufferAllocator.cs">
798783
<Link>SingleArrayBufferAllocator.cs</Link>
799784
</Compile>
800-
<Compile Include="..\MsgPack\StreamPacker.cs">
801-
<Link>StreamPacker.cs</Link>
802-
</Compile>
803-
<Compile Include="..\MsgPack\StreamPackerWriter.cs">
804-
<Link>StreamPackerWriter.cs</Link>
805-
</Compile>
806-
<Compile Include="..\MsgPack\StreamPackerWriter.TypedWrite.cs">
807-
<Link>StreamPackerWriter.TypedWrite.cs</Link>
808-
</Compile>
809785
<Compile Include="..\MsgPack\StreamUnpackerReader.cs">
810786
<Link>StreamUnpackerReader.cs</Link>
811787
</Compile>

‎src/MsgPack.Silverlight.WindowsPhone/MsgPack.Silverlight.WindowsPhone.csproj‎

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,6 @@
137137
<Compile Include="..\MsgPack\ByteArrayPacker.cs">
138138
<Link>ByteArrayPacker.cs</Link>
139139
</Compile>
140-
<Compile Include="..\MsgPack\ByteArrayPackerWriter.cs">
141-
<Link>ByteArrayPackerWriter.cs</Link>
142-
</Compile>
143-
<Compile Include="..\MsgPack\ByteArrayPackerWriter.TypedWrite.cs">
144-
<Link>ByteArrayPackerWriter.TypedWrite.cs</Link>
145-
</Compile>
146140
<Compile Include="..\MsgPack\ByteArrayUnpacker.cs">
147141
<Link>ByteArrayUnpacker.cs</Link>
148142
</Compile>
@@ -164,18 +158,12 @@
164158
<Compile Include="..\MsgPack\CollectionType.cs">
165159
<Link>CollectionType.cs</Link>
166160
</Compile>
167-
<Compile Include="..\MsgPack\DefaultByteArrayPacker.cs">
168-
<Link>DefaultByteArrayPacker.cs</Link>
169-
</Compile>
170161
<Compile Include="..\MsgPack\DefaultByteArrayUnpacker.cs">
171162
<Link>DefaultByteArrayUnpacker.cs</Link>
172163
</Compile>
173164
<Compile Include="..\MsgPack\DefaultByteArrayUnpacker.Unpacking.cs">
174165
<Link>DefaultByteArrayUnpacker.Unpacking.cs</Link>
175166
</Compile>
176-
<Compile Include="..\MsgPack\DefaultStreamPacker.cs">
177-
<Link>DefaultStreamPacker.cs</Link>
178-
</Compile>
179167
<Compile Include="..\MsgPack\DefaultStreamUnpacker.cs">
180168
<Link>DefaultStreamUnpacker.cs</Link>
181169
</Compile>
@@ -224,6 +212,12 @@
224212
<Compile Include="..\MsgPack\MessageNotSupportedException.cs">
225213
<Link>MessageNotSupportedException.cs</Link>
226214
</Compile>
215+
<Compile Include="..\MsgPack\MessagePackByteArrayPacker.cs">
216+
<Link>MessagePackByteArrayPacker.cs</Link>
217+
</Compile>
218+
<Compile Include="..\MsgPack\MessagePackByteArrayPacker.Pack.cs">
219+
<Link>MessagePackByteArrayPacker.Pack.cs</Link>
220+
</Compile>
227221
<Compile Include="..\MsgPack\MessagePackCode.cs">
228222
<Link>MessagePackCode.cs</Link>
229223
</Compile>
@@ -260,14 +254,11 @@
260254
<Compile Include="..\MsgPack\MessagePackObjectEqualityComparer.cs">
261255
<Link>MessagePackObjectEqualityComparer.cs</Link>
262256
</Compile>
263-
<Compile Include="..\MsgPack\MessagePackPacker.cs">
264-
<Link>MessagePackPacker.cs</Link>
257+
<Compile Include="..\MsgPack\MessagePackStreamPacker.cs">
258+
<Link>MessagePackStreamPacker.cs</Link>
265259
</Compile>
266-
<Compile Include="..\MsgPack\MessagePackPacker`1.cs">
267-
<Link>MessagePackPacker`1.cs</Link>
268-
</Compile>
269-
<Compile Include="..\MsgPack\MessagePackPacker`1.Pack.cs">
270-
<Link>MessagePackPacker`1.Pack.cs</Link>
260+
<Compile Include="..\MsgPack\MessagePackStreamPacker.Pack.cs">
261+
<Link>MessagePackStreamPacker.Pack.cs</Link>
271262
</Compile>
272263
<Compile Include="..\MsgPack\MessagePackString.cs">
273264
<Link>MessagePackString.cs</Link>
@@ -299,9 +290,6 @@
299290
<Compile Include="..\MsgPack\Packer.Factory.cs">
300291
<Link>Packer.Factory.cs</Link>
301292
</Compile>
302-
<Compile Include="..\MsgPack\Packer.Leaf.cs">
303-
<Link>Packer.Leaf.cs</Link>
304-
</Compile>
305293
<Compile Include="..\MsgPack\Packer.Nullable.cs">
306294
<Link>Packer.Nullable.cs</Link>
307295
</Compile>
@@ -317,9 +305,6 @@
317305
<Compile Include="..\MsgPack\PackerUnpackerStreamOptions.cs">
318306
<Link>PackerUnpackerStreamOptions.cs</Link>
319307
</Compile>
320-
<Compile Include="..\MsgPack\PackerWriter.cs">
321-
<Link>PackerWriter.cs</Link>
322-
</Compile>
323308
<Compile Include="..\MsgPack\PackingOptions.cs">
324309
<Link>PackingOptions.cs</Link>
325310
</Compile>
@@ -845,15 +830,6 @@
845830
<Compile Include="..\MsgPack\SingleArrayBufferAllocator.cs">
846831
<Link>SingleArrayBufferAllocator.cs</Link>
847832
</Compile>
848-
<Compile Include="..\MsgPack\StreamPacker.cs">
849-
<Link>StreamPacker.cs</Link>
850-
</Compile>
851-
<Compile Include="..\MsgPack\StreamPackerWriter.cs">
852-
<Link>StreamPackerWriter.cs</Link>
853-
</Compile>
854-
<Compile Include="..\MsgPack\StreamPackerWriter.TypedWrite.cs">
855-
<Link>StreamPackerWriter.TypedWrite.cs</Link>
856-
</Compile>
857833
<Compile Include="..\MsgPack\StreamUnpackerReader.cs">
858834
<Link>StreamUnpackerReader.cs</Link>
859835
</Compile>

‎src/MsgPack.Unity.Full/MsgPack.Unity.Full.csproj‎

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@
7373
<Compile Include="..\MsgPack\ByteArrayPacker.cs">
7474
<Link>ByteArrayPacker.cs</Link>
7575
</Compile>
76-
<Compile Include="..\MsgPack\ByteArrayPackerWriter.cs">
77-
<Link>ByteArrayPackerWriter.cs</Link>
78-
</Compile>
79-
<Compile Include="..\MsgPack\ByteArrayPackerWriter.TypedWrite.cs">
80-
<Link>ByteArrayPackerWriter.TypedWrite.cs</Link>
81-
</Compile>
8276
<Compile Include="..\MsgPack\ByteArrayUnpacker.cs">
8377
<Link>ByteArrayUnpacker.cs</Link>
8478
</Compile>
@@ -100,18 +94,12 @@
10094
<Compile Include="..\MsgPack\CollectionType.cs">
10195
<Link>CollectionType.cs</Link>
10296
</Compile>
103-
<Compile Include="..\MsgPack\DefaultByteArrayPacker.cs">
104-
<Link>DefaultByteArrayPacker.cs</Link>
105-
</Compile>
10697
<Compile Include="..\MsgPack\DefaultByteArrayUnpacker.cs">
10798
<Link>DefaultByteArrayUnpacker.cs</Link>
10899
</Compile>
109100
<Compile Include="..\MsgPack\DefaultByteArrayUnpacker.Unpacking.cs">
110101
<Link>DefaultByteArrayUnpacker.Unpacking.cs</Link>
111102
</Compile>
112-
<Compile Include="..\MsgPack\DefaultStreamPacker.cs">
113-
<Link>DefaultStreamPacker.cs</Link>
114-
</Compile>
115103
<Compile Include="..\MsgPack\DefaultStreamUnpacker.cs">
116104
<Link>DefaultStreamUnpacker.cs</Link>
117105
</Compile>
@@ -160,6 +148,12 @@
160148
<Compile Include="..\MsgPack\MessageNotSupportedException.cs">
161149
<Link>MessageNotSupportedException.cs</Link>
162150
</Compile>
151+
<Compile Include="..\MsgPack\MessagePackByteArrayPacker.cs">
152+
<Link>MessagePackByteArrayPacker.cs</Link>
153+
</Compile>
154+
<Compile Include="..\MsgPack\MessagePackByteArrayPacker.Pack.cs">
155+
<Link>MessagePackByteArrayPacker.Pack.cs</Link>
156+
</Compile>
163157
<Compile Include="..\MsgPack\MessagePackCode.cs">
164158
<Link>MessagePackCode.cs</Link>
165159
</Compile>
@@ -196,14 +190,11 @@
196190
<Compile Include="..\MsgPack\MessagePackObjectEqualityComparer.cs">
197191
<Link>MessagePackObjectEqualityComparer.cs</Link>
198192
</Compile>
199-
<Compile Include="..\MsgPack\MessagePackPacker.cs">
200-
<Link>MessagePackPacker.cs</Link>
193+
<Compile Include="..\MsgPack\MessagePackStreamPacker.cs">
194+
<Link>MessagePackStreamPacker.cs</Link>
201195
</Compile>
202-
<Compile Include="..\MsgPack\MessagePackPacker`1.cs">
203-
<Link>MessagePackPacker`1.cs</Link>
204-
</Compile>
205-
<Compile Include="..\MsgPack\MessagePackPacker`1.Pack.cs">
206-
<Link>MessagePackPacker`1.Pack.cs</Link>
196+
<Compile Include="..\MsgPack\MessagePackStreamPacker.Pack.cs">
197+
<Link>MessagePackStreamPacker.Pack.cs</Link>
207198
</Compile>
208199
<Compile Include="..\MsgPack\MessagePackString.cs">
209200
<Link>MessagePackString.cs</Link>
@@ -238,9 +229,6 @@
238229
<Compile Include="..\MsgPack\Packer.Factory.cs">
239230
<Link>Packer.Factory.cs</Link>
240231
</Compile>
241-
<Compile Include="..\MsgPack\Packer.Leaf.cs">
242-
<Link>Packer.Leaf.cs</Link>
243-
</Compile>
244232
<Compile Include="..\MsgPack\Packer.Nullable.cs">
245233
<Link>Packer.Nullable.cs</Link>
246234
</Compile>
@@ -256,9 +244,6 @@
256244
<Compile Include="..\MsgPack\PackerUnpackerStreamOptions.cs">
257245
<Link>PackerUnpackerStreamOptions.cs</Link>
258246
</Compile>
259-
<Compile Include="..\MsgPack\PackerWriter.cs">
260-
<Link>PackerWriter.cs</Link>
261-
</Compile>
262247
<Compile Include="..\MsgPack\PackingOptions.cs">
263248
<Link>PackingOptions.cs</Link>
264249
</Compile>
@@ -754,15 +739,6 @@
754739
<Compile Include="..\MsgPack\SingleArrayBufferAllocator.cs">
755740
<Link>SingleArrayBufferAllocator.cs</Link>
756741
</Compile>
757-
<Compile Include="..\MsgPack\StreamPacker.cs">
758-
<Link>StreamPacker.cs</Link>
759-
</Compile>
760-
<Compile Include="..\MsgPack\StreamPackerWriter.cs">
761-
<Link>StreamPackerWriter.cs</Link>
762-
</Compile>
763-
<Compile Include="..\MsgPack\StreamPackerWriter.TypedWrite.cs">
764-
<Link>StreamPackerWriter.TypedWrite.cs</Link>
765-
</Compile>
766742
<Compile Include="..\MsgPack\StreamUnpackerReader.cs">
767743
<Link>StreamUnpackerReader.cs</Link>
768744
</Compile>

‎src/MsgPack.Unity/MsgPack.Unity.csproj‎

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,6 @@
9595
<Compile Include="..\MsgPack\ByteArrayPacker.cs">
9696
<Link>ByteArrayPacker.cs</Link>
9797
</Compile>
98-
<Compile Include="..\MsgPack\ByteArrayPackerWriter.cs">
99-
<Link>ByteArrayPackerWriter.cs</Link>
100-
</Compile>
101-
<Compile Include="..\MsgPack\ByteArrayPackerWriter.TypedWrite.cs">
102-
<Link>ByteArrayPackerWriter.TypedWrite.cs</Link>
103-
</Compile>
10498
<Compile Include="..\MsgPack\ByteArrayUnpacker.cs">
10599
<Link>ByteArrayUnpacker.cs</Link>
106100
</Compile>
@@ -122,18 +116,12 @@
122116
<Compile Include="..\MsgPack\CollectionType.cs">
123117
<Link>CollectionType.cs</Link>
124118
</Compile>
125-
<Compile Include="..\MsgPack\DefaultByteArrayPacker.cs">
126-
<Link>DefaultByteArrayPacker.cs</Link>
127-
</Compile>
128119
<Compile Include="..\MsgPack\DefaultByteArrayUnpacker.cs">
129120
<Link>DefaultByteArrayUnpacker.cs</Link>
130121
</Compile>
131122
<Compile Include="..\MsgPack\DefaultByteArrayUnpacker.Unpacking.cs">
132123
<Link>DefaultByteArrayUnpacker.Unpacking.cs</Link>
133124
</Compile>
134-
<Compile Include="..\MsgPack\DefaultStreamPacker.cs">
135-
<Link>DefaultStreamPacker.cs</Link>
136-
</Compile>
137125
<Compile Include="..\MsgPack\DefaultStreamUnpacker.cs">
138126
<Link>DefaultStreamUnpacker.cs</Link>
139127
</Compile>
@@ -182,6 +170,12 @@
182170
<Compile Include="..\MsgPack\MessageNotSupportedException.cs">
183171
<Link>MessageNotSupportedException.cs</Link>
184172
</Compile>
173+
<Compile Include="..\MsgPack\MessagePackByteArrayPacker.cs">
174+
<Link>MessagePackByteArrayPacker.cs</Link>
175+
</Compile>
176+
<Compile Include="..\MsgPack\MessagePackByteArrayPacker.Pack.cs">
177+
<Link>MessagePackByteArrayPacker.Pack.cs</Link>
178+
</Compile>
185179
<Compile Include="..\MsgPack\MessagePackCode.cs">
186180
<Link>MessagePackCode.cs</Link>
187181
</Compile>
@@ -218,14 +212,11 @@
218212
<Compile Include="..\MsgPack\MessagePackObjectEqualityComparer.cs">
219213
<Link>MessagePackObjectEqualityComparer.cs</Link>
220214
</Compile>
221-
<Compile Include="..\MsgPack\MessagePackPacker.cs">
222-
<Link>MessagePackPacker.cs</Link>
215+
<Compile Include="..\MsgPack\MessagePackStreamPacker.cs">
216+
<Link>MessagePackStreamPacker.cs</Link>
223217
</Compile>
224-
<Compile Include="..\MsgPack\MessagePackPacker`1.cs">
225-
<Link>MessagePackPacker`1.cs</Link>
226-
</Compile>
227-
<Compile Include="..\MsgPack\MessagePackPacker`1.Pack.cs">
228-
<Link>MessagePackPacker`1.Pack.cs</Link>
218+
<Compile Include="..\MsgPack\MessagePackStreamPacker.Pack.cs">
219+
<Link>MessagePackStreamPacker.Pack.cs</Link>
229220
</Compile>
230221
<Compile Include="..\MsgPack\MessagePackString.cs">
231222
<Link>MessagePackString.cs</Link>
@@ -260,9 +251,6 @@
260251
<Compile Include="..\MsgPack\Packer.Factory.cs">
261252
<Link>Packer.Factory.cs</Link>
262253
</Compile>
263-
<Compile Include="..\MsgPack\Packer.Leaf.cs">
264-
<Link>Packer.Leaf.cs</Link>
265-
</Compile>
266254
<Compile Include="..\MsgPack\Packer.Nullable.cs">
267255
<Link>Packer.Nullable.cs</Link>
268256
</Compile>
@@ -278,9 +266,6 @@
278266
<Compile Include="..\MsgPack\PackerUnpackerStreamOptions.cs">
279267
<Link>PackerUnpackerStreamOptions.cs</Link>
280268
</Compile>
281-
<Compile Include="..\MsgPack\PackerWriter.cs">
282-
<Link>PackerWriter.cs</Link>
283-
</Compile>
284269
<Compile Include="..\MsgPack\PackingOptions.cs">
285270
<Link>PackingOptions.cs</Link>
286271
</Compile>
@@ -764,15 +749,6 @@
764749
<Compile Include="..\MsgPack\SingleArrayBufferAllocator.cs">
765750
<Link>SingleArrayBufferAllocator.cs</Link>
766751
</Compile>
767-
<Compile Include="..\MsgPack\StreamPacker.cs">
768-
<Link>StreamPacker.cs</Link>
769-
</Compile>
770-
<Compile Include="..\MsgPack\StreamPackerWriter.cs">
771-
<Link>StreamPackerWriter.cs</Link>
772-
</Compile>
773-
<Compile Include="..\MsgPack\StreamPackerWriter.TypedWrite.cs">
774-
<Link>StreamPackerWriter.TypedWrite.cs</Link>
775-
</Compile>
776752
<Compile Include="..\MsgPack\StreamUnpackerReader.cs">
777753
<Link>StreamUnpackerReader.cs</Link>
778754
</Compile>

0 commit comments

Comments
 (0)