authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-06 19:21:55-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-01-06 19:21:55-05:00
logbaaef7ed977a8c3d5df2aef673185101abc381d4
treeaa80b2e23a588684b4b1b0e2a18557882f5f569b
parentbf678a12dfbdf0b3bb50804aa6b7ee081013049a
parenteca294cd23b3b1cdb4a94fb37dfe52eeb0a7c51d
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #4083 from LemonBoy/better-stdbool

Better _Bool translation

6 files changed, 65 insertions(+), 4 deletions(-)

src-self-hosted/clang.zig+1
......@@ -805,6 +805,7 @@ pub extern fn ZigClangType_getPointeeType(self: ?*const struct_ZigClangType) str
805805pub extern fn ZigClangType_isVoidType(self: ?*const struct_ZigClangType) bool;
806806pub extern fn ZigClangType_isRecordType(self: ?*const struct_ZigClangType) bool;
807807pub extern fn ZigClangType_isArrayType(self: ?*const struct_ZigClangType) bool;
808pub extern fn ZigClangType_isBooleanType(self: ?*const struct_ZigClangType) bool;
808809pub extern fn ZigClangType_getTypeClassName(self: *const struct_ZigClangType) [*:0]const u8;
809810pub extern fn ZigClangType_getAsArrayTypeUnsafe(self: *const ZigClangType) *const ZigClangArrayType;
810811pub extern fn ZigClangType_getAsRecordType(self: *const ZigClangType) ?*const ZigClangRecordType;
src-self-hosted/translate_c.zig+24-4
......@@ -1285,7 +1285,7 @@ fn transDeclStmt(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangDeclStmt)
12851285 try transExprCoercing(rp, scope, expr, .used, .r_value)
12861286 else
12871287 try transCreateNodeUndefinedLiteral(c);
1288 if (isBoolRes(init_node)) {
1288 if (!qualTypeIsBoolean(qual_type) and isBoolRes(init_node)) {
12891289 const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@boolToInt");
12901290 try builtin_node.params.push(init_node);
12911291 builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")");
......@@ -1351,9 +1351,13 @@ fn transImplicitCastExpr(
13511351 return transCreateNodeInfixOp(rp, scope, &ptr_to_int.base, .BangEqual, op_token, rhs_node, result_used, false);
13521352 },
13531353 .IntegralToBoolean => {
1354 // val != 0
13551354 const node = try transExpr(rp, scope, sub_expr, .used, .r_value);
13561355
1356 // The expression is already a boolean one, return it as-is
1357 if (isBoolRes(node))
1358 return node;
1359
1360 // val != 0
13571361 const op_token = try appendToken(rp.c, .BangEqual, "!=");
13581362 const rhs_node = try transCreateNodeInt(rp.c, 0);
13591363 return transCreateNodeInfixOp(rp, scope, node, .BangEqual, op_token, rhs_node, result_used, false);
......@@ -1409,6 +1413,10 @@ fn transBoolExpr(
14091413 }
14101414}
14111415
1416fn exprIsBooleanType(expr: *const ZigClangExpr) bool {
1417 return qualTypeIsBoolean(ZigClangExpr_getType(expr));
1418}
1419
14121420fn isBoolRes(res: *ast.Node) bool {
14131421 switch (res.id) {
14141422 .InfixOp => switch (@fieldParentPtr(ast.Node.InfixOp, "base", res).op) {
......@@ -1738,6 +1746,14 @@ fn transCCast(
17381746 builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")");
17391747 return &builtin_node.base;
17401748 }
1749 if (ZigClangType_isBooleanType(qualTypeCanon(src_type)) and
1750 !ZigClangType_isBooleanType(qualTypeCanon(dst_type)))
1751 {
1752 const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@boolToInt");
1753 try builtin_node.params.push(expr);
1754 builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")");
1755 return &builtin_node.base;
1756 }
17411757 if (ZigClangQualType_getTypeClass(ZigClangQualType_getCanonicalType(dst_type)) == .Enum) {
17421758 const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@intToEnum");
17431759 try builtin_node.params.push(try transQualType(rp, dst_type, loc));
......@@ -3089,6 +3105,10 @@ fn qualTypeIsPtr(qt: ZigClangQualType) bool {
30893105 return ZigClangType_getTypeClass(qualTypeCanon(qt)) == .Pointer;
30903106}
30913107
3108fn qualTypeIsBoolean(qt: ZigClangQualType) bool {
3109 return ZigClangType_isBooleanType(qualTypeCanon(qt));
3110}
3111
30923112fn qualTypeIntBitWidth(rp: RestorePoint, qt: ZigClangQualType, source_loc: ZigClangSourceLocation) !u32 {
30933113 const ty = ZigClangQualType_getTypePtr(qt);
30943114
......@@ -3365,7 +3385,7 @@ fn transCreateNodeAssign(
33653385 const lhs_node = try transExpr(rp, scope, lhs, .used, .l_value);
33663386 const eq_token = try appendToken(rp.c, .Equal, "=");
33673387 var rhs_node = try transExprCoercing(rp, scope, rhs, .used, .r_value);
3368 if (isBoolRes(rhs_node)) {
3388 if (!exprIsBooleanType(lhs) and isBoolRes(rhs_node)) {
33693389 const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@boolToInt");
33703390 try builtin_node.params.push(rhs_node);
33713391 builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")");
......@@ -3390,7 +3410,7 @@ fn transCreateNodeAssign(
33903410 const node = try transCreateNodeVarDecl(rp.c, false, true, tmp);
33913411 node.eq_token = try appendToken(rp.c, .Equal, "=");
33923412 var rhs_node = try transExpr(rp, &block_scope.base, rhs, .used, .r_value);
3393 if (isBoolRes(rhs_node)) {
3413 if (!exprIsBooleanType(lhs) and isBoolRes(rhs_node)) {
33943414 const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@boolToInt");
33953415 try builtin_node.params.push(rhs_node);
33963416 builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")");
src/zig_clang.cpp+5
......@@ -1814,6 +1814,11 @@ ZigClangQualType ZigClangType_getPointeeType(const ZigClangType *self) {
18141814 return bitcast(casted->getPointeeType());
18151815}
18161816
1817bool ZigClangType_isBooleanType(const ZigClangType *self) {
1818 auto casted = reinterpret_cast<const clang::Type *>(self);
1819 return casted->isBooleanType();
1820}
1821
18171822bool ZigClangType_isVoidType(const ZigClangType *self) {
18181823 auto casted = reinterpret_cast<const clang::Type *>(self);
18191824 return casted->isVoidType();
src/zig_clang.h+1
......@@ -932,6 +932,7 @@ ZIG_EXTERN_C bool ZigClangQualType_isRestrictQualified(struct ZigClangQualType);
932932
933933ZIG_EXTERN_C enum ZigClangTypeClass ZigClangType_getTypeClass(const struct ZigClangType *self);
934934ZIG_EXTERN_C struct ZigClangQualType ZigClangType_getPointeeType(const struct ZigClangType *self);
935ZIG_EXTERN_C bool ZigClangType_isBooleanType(const struct ZigClangType *self);
935936ZIG_EXTERN_C bool ZigClangType_isVoidType(const struct ZigClangType *self);
936937ZIG_EXTERN_C bool ZigClangType_isArrayType(const struct ZigClangType *self);
937938ZIG_EXTERN_C bool ZigClangType_isRecordType(const struct ZigClangType *self);
test/run_translated_c.zig+17
......@@ -3,6 +3,23 @@ const tests = @import("tests.zig");
33const nl = std.cstr.line_sep;
44
55pub fn addCases(cases: *tests.RunTranslatedCContext) void {
6 cases.add("boolean values and expressions",
7 \\#include <stdlib.h>
8 \\static const _Bool false_val = 0;
9 \\static const _Bool true_val = 1;
10 \\void foo(int x, int y) {
11 \\ _Bool r = x < y;
12 \\ if (!r) abort();
13 \\ _Bool self = foo;
14 \\ if (self == false_val) abort();
15 \\}
16 \\int main(int argc, char **argv) {
17 \\ foo(2, 5);
18 \\ if (false_val == true_val) abort();
19 \\ return 0;
20 \\}
21 , "");
22
623 cases.add("hello world",
724 \\#define _NO_CRT_STDIO_INLINE 1
825 \\#include <stdio.h>
test/translate_c.zig+17
......@@ -2504,4 +2504,21 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
25042504 \\ foo(@intToPtr([*c]c_int, @ptrToInt(a)));
25052505 \\}
25062506 });
2507
2508 cases.add("handling of _Bool type",
2509 \\_Bool foo(_Bool x) {
2510 \\ _Bool a = x != 1;
2511 \\ _Bool b = a != 0;
2512 \\ _Bool c = foo;
2513 \\ return foo(c != b);
2514 \\}
2515 , &[_][]const u8{
2516 \\pub export fn foo(arg_x: bool) bool {
2517 \\ var x = arg_x;
2518 \\ var a: bool = (@boolToInt(x) != @as(c_int, 1));
2519 \\ var b: bool = (@boolToInt(a) != @as(c_int, 0));
2520 \\ var c: bool = @ptrToInt(foo) != 0;
2521 \\ return foo((@boolToInt(c) != @boolToInt(b)));
2522 \\}
2523 });
25072524}