authorgravatar for tgschultz@gmail.comtgschultz <tgschultz@gmail.com> 2018-11-23 22:29:40-06:00
committergravatar for tgschultz@gmail.comtgschultz <tgschultz@gmail.com> 2018-11-30 14:50:17-06:00
logb6489ff90afffcf0c69490efcb5941f3bb42fc3c
tree4d026713079564b7703a649766326791202f467e
parent1ab66f3b55bbeac3c6f4f02c86a688cdc1bb2476

Increased range of bitwidths tested by "serialize/deserialize Int" tests. Added tests for float inf and NaN.

2 files changed, 61 insertions(+), 8 deletions(-)

std/io.zig+6-1
...@@ -1050,8 +1050,13 @@ pub fn Deserializer(endian: builtin.Endian, is_packed: bool, comptime Error: typ...@@ -1050,8 +1050,13 @@ pub fn Deserializer(endian: builtin.Endian, is_packed: bool, comptime Error: typ
1050 else => in_stream,1050 else => in_stream,
1051 } };1051 } };
1052 }1052 }
1053
1054 pub fn alignToByte(self: *Self) void {
1055 if(!is_packed) return;
1056 self.in_stream.alignToByte();
1057 }
10531058
1054 //@BUG: inferred error issue1059 //@BUG: inferred error issue. See: #1386
1055 fn deserializeInt(self: *Self, comptime T: type) (Stream.Error || error{EndOfStream})!T {1060 fn deserializeInt(self: *Self, comptime T: type) (Stream.Error || error{EndOfStream})!T {
1056 debug.assert(trait.is(builtin.TypeId.Int)(T) or trait.is(builtin.TypeId.Float)(T));1061 debug.assert(trait.is(builtin.TypeId.Int)(T) or trait.is(builtin.TypeId.Float)(T));
10571062
std/io_test.zig+55-7
...@@ -253,7 +253,8 @@ test "BitOutStream" {...@@ -253,7 +253,8 @@ test "BitOutStream" {
253}253}
254254
255fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime is_packed: bool) !void {255fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime is_packed: bool) !void {
256 const max_test_bitsize = 17;256 //@NOTE: if this test is taking too long, reduce the maximum tested bitsize
257 const max_test_bitsize = 128;
257 258
258 const total_bytes = comptime blk: {259 const total_bytes = comptime blk: {
259 var bytes = 0;260 var bytes = 0;
...@@ -278,7 +279,7 @@ fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime is_pa...@@ -278,7 +279,7 @@ fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime is_pa
278 const U = @IntType(false, i);279 const U = @IntType(false, i);
279 const S = @IntType(true, i);280 const S = @IntType(true, i);
280 try serializer.serializeInt(U(i));281 try serializer.serializeInt(U(i));
281 if (i != 0) try serializer.serializeInt(S(-1));282 if (i != 0) try serializer.serializeInt(S(-1)) else try serializer.serialize(S(0));
282 }283 }
283 try serializer.flush();284 try serializer.flush();
284285
...@@ -287,9 +288,9 @@ fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime is_pa...@@ -287,9 +288,9 @@ fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime is_pa
287 const U = @IntType(false, i);288 const U = @IntType(false, i);
288 const S = @IntType(true, i);289 const S = @IntType(true, i);
289 const x = try deserializer.deserializeInt(U);290 const x = try deserializer.deserializeInt(U);
290 const y = if (i != 0) try deserializer.deserializeInt(S);291 const y = try deserializer.deserializeInt(S);
291 assert(x == U(i));292 assert(x == U(i));
292 if (i != 0) assert(y == S(-1));293 if (i != 0) assert(y == S(-1)) else assert(y == 0);
293 }294 }
294295
295 const u8_bit_count = comptime meta.bitCount(u8);296 const u8_bit_count = comptime meta.bitCount(u8);
...@@ -299,8 +300,6 @@ fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime is_pa...@@ -299,8 +300,6 @@ fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime is_pa
299 const extra_packed_byte = @boolToInt(total_bits % u8_bit_count > 0);300 const extra_packed_byte = @boolToInt(total_bits % u8_bit_count > 0);
300 const total_packed_bytes = (total_bits / u8_bit_count) + extra_packed_byte;301 const total_packed_bytes = (total_bits / u8_bit_count) + extra_packed_byte;
301302
302
303
304 assert(in.pos == if (is_packed) total_packed_bytes else total_bytes);303 assert(in.pos == if (is_packed) total_packed_bytes else total_bytes);
305}304}
306305
...@@ -311,6 +310,56 @@ test "Serializer/Deserializer Int" {...@@ -311,6 +310,56 @@ test "Serializer/Deserializer Int" {
311 try testIntSerializerDeserializer(builtin.Endian.Little, true);310 try testIntSerializerDeserializer(builtin.Endian.Little, true);
312}311}
313312
313fn testIntSerializerDeserializerInfNaN(comptime endian: builtin.Endian,
314 comptime is_packed: bool) !void
315{
316 const mem_size = (16*2 + 32*2 + 64*2 + 128*2) / comptime meta.bitCount(u8);
317 var data_mem: [mem_size]u8 = undefined;
318
319 var out = io.SliceOutStream.init(data_mem[0..]);
320 const OutError = io.SliceOutStream.Error;
321 var out_stream = &out.stream;
322 var serializer = io.Serializer(endian, is_packed, OutError).init(out_stream);
323
324 var in = io.SliceInStream.init(data_mem[0..]);
325 const InError = io.SliceInStream.Error;
326 var in_stream = &in.stream;
327 var deserializer = io.Deserializer(endian, is_packed, InError).init(in_stream);
328
329 //@TODO: isInf/isNan not currently implemented for f128.
330 try serializer.serialize(std.math.nan(f16));
331 try serializer.serialize(std.math.inf(f16));
332 try serializer.serialize(std.math.nan(f32));
333 try serializer.serialize(std.math.inf(f32));
334 try serializer.serialize(std.math.nan(f64));
335 try serializer.serialize(std.math.inf(f64));
336 //try serializer.serialize(std.math.nan(f128));
337 //try serializer.serialize(std.math.inf(f128));
338 const nan_check_f16 = try deserializer.deserialize(f16);
339 const inf_check_f16 = try deserializer.deserialize(f16);
340 const nan_check_f32 = try deserializer.deserialize(f32);
341 const inf_check_f32 = try deserializer.deserialize(f32);
342 const nan_check_f64 = try deserializer.deserialize(f64);
343 const inf_check_f64 = try deserializer.deserialize(f64);
344 //const nan_check_f128 = try deserializer.deserialize(f128);
345 //const inf_check_f128 = try deserializer.deserialize(f128);
346 assert(std.math.isNan(nan_check_f16));
347 assert(std.math.isInf(inf_check_f16));
348 assert(std.math.isNan(nan_check_f32));
349 assert(std.math.isInf(inf_check_f32));
350 assert(std.math.isNan(nan_check_f64));
351 assert(std.math.isInf(inf_check_f64));
352 //assert(std.math.isNan(nan_check_f128));
353 //assert(std.math.isInf(inf_check_f128));
354}
355
356test "Serializer/Deserializer Int: Inf/NaN" {
357 try testIntSerializerDeserializerInfNaN(builtin.Endian.Big, false);
358 try testIntSerializerDeserializerInfNaN(builtin.Endian.Little, false);
359 try testIntSerializerDeserializerInfNaN(builtin.Endian.Big, true);
360 try testIntSerializerDeserializerInfNaN(builtin.Endian.Little, true);
361}
362
314fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime is_packed: bool) !void {363fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime is_packed: bool) !void {
315 const ColorType = enum(u4) {364 const ColorType = enum(u4) {
316 RGB8 = 1,365 RGB8 = 1,
...@@ -410,7 +459,6 @@ fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime is_packe...@@ -410,7 +459,6 @@ fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime is_packe
410 try serializer.serialize(my_inst);459 try serializer.serialize(my_inst);
411460
412 const my_copy = try deserializer.deserialize(MyStruct);461 const my_copy = try deserializer.deserialize(MyStruct);
413
414 assert(meta.eql(my_copy, my_inst));462 assert(meta.eql(my_copy, my_inst));
415}463}
416464