Skip to content

Commit 3a2978f

Browse files
lalinskylalinsky
authored
Merge pull request #2 from jules-sommer/main
Update all references std.builtin.Type, usually via @typeinfo, to following Zig naming conventions
2 parents 879f2f7 + f136d6b commit 3a2978f

8 files changed

Lines changed: 97 additions & 97 deletions

File tree

‎src/any.zig‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ const unpackUnion = @import("union.zig").unpackUnion;
3636

3737
inline fn isString(comptime T: type) bool {
3838
switch (@typeInfo(T)) {
39-
.Pointer => |ptr_info| {
39+
.pointer => |ptr_info| {
4040
if (ptr_info.size == .Slice) {
4141
if (ptr_info.child == u8) {
4242
return true;
4343
}
4444
}
4545
},
46-
.Optional => |opt_info| {
46+
.optional => |opt_info| {
4747
return isString(opt_info.child);
4848
},
4949
else => {},
@@ -53,10 +53,10 @@ inline fn isString(comptime T: type) bool {
5353

5454
pub fn sizeOfPackedAny(comptime T: type, value: T) usize {
5555
switch (@typeInfo(NonOptional(T))) {
56-
.Bool => return getBoolSize(),
57-
.Int => return getIntSize(T, value),
58-
.Float => return getFloatSize(T, value),
59-
.Pointer => |ptr_info| {
56+
.bool => return getBoolSize(),
57+
.int => return getIntSize(T, value),
58+
.float => return getFloatSize(T, value),
59+
.pointer => |ptr_info| {
6060
if (ptr_info.size == .Slice) {
6161
if (isString(T)) {
6262
return sizeOfPackedString(value.len);
@@ -73,13 +73,13 @@ pub fn sizeOfPackedAny(comptime T: type, value: T) usize {
7373
pub fn packAny(writer: anytype, value: anytype) !void {
7474
const T = @TypeOf(value);
7575
switch (@typeInfo(T)) {
76-
.Void => return packNull(writer),
77-
.Bool => return packBool(writer, value),
78-
.Int => return packInt(writer, T, value),
79-
.Float => return packFloat(writer, T, value),
80-
.ComptimeInt => return packInt(writer, i64, @intCast(value)),
81-
.ComptimeFloat => return packFloat(writer, f64, @floatCast(value)),
82-
.Array => |arr_info| {
76+
.void => return packNull(writer),
77+
.bool => return packBool(writer, value),
78+
.int => return packInt(writer, T, value),
79+
.float => return packFloat(writer, T, value),
80+
.comptime_int => return packInt(writer, i64, @intCast(value)),
81+
.comptime_float => return packFloat(writer, f64, @floatCast(value)),
82+
.array => |arr_info| {
8383
switch (arr_info.child) {
8484
u8 => {
8585
return packString(writer, &value);
@@ -89,7 +89,7 @@ pub fn packAny(writer: anytype, value: anytype) !void {
8989
},
9090
}
9191
},
92-
.Pointer => |ptr_info| {
92+
.pointer => |ptr_info| {
9393
if (ptr_info.size == .Slice) {
9494
switch (ptr_info.child) {
9595
u8 => {
@@ -103,9 +103,9 @@ pub fn packAny(writer: anytype, value: anytype) !void {
103103
return packAny(writer, value.*);
104104
}
105105
},
106-
.Struct => return packStruct(writer, T, value),
107-
.Union => return packUnion(writer, T, value),
108-
.Optional => {
106+
.@"struct" => return packStruct(writer, T, value),
107+
.@"union" => return packUnion(writer, T, value),
108+
.optional => {
109109
if (value) |val| {
110110
return packAny(writer, val);
111111
} else {
@@ -119,13 +119,13 @@ pub fn packAny(writer: anytype, value: anytype) !void {
119119

120120
pub fn unpackAny(reader: anytype, allocator: std.mem.Allocator, comptime T: type) !T {
121121
switch (@typeInfo(T)) {
122-
.Void => return unpackNull(reader),
123-
.Bool => return unpackBool(reader, T),
124-
.Int => return unpackInt(reader, T),
125-
.Float => return unpackFloat(reader, T),
126-
.Struct => return unpackStruct(reader, allocator, T),
127-
.Union => return unpackUnion(reader, allocator, T),
128-
.Pointer => |ptr_info| {
122+
.void => return unpackNull(reader),
123+
.bool => return unpackBool(reader, T),
124+
.int => return unpackInt(reader, T),
125+
.float => return unpackFloat(reader, T),
126+
.@"struct" => return unpackStruct(reader, allocator, T),
127+
.@"union" => return unpackUnion(reader, allocator, T),
128+
.pointer => |ptr_info| {
129129
if (ptr_info.size == .Slice) {
130130
if (isString(T)) {
131131
return unpackString(reader, allocator);
@@ -134,7 +134,7 @@ pub fn unpackAny(reader: anytype, allocator: std.mem.Allocator, comptime T: type
134134
}
135135
}
136136
},
137-
.Optional => |opt_info| {
137+
.optional => |opt_info| {
138138
return unpackAny(reader, allocator, opt_info.child) catch |err| {
139139
if (isNullError(err)) {
140140
return null;

‎src/bool.zig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub fn getBoolSize() usize {
1010

1111
inline fn forceBoolType(value: anytype) type {
1212
const T = @TypeOf(value);
13-
if (@typeInfo(T) == .Null) {
13+
if (@typeInfo(T) == .null) {
1414
return ?bool;
1515
}
1616
assertBoolType(T);
@@ -19,8 +19,8 @@ inline fn forceBoolType(value: anytype) type {
1919

2020
inline fn assertBoolType(T: type) void {
2121
switch (@typeInfo(T)) {
22-
.Bool => return,
23-
.Optional => |opt_info| {
22+
.bool => return,
23+
.optional => |opt_info| {
2424
return assertBoolType(opt_info.child);
2525
},
2626
else => @compileError("Expected bool, got " ++ @typeName(T)),

‎src/float.zig‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ const maybeUnpackNull = @import("null.zig").maybeUnpackNull;
77

88
inline fn assertFloatType(comptime T: type) type {
99
switch (@typeInfo(T)) {
10-
.Float => return T,
11-
.Optional => |opt_info| {
10+
.float => return T,
11+
.optional => |opt_info| {
1212
return assertFloatType(opt_info.child);
1313
},
1414
else => @compileError("Expected float, got " ++ @typeName(T)),
@@ -32,7 +32,7 @@ pub fn packFloat(writer: anytype, comptime T: type, value_or_maybe_null: T) !voi
3232

3333
comptime var TargetType: type = undefined;
3434
const type_info = @typeInfo(Type);
35-
switch (type_info.Float.bits) {
35+
switch (type_info.float.bits) {
3636
0...32 => {
3737
try writer.writeByte(hdrs.FLOAT32);
3838
TargetType = f32;
@@ -88,10 +88,10 @@ const packed_float64_inf = [_]u8{ 0xcb, 0x7f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00
8888

8989
const float_types = [_]type{ f16, f32, f64 };
9090

91-
fn minFloatType(comptime T1: type, comptime T2: type) type {
91+
fn MinFloatType(comptime T1: type, comptime T2: type) type {
9292
const ti1 = @typeInfo(T1);
9393
const ti2 = @typeInfo(T2);
94-
return std.meta.Float(@min(ti1.Float.bits, ti2.Float.bits));
94+
return std.meta.Float(@min(ti1.float.bits, ti2.float.bits));
9595
}
9696

9797
test "readFloat: null" {
@@ -105,31 +105,31 @@ test "readFloat: float32 (zero)" {
105105
inline for (float_types) |T| {
106106
var stream = std.io.fixedBufferStream(&packed_float32_zero);
107107
const value = try unpackFloat(stream.reader(), T);
108-
try std.testing.expectApproxEqAbs(0.0, value, std.math.floatEpsAt(minFloatType(T, f32), @floatCast(value)));
108+
try std.testing.expectApproxEqAbs(0.0, value, std.math.floatEpsAt(MinFloatType(T, f32), @floatCast(value)));
109109
}
110110
}
111111

112112
test "readFloat: float64 (zero)" {
113113
inline for (float_types) |T| {
114114
var stream = std.io.fixedBufferStream(&packed_float64_zero);
115115
const value = try unpackFloat(stream.reader(), T);
116-
try std.testing.expectApproxEqAbs(0.0, value, std.math.floatEpsAt(minFloatType(T, f64), @floatCast(value)));
116+
try std.testing.expectApproxEqAbs(0.0, value, std.math.floatEpsAt(MinFloatType(T, f64), @floatCast(value)));
117117
}
118118
}
119119

120120
test "readFloat: float32 (pi)" {
121121
inline for (float_types) |T| {
122122
var stream = std.io.fixedBufferStream(&packed_float32_pi);
123123
const value = try unpackFloat(stream.reader(), T);
124-
try std.testing.expectApproxEqAbs(std.math.pi, value, std.math.floatEpsAt(minFloatType(T, f32), @floatCast(value)));
124+
try std.testing.expectApproxEqAbs(std.math.pi, value, std.math.floatEpsAt(MinFloatType(T, f32), @floatCast(value)));
125125
}
126126
}
127127

128128
test "readFloat: float64 (pi)" {
129129
inline for (float_types) |T| {
130130
var stream = std.io.fixedBufferStream(&packed_float64_pi);
131131
const value = try unpackFloat(stream.reader(), T);
132-
try std.testing.expectApproxEqAbs(std.math.pi, value, std.math.floatEpsAt(minFloatType(T, f64), @floatCast(value)));
132+
try std.testing.expectApproxEqAbs(std.math.pi, value, std.math.floatEpsAt(MinFloatType(T, f64), @floatCast(value)));
133133
}
134134
}
135135

0 commit comments

Comments
 (0)