authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-08 12:43:49-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-03-08 12:43:49-04:00
loga5cb19c0ac6b3eec8b0e246507a5feffd1daca59
tree0be4697a96ba9eb4c7499191be2d7805b7393256
parent2b1316954f169a88cfb694f4c1defc0d965455ea
parent692a974c3edd05944d33cd579bcb355cdd7199fc
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #4690 from Vexu/translate-c

Translate-c fixes

5 files changed, 82 insertions(+), 38 deletions(-)

src-self-hosted/clang.zig+1
......@@ -812,6 +812,7 @@ pub extern fn ZigClangType_getPointeeType(self: ?*const struct_ZigClangType) str
812812pub extern fn ZigClangType_isVoidType(self: ?*const struct_ZigClangType) bool;
813813pub extern fn ZigClangType_isConstantArrayType(self: ?*const struct_ZigClangType) bool;
814814pub extern fn ZigClangType_isRecordType(self: ?*const struct_ZigClangType) bool;
815pub extern fn ZigClangType_isIncompleteOrZeroLengthArrayType(self: ?*const struct_ZigClangType, *const ZigClangASTContext) bool;
815816pub extern fn ZigClangType_isArrayType(self: ?*const struct_ZigClangType) bool;
816817pub extern fn ZigClangType_isBooleanType(self: ?*const struct_ZigClangType) bool;
817818pub extern fn ZigClangType_getTypeClassName(self: *const struct_ZigClangType) [*:0]const u8;
src-self-hosted/translate_c.zig+29-32
......@@ -793,6 +793,7 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!?*
793793 while (ZigClangRecordDecl_field_iterator_neq(it, end_it)) : (it = ZigClangRecordDecl_field_iterator_next(it)) {
794794 const field_decl = ZigClangRecordDecl_field_iterator_deref(it);
795795 const field_loc = ZigClangFieldDecl_getLocation(field_decl);
796 const field_qt = ZigClangFieldDecl_getType(field_decl);
796797
797798 if (ZigClangFieldDecl_isBitField(field_decl)) {
798799 const opaque = try transCreateNodeOpaqueType(c);
......@@ -801,6 +802,13 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!?*
801802 break :blk opaque;
802803 }
803804
805 if (ZigClangType_isIncompleteOrZeroLengthArrayType(qualTypeCanon(field_qt), c.clang_context)) {
806 const opaque = try transCreateNodeOpaqueType(c);
807 semicolon = try appendToken(c, .Semicolon, ";");
808 try emitWarning(c, field_loc, "{} demoted to opaque type - has variable length array", .{container_kind_name});
809 break :blk opaque;
810 }
811
804812 var is_anon = false;
805813 var raw_name = try c.str(ZigClangNamedDecl_getName_bytes_begin(@ptrCast(*const ZigClangNamedDecl, field_decl)));
806814 if (ZigClangFieldDecl_isAnonymousStructOrUnion(field_decl)) {
......@@ -809,7 +817,7 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!?*
809817 }
810818 const field_name = try appendIdentifier(c, raw_name);
811819 _ = try appendToken(c, .Colon, ":");
812 const field_type = transQualType(rp, ZigClangFieldDecl_getType(field_decl), field_loc) catch |err| switch (err) {
820 const field_type = transQualType(rp, field_qt, field_loc) catch |err| switch (err) {
813821 error.UnsupportedType => {
814822 const opaque = try transCreateNodeOpaqueType(c);
815823 semicolon = try appendToken(c, .Semicolon, ";");
......@@ -2237,6 +2245,7 @@ fn transWhileLoop(
22372245 .id = .Loop,
22382246 };
22392247 while_node.body = try transStmt(rp, &loop_scope, ZigClangWhileStmt_getBody(stmt), .unused, .r_value);
2248 _ = try appendToken(rp.c, .Semicolon, ";");
22402249 return &while_node.base;
22412250}
22422251
......@@ -2346,8 +2355,10 @@ fn transForLoop(
23462355 try block_scope.?.block_node.statements.push(&while_node.base);
23472356 block_scope.?.block_node.rbrace = try appendToken(rp.c, .RBrace, "}");
23482357 return &block_scope.?.block_node.base;
2349 } else
2358 } else {
2359 _ = try appendToken(rp.c, .Semicolon, ";");
23502360 return &while_node.base;
2361 }
23512362}
23522363
23532364fn transSwitch(
......@@ -5431,6 +5442,8 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
54315442 //else
54325443 // @as(dest, x)
54335444
5445 const lparen = try appendToken(c, .LParen, "(");
5446
54345447 const if_1 = try transCreateNodeIf(c);
54355448 const type_id_1 = try transCreateNodeBuiltinFnCall(c, "@typeInfo");
54365449 const type_of_1 = try transCreateNodeBuiltinFnCall(c, "@TypeOf");
......@@ -5492,7 +5505,13 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
54925505 as.rparen_token = try appendToken(c, .RParen, ")");
54935506 else_2.body = &as.base;
54945507
5495 return &if_1.base;
5508 const group_node = try c.a().create(ast.Node.GroupedExpression);
5509 group_node.* = .{
5510 .lparen = lparen,
5511 .expr = &if_1.base,
5512 .rparen = try appendToken(c, .RParen, ")"),
5513 };
5514 return &group_node.base;
54965515 },
54975516 else => {
54985517 const first_tok = it.list.at(0);
......@@ -5545,14 +5564,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
55455564 );
55465565 return error.ParseError;
55475566 }
5548 // deref is often used together with casts so we group the lhs expression
5549 const group = try c.a().create(ast.Node.GroupedExpression);
5550 group.* = .{
5551 .lparen = try appendToken(c, .LParen, "("),
5552 .expr = node,
5553 .rparen = try appendToken(c, .RParen, ")"),
5554 };
5555 const deref = try transCreateNodePtrDeref(c, &group.base);
5567 const deref = try transCreateNodePtrDeref(c, node);
55565568 node = try transCreateNodeFieldAccess(c, deref, source[name_tok.start..name_tok.end]);
55575569 continue;
55585570 },
......@@ -5596,7 +5608,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
55965608 },
55975609 .Ampersand => {
55985610 op_token = try appendToken(c, .Ampersand, "&");
5599 op_id .BitAnd;
5611 op_id = .BitAnd;
56005612 },
56015613 .Plus => {
56025614 op_token = try appendToken(c, .Plus, "+");
......@@ -5604,7 +5616,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
56045616 },
56055617 .Minus => {
56065618 op_token = try appendToken(c, .Minus, "-");
5607 op_id .Sub;
5619 op_id = .Sub;
56085620 },
56095621 .AmpersandAmpersand => {
56105622 op_token = try appendToken(c, .Keyword_and, "and");
......@@ -5676,19 +5688,17 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
56765688 },
56775689 .BangEqual => {
56785690 op_token = try appendToken(c, .BangEqual, "!=");
5679 op_id = .BangEqual;
5691 op_id = .BangEqual;
56805692 },
56815693 .EqualEqual => {
56825694 op_token = try appendToken(c, .EqualEqual, "==");
56835695 op_id = .EqualEqual;
56845696 },
56855697 .Slash => {
5686 // unsigned/float division uses the operator
56875698 op_id = .Div;
56885699 op_token = try appendToken(c, .Slash, "/");
56895700 },
56905701 .Percent => {
5691 // unsigned/float division uses the operator
56925702 op_id = .Mod;
56935703 op_token = try appendToken(c, .Percent, "%");
56945704 },
......@@ -5729,25 +5739,12 @@ fn parseCPrefixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
57295739 return &node.base;
57305740 },
57315741 .Asterisk => {
5732 // deref is often used together with casts so we group the lhs expression
5733 const group = try c.a().create(ast.Node.GroupedExpression);
5734 group.* = .{
5735 .lparen = try appendToken(c, .LParen, "("),
5736 .expr = try parseCPrefixOpExpr(c, it, source, source_loc, scope),
5737 .rparen = try appendToken(c, .RParen, ")"),
5738 };
5739 return try transCreateNodePtrDeref(c, &group.base);
5742 const node = try parseCPrefixOpExpr(c, it, source, source_loc, scope);
5743 return try transCreateNodePtrDeref(c, node);
57405744 },
57415745 .Ampersand => {
5742 // address of is often used together with casts so we group the rhs expression
57435746 const node = try transCreateNodePrefixOp(c, .AddressOf, .Ampersand, "&");
5744 const group = try c.a().create(ast.Node.GroupedExpression);
5745 group.* = .{
5746 .lparen = try appendToken(c, .LParen, "("),
5747 .expr = try parseCPrefixOpExpr(c, it, source, source_loc, scope),
5748 .rparen = try appendToken(c, .RParen, ")"),
5749 };
5750 node.rhs = &group.base;
5747 node.rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope);
57515748 return &node.base;
57525749 },
57535750 else => {
src/zig_clang.cpp+20
......@@ -1881,6 +1881,26 @@ bool ZigClangType_isRecordType(const ZigClangType *self) {
18811881 return casted->isRecordType();
18821882}
18831883
1884bool ZigClangType_isIncompleteOrZeroLengthArrayType(const ZigClangQualType *self,
1885 const struct ZigClangASTContext *ctx)
1886{
1887 auto casted_ctx = reinterpret_cast<const clang::ASTContext *>(ctx);
1888 auto casted = reinterpret_cast<const clang::QualType *>(self);
1889 auto casted_type = reinterpret_cast<const clang::Type *>(self);
1890 if (casted_type->isIncompleteArrayType())
1891 return true;
1892
1893 clang::QualType elem_type = *casted;
1894 while (const clang::ConstantArrayType *ArrayT = casted_ctx->getAsConstantArrayType(elem_type)) {
1895 if (ArrayT->getSize() == 0)
1896 return true;
1897
1898 elem_type = ArrayT->getElementType();
1899 }
1900
1901 return false;
1902}
1903
18841904bool ZigClangType_isConstantArrayType(const ZigClangType *self) {
18851905 auto casted = reinterpret_cast<const clang::Type *>(self);
18861906 return casted->isConstantArrayType();
src/zig_clang.h+1
......@@ -947,6 +947,7 @@ ZIG_EXTERN_C bool ZigClangType_isBooleanType(const struct ZigClangType *self);
947947ZIG_EXTERN_C bool ZigClangType_isVoidType(const struct ZigClangType *self);
948948ZIG_EXTERN_C bool ZigClangType_isArrayType(const struct ZigClangType *self);
949949ZIG_EXTERN_C bool ZigClangType_isRecordType(const struct ZigClangType *self);
950ZIG_EXTERN_C bool ZigClangType_isIncompleteOrZeroLengthArrayType(const ZigClangQualType *self, const struct ZigClangASTContext *ctx);
950951ZIG_EXTERN_C bool ZigClangType_isConstantArrayType(const ZigClangType *self);
951952ZIG_EXTERN_C const char *ZigClangType_getTypeClassName(const struct ZigClangType *self);
952953ZIG_EXTERN_C const struct ZigClangArrayType *ZigClangType_getAsArrayTypeUnsafe(const struct ZigClangType *self);
test/translate_c.zig+31-6
......@@ -3,6 +3,31 @@ const std = @import("std");
33const CrossTarget = std.zig.CrossTarget;
44
55pub fn addCases(cases: *tests.TranslateCContext) void {
6 cases.add("structs with VLAs are rejected",
7 \\struct foo { int x; int y[]; };
8 \\struct bar { int x; int y[0]; };
9 , &[_][]const u8{
10 \\pub const struct_foo = @OpaqueType();
11 ,
12 \\pub const struct_bar = @OpaqueType();
13 });
14
15 cases.add("nested loops without blocks",
16 \\void foo() {
17 \\ while (0) while (0) {}
18 \\ for (;;) while (0);
19 \\ for (;;) do {} while (0);
20 \\}
21 , &[_][]const u8{
22 \\pub export fn foo() void {
23 \\ while (@as(c_int, 0) != 0) while (@as(c_int, 0) != 0) {};
24 \\ while (true) while (@as(c_int, 0) != 0) {};
25 \\ while (true) while (true) {
26 \\ if (!(@as(c_int, 0) != 0)) break;
27 \\ };
28 \\}
29 });
30
631 cases.add("macro comma operator",
732 \\#define foo (foo, bar)
833 \\#define bar(x) (&x, +3, 4 == 4, 5 * 6, baz(1, 2), 2 % 2, baz(1,2))
......@@ -14,7 +39,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
1439 ,
1540 \\pub inline fn bar(x: var) @TypeOf(baz(1, 2)) {
1641 \\ return blk: {
17 \\ _ = &(x);
42 \\ _ = &x;
1843 \\ _ = 3;
1944 \\ _ = 4 == 4;
2045 \\ _ = 5 * 6;
......@@ -1404,7 +1429,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
14041429 cases.add("macro pointer cast",
14051430 \\#define NRF_GPIO ((NRF_GPIO_Type *) NRF_GPIO_BASE)
14061431 , &[_][]const u8{
1407 \\pub const NRF_GPIO = if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Pointer) @ptrCast([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Int) @intToPtr([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else @as([*c]NRF_GPIO_Type, NRF_GPIO_BASE);
1432 \\pub const NRF_GPIO = (if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Pointer) @ptrCast([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Int) @intToPtr([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else @as([*c]NRF_GPIO_Type, NRF_GPIO_BASE));
14081433 });
14091434
14101435 cases.add("basic macro function",
......@@ -1993,7 +2018,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
19932018 ,
19942019 \\pub const DOT = a.b;
19952020 ,
1996 \\pub const ARROW = (a).*.b;
2021 \\pub const ARROW = a.*.b;
19972022 });
19982023
19992024 cases.add("array access",
......@@ -2588,11 +2613,11 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
25882613 \\#define FOO(bar) baz((void *)(baz))
25892614 \\#define BAR (void*) a
25902615 , &[_][]const u8{
2591 \\pub inline fn FOO(bar: var) @TypeOf(baz(if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz))) {
2592 \\ return baz(if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz));
2616 \\pub inline fn FOO(bar: var) @TypeOf(baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz)))) {
2617 \\ return baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz)));
25932618 \\}
25942619 ,
2595 \\pub const BAR = if (@typeInfo(@TypeOf(a)) == .Pointer) @ptrCast(*c_void, a) else if (@typeInfo(@TypeOf(a)) == .Int) @intToPtr(*c_void, a) else @as(*c_void, a);
2620 \\pub const BAR = (if (@typeInfo(@TypeOf(a)) == .Pointer) @ptrCast(*c_void, a) else if (@typeInfo(@TypeOf(a)) == .Int) @intToPtr(*c_void, a) else @as(*c_void, a));
25962621 });
25972622
25982623 cases.add("macro conditional operator",