Commit bfe02ff61a8861c269524c60668a3969cb053720 | zig

Signed-off-by: tison <wander4096@gmail.com>

6 files changed, 19 insertions(+), 13 deletions(-)

doc/langref.html.in-4

...	...	@@ -7850,10 +7850,6 @@ comptime {
7850	7850	Converts {#syntax#}true{#endsyntax#} to {#syntax#}@as(u1, 1){#endsyntax#} and {#syntax#}false{#endsyntax#} to
7851	7851	{#syntax#}@as(u1, 0){#endsyntax#}.
7852	7852	</p>
7853		<p>
7854		If the value is known at compile-time, the return type is {#syntax#}comptime_int{#endsyntax#}
7855		instead of {#syntax#}u1{#endsyntax#}.
7856		</p>
7857	7853	{#header_close#}
7858	7854
7859	7855	{#header_open\|@bitSizeOf#}

lib/std/math.zig+1-1

...	...	@@ -1684,7 +1684,7 @@ pub fn break_f80(x: f80) F80 {
1684	1684	pub inline fn sign(i: anytype) @TypeOf(i) {
1685	1685	const T = @TypeOf(i);
1686	1686	return switch (@typeInfo(T)) {
1687		.Int, .ComptimeInt => @as(T, @boolToInt(i > 0)) - @boolToInt(i < 0),
	1687	.Int, .ComptimeInt => @as(T, @boolToInt(i > 0)) - @as(T, @boolToInt(i < 0)),
1688	1688	.Float, .ComptimeFloat => @intToFloat(T, @boolToInt(i > 0)) - @intToFloat(T, @boolToInt(i < 0)),
1689	1689	.Vector => \|vinfo\| blk: {
1690	1690	switch (@typeInfo(vinfo.child)) {

lib/std/math/ilogb.zig+1-1

...	...	@@ -48,7 +48,7 @@ fn ilogbX(comptime T: type, x: T) i32 {
48	48	}
49	49
50	50	// offset sign bit, exponent bits, and integer bit (if present) + bias
51		const offset = 1 + exponentBits + @boolToInt(T == f80) - exponentBias;
	51	const offset = 1 + exponentBits + @as(comptime_int, @boolToInt(T == f80)) - exponentBias;
52	52	return offset - @intCast(i32, @clz(u));
53	53	}
54	54

src/Sema.zig+3-3

...	...	@@ -18445,9 +18445,9 @@ fn zirBoolToInt(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!A
18445	18445	const inst_data = sema.code.instructions.items(.data)[inst].un_node;
18446	18446	const operand = try sema.resolveInst(inst_data.operand);
18447	18447	if (try sema.resolveMaybeUndefVal(operand)) \|val\| {
18448		if (val.isUndef()) return sema.addConstUndef(Type.initTag(.u1));
18449		const bool_ints = [2]Air.Inst.Ref{ .zero, .one };
18450		return bool_ints[@boolToInt(val.toBool())];
	18448	if (val.isUndef()) return sema.addConstUndef(Type.u1);
	18449	if (val.toBool()) return sema.addConstant(Type.u1, Value.one);
	18450	return sema.addConstant(Type.u1, Value.zero);
18451	18451	}
18452	18452	return block.addUnOp(.bool_to_int, operand);
18453	18453	}

src/translate_c.zig+1

...	...	@@ -2494,6 +2494,7 @@ fn transCCast(
2494	2494
2495	2495	if (isBoolRes(src_int_expr)) {
2496	2496	src_int_expr = try Tag.bool_to_int.create(c.arena, src_int_expr);
	2497	return Tag.as.create(c.arena, .{ .lhs = dst_node, .rhs = src_int_expr });
2497	2498	}
2498	2499
2499	2500	switch (cIntTypeCmp(dst_type, src_type)) {

test/behavior/bool.zig+13-4

...	...	@@ -1,6 +1,7 @@
1	1	const std = @import("std");
2	2	const builtin = @import("builtin");
3	3	const expect = std.testing.expect;
	4	const expectEqual = std.testing.expectEqual;
4	5
5	6	test "bool literals" {
6	7	try expect(true);
...	...	@@ -12,14 +13,22 @@ test "cast bool to int" {
12	13
13	14	const t = true;
14	15	const f = false;
15		try expect(@boolToInt(t) == @as(u32, 1));
16		try expect(@boolToInt(f) == @as(u32, 0));
	16	try expectEqual(@as(u32, 1), @boolToInt(t));
	17	try expectEqual(@as(u32, 0), @boolToInt(f));
	18	try expectEqual(-1, @bitCast(i1, @boolToInt(t)));
	19	try expectEqual(0, @bitCast(i1, @boolToInt(f)));
	20	try expectEqual(u1, @TypeOf(@boolToInt(t)));
	21	try expectEqual(u1, @TypeOf(@boolToInt(f)));
17	22	try nonConstCastBoolToInt(t, f);
18	23	}
19	24
20	25	fn nonConstCastBoolToInt(t: bool, f: bool) !void {
21		try expect(@boolToInt(t) == @as(u32, 1));
22		try expect(@boolToInt(f) == @as(u32, 0));
	26	try expectEqual(@as(u32, 1), @boolToInt(t));
	27	try expectEqual(@as(u32, 0), @boolToInt(f));
	28	try expectEqual(@as(i1, -1), @bitCast(i1, @boolToInt(t)));
	29	try expectEqual(@as(i1, 0), @bitCast(i1, @boolToInt(f)));
	30	try expectEqual(u1, @TypeOf(@boolToInt(t)));
	31	try expectEqual(u1, @TypeOf(@boolToInt(f)));
23	32	}
24	33
25	34	test "bool cmp" {