authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2019-12-19 08:27:35+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2019-12-19 08:28:36+02:00
loge4c47e80b43eb3096093b38e8e984d9042e3742e
tree36b1d95b77903af84cca6059412624f6902fea91
parent122a9bad3973bb9f7f48c91eb45cbf0513cf19c3
signature Commit is signed but in an unrecognized format.

translate-c-2 unaryexprortypetrait + fixes

3 files changed, 100 insertions(+), 47 deletions(-)

src-self-hosted/clang.zig+3
......@@ -1113,3 +1113,6 @@ pub extern fn ZigClangCallExpr_getCallee(*const ZigClangCallExpr) *const ZigClan
11131113pub extern fn ZigClangCallExpr_getNumArgs(*const ZigClangCallExpr) c_uint;
11141114pub extern fn ZigClangCallExpr_getArgs(*const ZigClangCallExpr) [*]const *const ZigClangExpr;
11151115
1116pub extern fn ZigClangUnaryExprOrTypeTraitExpr_getTypeOfArgument(*const ZigClangUnaryExprOrTypeTraitExpr) ZigClangQualType;
1117pub extern fn ZigClangUnaryExprOrTypeTraitExpr_getBeginLoc(*const ZigClangUnaryExprOrTypeTraitExpr) ZigClangSourceLocation;
1118
src-self-hosted/translate_c.zig+73-11
......@@ -375,7 +375,7 @@ fn declVisitor(c: *Context, decl: *const ZigClangDecl) Error!void {
375375}
376376
377377fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void {
378 if (c.decl_table.contains(@ptrToInt(ZigClangFunctionDecl_getCanonicalDecl(fn_decl))))
378 if (c.decl_table.contains(@ptrToInt(ZigClangFunctionDecl_getCanonicalDecl(fn_decl))))
379379 return; // Avoid processing this decl twice
380380 const rp = makeRestorePoint(c);
381381 const fn_name = try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, fn_decl)));
......@@ -443,7 +443,7 @@ fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void {
443443}
444444
445445fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {
446 if (c.decl_table.contains(@ptrToInt(ZigClangVarDecl_getCanonicalDecl(var_decl))))
446 if (c.decl_table.contains(@ptrToInt(ZigClangVarDecl_getCanonicalDecl(var_decl))))
447447 return; // Avoid processing this decl twice
448448 const rp = makeRestorePoint(c);
449449 const visib_tok = try appendToken(c, .Keyword_pub, "pub");
......@@ -528,15 +528,46 @@ fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {
528528 return addTopLevelDecl(c, checked_name, &node.base);
529529}
530530
531fn transTypeDefAsBuiltin(c: *Context, typedef_decl: *const ZigClangTypedefNameDecl, builtin_name: []const u8) !*ast.Node {
532 _ = try c.decl_table.put(@ptrToInt(ZigClangTypedefNameDecl_getCanonicalDecl(typedef_decl)), builtin_name);
533 return transCreateNodeIdentifier(c, builtin_name);
534}
535
531536fn transTypeDef(c: *Context, typedef_decl: *const ZigClangTypedefNameDecl) Error!?*ast.Node {
532537 if (c.decl_table.get(@ptrToInt(ZigClangTypedefNameDecl_getCanonicalDecl(typedef_decl)))) |kv|
533538 return try transCreateNodeIdentifier(c, kv.value); // Avoid processing this decl twice
534539 const rp = makeRestorePoint(c);
535 const visib_tok = try appendToken(c, .Keyword_pub, "pub");
536 const const_tok = try appendToken(c, .Keyword_const, "const");
537540
538541 const typedef_name = try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, typedef_decl)));
542
543 if (std.mem.eql(u8, typedef_name, "uint8_t"))
544 return transTypeDefAsBuiltin(c, typedef_decl, "u8")
545 else if (std.mem.eql(u8, typedef_name, "int8_t"))
546 return transTypeDefAsBuiltin(c, typedef_decl, "i8")
547 else if (std.mem.eql(u8, typedef_name, "uint16_t"))
548 return transTypeDefAsBuiltin(c, typedef_decl, "u16")
549 else if (std.mem.eql(u8, typedef_name, "int16_t"))
550 return transTypeDefAsBuiltin(c, typedef_decl, "i16")
551 else if (std.mem.eql(u8, typedef_name, "uint32_t"))
552 return transTypeDefAsBuiltin(c, typedef_decl, "u32")
553 else if (std.mem.eql(u8, typedef_name, "int32_t"))
554 return transTypeDefAsBuiltin(c, typedef_decl, "i32")
555 else if (std.mem.eql(u8, typedef_name, "uint64_t"))
556 return transTypeDefAsBuiltin(c, typedef_decl, "u64")
557 else if (std.mem.eql(u8, typedef_name, "int64_t"))
558 return transTypeDefAsBuiltin(c, typedef_decl, "i64")
559 else if (std.mem.eql(u8, typedef_name, "intptr_t"))
560 return transTypeDefAsBuiltin(c, typedef_decl, "isize")
561 else if (std.mem.eql(u8, typedef_name, "uintptr_t"))
562 return transTypeDefAsBuiltin(c, typedef_decl, "usize")
563 else if (std.mem.eql(u8, typedef_name, "ssize_t"))
564 return transTypeDefAsBuiltin(c, typedef_decl, "isize")
565 else if (std.mem.eql(u8, typedef_name, "size_t"))
566 return transTypeDefAsBuiltin(c, typedef_decl, "usize");
567
539568 _ = try c.decl_table.put(@ptrToInt(ZigClangTypedefNameDecl_getCanonicalDecl(typedef_decl)), typedef_name);
569 const visib_tok = try appendToken(c, .Keyword_pub, "pub");
570 const const_tok = try appendToken(c, .Keyword_const, "const");
540571 const node = try transCreateNodeVarDecl(c, true, true, typedef_name);
541572 node.eq_token = try appendToken(c, .Equal, "=");
542573
......@@ -621,8 +652,9 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!?*
621652 try emitWarning(c, field_loc, "{} demoted to opaque type - has bitfield", .{container_kind_name});
622653 break :blk opaque;
623654 }
624
625 const field_name = try appendIdentifier(c, try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, field_decl))));
655 const raw_name = try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, field_decl)));
656 if (raw_name.len < 1) continue; // fix weird windows bug?
657 const field_name = try appendIdentifier(c, raw_name);
626658 _ = try appendToken(c, .Colon, ":");
627659 const field_type = transQualType(rp, ZigClangFieldDecl_getType(field_decl), field_loc) catch |err| switch (err) {
628660 error.UnsupportedType => {
......@@ -828,7 +860,17 @@ fn transStmt(
828860 .IntegerLiteralClass => return transIntegerLiteral(rp, scope, @ptrCast(*const ZigClangIntegerLiteral, stmt), result_used),
829861 .ReturnStmtClass => return transReturnStmt(rp, scope, @ptrCast(*const ZigClangReturnStmt, stmt)),
830862 .StringLiteralClass => return transStringLiteral(rp, scope, @ptrCast(*const ZigClangStringLiteral, stmt), result_used),
831 .ParenExprClass => return transExpr(rp, scope, ZigClangParenExpr_getSubExpr(@ptrCast(*const ZigClangParenExpr, stmt)), result_used, lrvalue),
863 .ParenExprClass => {
864 const expr = try transExpr(rp, scope, ZigClangParenExpr_getSubExpr(@ptrCast(*const ZigClangParenExpr, stmt)), result_used, lrvalue);
865 if (expr.id == .GroupedExpression) return expr;
866 const node = try rp.c.a().create(ast.Node.GroupedExpression);
867 node.* = .{
868 .lparen = try appendToken(rp.c, .LParen, "("),
869 .expr = expr,
870 .rparen = try appendToken(rp.c, .RParen, ")"),
871 };
872 return &node.base;
873 },
832874 .InitListExprClass => return transInitListExpr(rp, scope, @ptrCast(*const ZigClangInitListExpr, stmt), result_used),
833875 .ImplicitValueInitExprClass => return transImplicitValueInitExpr(rp, scope, @ptrCast(*const ZigClangExpr, stmt), result_used),
834876 .IfStmtClass => return transIfStmt(rp, scope, @ptrCast(*const ZigClangIfStmt, stmt)),
......@@ -854,6 +896,7 @@ fn transStmt(
854896 .MemberExprClass => return transMemberExpr(rp, scope, @ptrCast(*const ZigClangMemberExpr, stmt), result_used),
855897 .ArraySubscriptExprClass => return transArrayAccess(rp, scope, @ptrCast(*const ZigClangArraySubscriptExpr, stmt), result_used),
856898 .CallExprClass => return transCallExpr(rp, scope, @ptrCast(*const ZigClangCallExpr, stmt), result_used),
899 .UnaryExprOrTypeTraitExprClass => return transUnaryExprOrTypeTraitExpr(rp, scope, @ptrCast(*const ZigClangUnaryExprOrTypeTraitExpr, stmt), result_used),
857900 else => {
858901 return revertAndWarn(
859902 rp,
......@@ -1485,7 +1528,8 @@ fn transCCast(
14851528 return transCCast(rp, scope, loc, ZigClangElaboratedType_getNamedType(elaborated_ty), src_type, expr);
14861529 }
14871530 if (ZigClangQualType_getTypeClass(src_type) == .Enum and
1488 ZigClangQualType_getTypeClass(dst_type) != .Enum) {
1531 ZigClangQualType_getTypeClass(dst_type) != .Enum)
1532 {
14891533 const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@enumToInt");
14901534 try builtin_node.params.push(expr);
14911535 builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")");
......@@ -2064,7 +2108,7 @@ fn transCallExpr(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangCallExpr,
20642108 const num_args = ZigClangCallExpr_getNumArgs(stmt);
20652109 const args = ZigClangCallExpr_getArgs(stmt);
20662110 var i: usize = 0;
2067 while (i < num_args) : (i+=1) {
2111 while (i < num_args) : (i += 1) {
20682112 if (i != 0) {
20692113 _ = try appendToken(rp.c, .Comma, ",");
20702114 }
......@@ -2081,7 +2125,7 @@ fn transCallExpr(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangCallExpr,
20812125 return &node.base;
20822126 }
20832127 }
2084
2128
20852129 return maybeSuppressResult(rp, scope, result_used, &node.base);
20862130}
20872131
......@@ -2101,6 +2145,24 @@ fn qualTypeGetFnProto(qt: ZigClangQualType, is_ptr: *bool) ?*const ZigClangFunct
21012145 return null;
21022146}
21032147
2148fn transUnaryExprOrTypeTraitExpr(
2149 rp: RestorePoint,
2150 scope: *Scope,
2151 stmt: *const ZigClangUnaryExprOrTypeTraitExpr,
2152 result_used: ResultUsed,
2153) TransError!*ast.Node {
2154 const type_node = try transQualType(
2155 rp,
2156 ZigClangUnaryExprOrTypeTraitExpr_getTypeOfArgument(stmt),
2157 ZigClangUnaryExprOrTypeTraitExpr_getBeginLoc(stmt),
2158 );
2159
2160 const builtin_node = try transCreateNodeBuiltinFnCall(rp.c, "@sizeOf");
2161 try builtin_node.params.push(type_node);
2162 builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")");
2163 return maybeSuppressResult(rp, scope, result_used, &builtin_node.base);
2164}
2165
21042166fn transCPtrCast(
21052167 rp: RestorePoint,
21062168 loc: ZigClangSourceLocation,
......@@ -3092,7 +3154,7 @@ fn transCreateNodePtrDeref(c: *Context, lhs: *ast.Node) !*ast.Node {
30923154}
30933155
30943156fn transCreateNodeArrayAccess(c: *Context, lhs: *ast.Node) !*ast.Node.SuffixOp {
3095 _ = try appendToken(c, .LBrace, "[");
3157 _ = try appendToken(c, .LBrace, "[");
30963158 const node = try c.a().create(ast.Node.SuffixOp);
30973159 node.* = .{
30983160 .lhs = .{ .node = lhs },
test/translate_c.zig+24-36
......@@ -748,6 +748,27 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
748748 \\}
749749 });
750750
751 cases.addC_both("bitshift",
752 \\int foo(void) {
753 \\ return (1 << 2) >> 1;
754 \\}
755 , &[_][]const u8{
756 \\pub export fn foo() c_int {
757 \\ return (1 << @as(@import("std").math.Log2Int(c_int), 2)) >> @as(@import("std").math.Log2Int(c_int), 1);
758 \\}
759 });
760
761 cases.addC_both("sizeof",
762 \\#include <stddef.h>
763 \\size_t size_of(void) {
764 \\ return sizeof(int);
765 \\}
766 , &[_][]const u8{
767 \\pub export fn size_of() usize {
768 \\ return @sizeOf(c_int);
769 \\}
770 });
771
751772 /////////////// Cases that pass for only stage2 ////////////////
752773
753774 cases.add_2("Parameterless function prototypes",
......@@ -1353,15 +1374,15 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
13531374 \\}
13541375 });
13551376
1356 cases.add_2("shift right with a fixed size type, no while", // TODO can fold this into "shift right assign with a fixed size type" once `while` and `>>=` and `uint32_t` are handled in translate-c-2
1377 cases.add_2("shift right with a fixed size type, no while", // TODO can fold this into "shift right assign with a fixed size type" once `>>=` is handled in translate-c-2
13571378 \\#include <stdint.h>
13581379 \\uint32_t some_func(uint32_t a) {
13591380 \\ uint32_t b = a >> 1;
13601381 \\ return b;
13611382 \\}
13621383 , &[_][]const u8{
1363 \\pub export fn some_func(a: uint32_t) uint32_t {
1364 \\ var b: uint32_t = a >> @as(u5, 1);
1384 \\pub export fn some_func(a: u32) u32 {
1385 \\ var b: u32 = a >> @as(u5, 1);
13651386 \\ return b;
13661387 \\}
13671388 });
......@@ -1496,18 +1517,6 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
14961517 \\}
14971518 });
14981519
1499 cases.add_2("bitshift, no parens", // TODO can fold this into "bitshift" once parens are preserved correctly in translate-c-2
1500 \\int foo(void) {
1501 \\ int a = (1 << 2);
1502 \\ return a >> 1;
1503 \\}
1504 , &[_][]const u8{
1505 \\pub export fn foo() c_int {
1506 \\ var a: c_int = 1 << @as(@import("std").math.Log2Int(c_int), 2);
1507 \\ return a >> @as(@import("std").math.Log2Int(c_int), 1);
1508 \\}
1509 });
1510
15111520 cases.add_2("typedeffed bool expression",
15121521 \\typedef char* yes;
15131522 \\void foo(void) {
......@@ -1766,17 +1775,6 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
17661775 \\}
17671776 });
17681777
1769 cases.addC("sizeof",
1770 \\#include <stddef.h>
1771 \\size_t size_of(void) {
1772 \\ return sizeof(int);
1773 \\}
1774 , &[_][]const u8{
1775 \\pub export fn size_of() usize {
1776 \\ return @sizeOf(c_int);
1777 \\}
1778 });
1779
17801778 cases.addC("__extension__ cast",
17811779 \\int foo(void) {
17821780 \\ return __extension__ 1;
......@@ -1787,16 +1785,6 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
17871785 \\}
17881786 });
17891787
1790 cases.addC("bitshift",
1791 \\int foo(void) {
1792 \\ return (1 << 2) >> 1;
1793 \\}
1794 , &[_][]const u8{
1795 \\pub export fn foo() c_int {
1796 \\ return (1 << @as(@import("std").math.Log2Int(c_int), 2)) >> @as(@import("std").math.Log2Int(c_int), 1);
1797 \\}
1798 });
1799
18001788 cases.addC("compound assignment operators",
18011789 \\void foo(void) {
18021790 \\ int a = 0;