authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-04-15 18:06:38+03:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-04-15 18:06:38+03:00
log0276d9ddc58694b81b5e98cc717243d50db873b1
treec6f1cffa8a6819faf6371cc766ac3ef5a8cb019b
parent1e23a3cd9162df098a302f22d70f2ac50b5eae21
parentca3bf6e6aded2ced560803970a43e703b8c4bd11
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #5046 from Vexu/translate-c

Translate-c correct invalid shortcut

10 files changed, 92 insertions(+), 70 deletions(-)

lib/std/array_list.zig+11-11
......@@ -205,7 +205,7 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type {
205205 better_capacity += better_capacity / 2 + 8;
206206 if (better_capacity >= new_capacity) break;
207207 }
208
208
209209 const new_memory = try self.allocator.realloc(self.allocatedSlice(), better_capacity);
210210 self.items.ptr = new_memory.ptr;
211211 self.capacity = new_memory.len;
......@@ -250,7 +250,7 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type {
250250 if (self.items.len == 0) return null;
251251 return self.pop();
252252 }
253
253
254254 // For a nicer API, `items.len` is the length, not the capacity.
255255 // This requires "unsafe" slicing.
256256 fn allocatedSlice(self: Self) Slice {
......@@ -448,16 +448,16 @@ test "std.ArrayList(u8) implements outStream" {
448448}
449449
450450test "std.ArrayList.shrink still sets length on error.OutOfMemory" {
451 // use an arena allocator to make sure realloc returns error.OutOfMemory
452 var arena = std.heap.ArenaAllocator.init(testing.allocator);
453 defer arena.deinit();
451 // use an arena allocator to make sure realloc returns error.OutOfMemory
452 var arena = std.heap.ArenaAllocator.init(testing.allocator);
453 defer arena.deinit();
454454
455 var list = ArrayList(i32).init(&arena.allocator);
455 var list = ArrayList(i32).init(&arena.allocator);
456456
457 try list.append(1);
458 try list.append(2);
459 try list.append(3);
457 try list.append(1);
458 try list.append(2);
459 try list.append(3);
460460
461 list.shrink(1);
462 testing.expect(list.items.len == 1);
461 list.shrink(1);
462 testing.expect(list.items.len == 1);
463463}
lib/std/math/big/int.zig-1
......@@ -1467,7 +1467,6 @@ pub const Int = struct {
14671467
14681468 r.swap(&x);
14691469 }
1470
14711470};
14721471
14731472// Storage must live for the lifetime of the returned value
lib/std/os.zig+1-1
......@@ -2584,7 +2584,7 @@ pub fn fstat(fd: fd_t) FStatError!Stat {
25842584 }
25852585}
25862586
2587pub const FStatAtError = FStatError || error{NameTooLong, FileNotFound};
2587pub const FStatAtError = FStatError || error{ NameTooLong, FileNotFound };
25882588
25892589pub fn fstatat(dirfd: fd_t, pathname: []const u8, flags: u32) FStatAtError!Stat {
25902590 const pathname_c = try toPosixPath(pathname);
lib/std/os/windows/gdi32.zig+1-1
......@@ -42,4 +42,4 @@ pub extern "gdi32" fn ChoosePixelFormat(
4242
4343pub extern "gdi32" fn SwapBuffers(hdc: ?HDC) callconv(.Stdcall) bool;
4444pub extern "gdi32" fn wglCreateContext(hdc: ?HDC) callconv(.Stdcall) ?HGLRC;
45pub extern "gdi32" fn wglMakeCurrent(hdc: ?HDC, hglrc: ?HGLRC) callconv(.Stdcall) bool;
\ No newline at end of file
45pub extern "gdi32" fn wglMakeCurrent(hdc: ?HDC, hglrc: ?HGLRC) callconv(.Stdcall) bool;
lib/std/os/windows/user32.zig+1-1
......@@ -169,4 +169,4 @@ pub extern "user32" fn GetMessageA(
169169
170170pub extern "user32" fn TranslateMessage(lpMsg: *const MSG) callconv(.Stdcall) bool;
171171pub extern "user32" fn DispatchMessageA(lpMsg: *const MSG) callconv(.Stdcall) LRESULT;
172pub extern "user32" fn PostQuitMessage(nExitCode: i32) callconv(.Stdcall) void;
\ No newline at end of file
172pub extern "user32" fn PostQuitMessage(nExitCode: i32) callconv(.Stdcall) void;
lib/std/zig/parser_test.zig+1-1
......@@ -387,7 +387,7 @@ test "zig fmt: correctly space struct fields with doc comments" {
387387 \\ c: u8,
388388 \\};
389389 \\
390 ,
390 ,
391391 \\pub const S = struct {
392392 \\ /// A
393393 \\ a: u8,
src-self-hosted/stage2.zig+5-4
......@@ -903,13 +903,14 @@ fn enumToString(value: var, type_name: []const u8) ![]const u8 {
903903 if (e.is_exhaustive) {
904904 return std.fmt.allocPrint(std.heap.c_allocator, ".{}", .{@tagName(value)});
905905 } else {
906 return std.fmt.allocPrint(std.heap.c_allocator,
906 return std.fmt.allocPrint(
907 std.heap.c_allocator,
907908 "@intToEnum({}, {})",
908 .{type_name, @enumToInt(value)}
909 .{ type_name, @enumToInt(value) },
909910 );
910911 }
911912 },
912 else => unreachable
913 else => unreachable,
913914 }
914915}
915916
......@@ -1136,7 +1137,7 @@ const Stage2Target = extern struct {
11361137 \\
11371138 , .{
11381139 try enumToString(target.os.version_range.windows.min, "Target.Os.WindowsVersion"),
1139 try enumToString(target.os.version_range.windows.max, "Target.Os.WindowsVersion")
1140 try enumToString(target.os.version_range.windows.max, "Target.Os.WindowsVersion"),
11401141 }),
11411142 }
11421143 try os_builtin_str_buffer.appendSlice("};\n");
src-self-hosted/translate_c.zig+65-36
......@@ -274,7 +274,7 @@ pub fn translate(
274274 errdefer tree_arena.deinit();
275275
276276 const tree = try tree_arena.allocator.create(ast.Tree);
277 tree.* = ast.Tree{
277 tree.* = .{
278278 .source = undefined, // need to use toOwnedSlice later
279279 .root_node = undefined,
280280 .arena_allocator = tree_arena,
......@@ -644,7 +644,7 @@ fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {
644644 };
645645
646646 const node = try c.a().create(ast.Node.VarDecl);
647 node.* = ast.Node.VarDecl{
647 node.* = .{
648648 .doc_comments = null,
649649 .visib_token = visib_tok,
650650 .thread_local_token = thread_local_token,
......@@ -3479,7 +3479,7 @@ fn qualTypeToLog2IntRef(rp: RestorePoint, qt: ZigClangQualType, source_loc: ZigC
34793479 // we can perform the log2 now.
34803480 const cast_bit_width = math.log2_int(u64, int_bit_width);
34813481 const node = try rp.c.a().create(ast.Node.IntegerLiteral);
3482 node.* = ast.Node.IntegerLiteral{
3482 node.* = .{
34833483 .token = try appendTokenFmt(rp.c, .Identifier, "u{}", .{cast_bit_width}),
34843484 };
34853485 return &node.base;
......@@ -3502,7 +3502,7 @@ fn qualTypeToLog2IntRef(rp: RestorePoint, qt: ZigClangQualType, source_loc: ZigC
35023502 const import_fn_call = try transCreateNodeBuiltinFnCall(rp.c, "@import");
35033503 const std_token = try appendToken(rp.c, .StringLiteral, "\"std\"");
35043504 const std_node = try rp.c.a().create(ast.Node.StringLiteral);
3505 std_node.* = ast.Node.StringLiteral{
3505 std_node.* = .{
35063506 .token = std_token,
35073507 };
35083508 try import_fn_call.params.push(&std_node.base);
......@@ -3783,7 +3783,7 @@ fn transCreateNodePrefixOp(
37833783 bytes: []const u8,
37843784) !*ast.Node.PrefixOp {
37853785 const node = try c.a().create(ast.Node.PrefixOp);
3786 node.* = ast.Node.PrefixOp{
3786 node.* = .{
37873787 .op_token = try appendToken(c, op_tok_id, bytes),
37883788 .op = op,
37893789 .rhs = undefined, // translate and set afterward
......@@ -3980,7 +3980,7 @@ fn transCreateNodeBoolLiteral(c: *Context, value: bool) !*ast.Node {
39803980fn transCreateNodeArrayInitializer(c: *Context, ty: *ast.Node) !*ast.Node.SuffixOp {
39813981 _ = try appendToken(c, .LBrace, "{");
39823982 const node = try c.a().create(ast.Node.SuffixOp);
3983 node.* = ast.Node.SuffixOp{
3983 node.* = .{
39843984 .lhs = .{ .node = ty },
39853985 .op = .{
39863986 .ArrayInitializer = ast.Node.SuffixOp.Op.InitList.init(c.a()),
......@@ -3993,7 +3993,7 @@ fn transCreateNodeArrayInitializer(c: *Context, ty: *ast.Node) !*ast.Node.Suffix
39933993fn transCreateNodeStructInitializer(c: *Context, ty: *ast.Node) !*ast.Node.SuffixOp {
39943994 _ = try appendToken(c, .LBrace, "{");
39953995 const node = try c.a().create(ast.Node.SuffixOp);
3996 node.* = ast.Node.SuffixOp{
3996 node.* = .{
39973997 .lhs = .{ .node = ty },
39983998 .op = .{
39993999 .StructInitializer = ast.Node.SuffixOp.Op.InitList.init(c.a()),
......@@ -4306,7 +4306,7 @@ fn transCreateNodeShiftOp(
43064306 cast_node.rparen_token = try appendToken(rp.c, .RParen, ")");
43074307
43084308 const node = try rp.c.a().create(ast.Node.InfixOp);
4309 node.* = ast.Node.InfixOp{
4309 node.* = .{
43104310 .op_token = op_token,
43114311 .lhs = lhs,
43124312 .op = op,
......@@ -4626,8 +4626,7 @@ fn finishTransFnProto(
46264626 const type_node = try transQualType(rp, param_qt, source_loc);
46274627
46284628 const param_node = try rp.c.a().create(ast.Node.ParamDecl);
4629 param_node.* = ast.Node.ParamDecl{
4630 .base = ast.Node{ .id = ast.Node.Id.ParamDecl },
4629 param_node.* = .{
46314630 .doc_comments = null,
46324631 .comptime_token = null,
46334632 .noalias_token = noalias_tok,
......@@ -4648,8 +4647,7 @@ fn finishTransFnProto(
46484647 }
46494648
46504649 const var_arg_node = try rp.c.a().create(ast.Node.ParamDecl);
4651 var_arg_node.* = ast.Node.ParamDecl{
4652 .base = ast.Node{ .id = ast.Node.Id.ParamDecl },
4650 var_arg_node.* = .{
46534651 .doc_comments = null,
46544652 .comptime_token = null,
46554653 .noalias_token = null,
......@@ -4774,14 +4772,12 @@ pub fn failDecl(c: *Context, loc: ZigClangSourceLocation, name: []const u8, comp
47744772 const semi_tok = try appendToken(c, .Semicolon, ";");
47754773
47764774 const msg_node = try c.a().create(ast.Node.StringLiteral);
4777 msg_node.* = ast.Node.StringLiteral{
4778 .base = ast.Node{ .id = ast.Node.Id.StringLiteral },
4775 msg_node.* = .{
47794776 .token = msg_tok,
47804777 };
47814778
47824779 const call_node = try c.a().create(ast.Node.BuiltinCall);
4783 call_node.* = ast.Node.BuiltinCall{
4784 .base = ast.Node{ .id = ast.Node.Id.BuiltinCall },
4780 call_node.* = .{
47854781 .builtin_token = builtin_tok,
47864782 .params = ast.Node.BuiltinCall.ParamList.init(c.a()),
47874783 .rparen_token = rparen_tok,
......@@ -4789,8 +4785,7 @@ pub fn failDecl(c: *Context, loc: ZigClangSourceLocation, name: []const u8, comp
47894785 try call_node.params.push(&msg_node.base);
47904786
47914787 const var_decl_node = try c.a().create(ast.Node.VarDecl);
4792 var_decl_node.* = ast.Node.VarDecl{
4793 .base = ast.Node{ .id = ast.Node.Id.VarDecl },
4788 var_decl_node.* = .{
47944789 .doc_comments = null,
47954790 .visib_token = pub_tok,
47964791 .thread_local_token = null,
......@@ -4825,7 +4820,7 @@ fn appendTokenFmt(c: *Context, token_id: Token.Id, comptime format: []const u8,
48254820 const new_token = try c.tree.tokens.addOne();
48264821 errdefer c.tree.tokens.shrink(token_index);
48274822
4828 new_token.* = Token{
4823 new_token.* = .{
48294824 .id = token_id,
48304825 .start = start_index,
48314826 .end = end_index,
......@@ -5523,36 +5518,70 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
55235518 return error.ParseError;
55245519 }
55255520
5521 const lparen = try appendToken(c, .LParen, "(");
5522
55265523 if (saw_integer_literal) {
5527 // @intToPtr(dest, x)
5524 //( if (@typeInfo(dest) == .Pointer))
5525 // @intToPtr(dest, x)
5526 //else
5527 // @as(dest, x) )
5528 const if_node = try transCreateNodeIf(c);
5529 const type_info_node = try transCreateNodeBuiltinFnCall(c, "@typeInfo");
5530 try type_info_node.params.push(inner_node);
5531 type_info_node.rparen_token = try appendToken(c, .LParen, ")");
5532 const cmp_node = try c.a().create(ast.Node.InfixOp);
5533 cmp_node.* = .{
5534 .op_token = try appendToken(c, .EqualEqual, "=="),
5535 .lhs = &type_info_node.base,
5536 .op = .EqualEqual,
5537 .rhs = try transCreateNodeEnumLiteral(c, "Pointer"),
5538 };
5539 if_node.condition = &cmp_node.base;
5540 _ = try appendToken(c, .RParen, ")");
5541
55285542 const int_to_ptr = try transCreateNodeBuiltinFnCall(c, "@intToPtr");
55295543 try int_to_ptr.params.push(inner_node);
55305544 try int_to_ptr.params.push(node_to_cast);
55315545 int_to_ptr.rparen_token = try appendToken(c, .RParen, ")");
5532 return &int_to_ptr.base;
5546 if_node.body = &int_to_ptr.base;
5547
5548 const else_node = try transCreateNodeElse(c);
5549 if_node.@"else" = else_node;
5550
5551 const as_node = try transCreateNodeBuiltinFnCall(c, "@as");
5552 try as_node.params.push(inner_node);
5553 try as_node.params.push(node_to_cast);
5554 as_node.rparen_token = try appendToken(c, .RParen, ")");
5555 else_node.body = &as_node.base;
5556
5557 const group_node = try c.a().create(ast.Node.GroupedExpression);
5558 group_node.* = .{
5559 .lparen = lparen,
5560 .expr = &if_node.base,
5561 .rparen = try appendToken(c, .RParen, ")"),
5562 };
5563 return &group_node.base;
55335564 }
55345565
55355566 //( if (@typeInfo(@TypeOf(x)) == .Pointer)
55365567 // @ptrCast(dest, @alignCast(@alignOf(dest.Child), x))
5537 //else if (@typeInfo(@TypeOf(x)) == .Integer and @typeInfo(dest) == .Pointer))
5568 //else if (@typeInfo(@TypeOf(x)) == .Int and @typeInfo(dest) == .Pointer))
55385569 // @intToPtr(dest, x)
55395570 //else
55405571 // @as(dest, x) )
55415572
5542 const lparen = try appendToken(c, .LParen, "(");
5543
55445573 const if_1 = try transCreateNodeIf(c);
5545 const type_id_1 = try transCreateNodeBuiltinFnCall(c, "@typeInfo");
5574 const type_info_1 = try transCreateNodeBuiltinFnCall(c, "@typeInfo");
55465575 const type_of_1 = try transCreateNodeBuiltinFnCall(c, "@TypeOf");
5547 try type_id_1.params.push(&type_of_1.base);
5576 try type_info_1.params.push(&type_of_1.base);
55485577 try type_of_1.params.push(node_to_cast);
55495578 type_of_1.rparen_token = try appendToken(c, .RParen, ")");
5550 type_id_1.rparen_token = try appendToken(c, .RParen, ")");
5579 type_info_1.rparen_token = try appendToken(c, .RParen, ")");
55515580
55525581 const cmp_1 = try c.a().create(ast.Node.InfixOp);
55535582 cmp_1.* = .{
55545583 .op_token = try appendToken(c, .EqualEqual, "=="),
5555 .lhs = &type_id_1.base,
5584 .lhs = &type_info_1.base,
55565585 .op = .EqualEqual,
55575586 .rhs = try transCreateNodeEnumLiteral(c, "Pointer"),
55585587 };
......@@ -5590,17 +5619,17 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
55905619 if_1.@"else" = else_1;
55915620
55925621 const if_2 = try transCreateNodeIf(c);
5593 const type_id_2 = try transCreateNodeBuiltinFnCall(c, "@typeInfo");
5622 const type_info_2 = try transCreateNodeBuiltinFnCall(c, "@typeInfo");
55945623 const type_of_2 = try transCreateNodeBuiltinFnCall(c, "@TypeOf");
5595 try type_id_2.params.push(&type_of_2.base);
5624 try type_info_2.params.push(&type_of_2.base);
55965625 try type_of_2.params.push(node_to_cast);
55975626 type_of_2.rparen_token = try appendToken(c, .RParen, ")");
5598 type_id_2.rparen_token = try appendToken(c, .RParen, ")");
5627 type_info_2.rparen_token = try appendToken(c, .RParen, ")");
55995628
56005629 const cmp_2 = try c.a().create(ast.Node.InfixOp);
56015630 cmp_2.* = .{
56025631 .op_token = try appendToken(c, .EqualEqual, "=="),
5603 .lhs = &type_id_2.base,
5632 .lhs = &type_info_2.base,
56045633 .op = .EqualEqual,
56055634 .rhs = try transCreateNodeEnumLiteral(c, "Int"),
56065635 };
......@@ -5612,13 +5641,13 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
56125641 .op = .BoolAnd,
56135642 .rhs = undefined,
56145643 };
5615 const type_id_3 = try transCreateNodeBuiltinFnCall(c, "@typeInfo");
5616 try type_id_3.params.push(inner_node);
5617 type_id_3.rparen_token = try appendToken(c, .LParen, ")");
5644 const type_info_3 = try transCreateNodeBuiltinFnCall(c, "@typeInfo");
5645 try type_info_3.params.push(inner_node);
5646 type_info_3.rparen_token = try appendToken(c, .LParen, ")");
56185647 const cmp_3 = try c.a().create(ast.Node.InfixOp);
56195648 cmp_3.* = .{
56205649 .op_token = try appendToken(c, .EqualEqual, "=="),
5621 .lhs = &type_id_3.base,
5650 .lhs = &type_info_3.base,
56225651 .op = .EqualEqual,
56235652 .rhs = try transCreateNodeEnumLiteral(c, "Pointer"),
56245653 };
test/stage1/behavior/for.zig+1-1
......@@ -162,7 +162,7 @@ test "for copies its payload" {
162162test "for on slice with allowzero ptr" {
163163 const S = struct {
164164 fn doTheTest(slice: []const u8) void {
165 var ptr = @ptrCast([*]const allowzero u8, slice.ptr)[0..slice.len];
165 var ptr = @ptrCast([*]allowzero const u8, slice.ptr)[0..slice.len];
166166 for (ptr) |x, i| expect(x == i + 1);
167167 for (ptr) |*x, i| expect(x.* == i + 1);
168168 }
test/translate_c.zig+6-13
......@@ -2879,7 +2879,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
28792879 , &[_][]const u8{
28802880 \\pub const FOO = 0x61626364;
28812881 });
2882
2882
28832883 cases.add("Make sure casts are grouped",
28842884 \\typedef struct
28852885 \\{
......@@ -2895,22 +2895,15 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
28952895 \\}
28962896 });
28972897
2898 cases.add("Cast from integer literals to poiter",
2898 cases.add("macro integer literal casts",
28992899 \\#define NULL ((void*)0)
2900 \\#define GPIO_0_MEM_MAP ((unsigned*)0x8000)
2901 \\#define GPIO_1_MEM_MAP ((unsigned*)0x8004)
2902 \\#define GPIO_2_MEM_MAP ((unsigned*)0x8008)
2903 \\
2900 \\#define FOO ((int)0x8000)
29042901 , &[_][]const u8{
2905 \\pub const NULL = @intToPtr(?*c_void, 0);
2906 ,
2907 \\pub const GPIO_0_MEM_MAP = @intToPtr([*c]c_uint, 0x8000);
2902 \\pub const NULL = (if (@typeInfo(?*c_void) == .Pointer) @intToPtr(?*c_void, 0) else @as(?*c_void, 0));
29082903 ,
2909 \\pub const GPIO_1_MEM_MAP = @intToPtr([*c]c_uint, 0x8004);
2910 ,
2911 \\pub const GPIO_2_MEM_MAP = @intToPtr([*c]c_uint, 0x8008);
2904 \\pub const FOO = (if (@typeInfo(c_int) == .Pointer) @intToPtr(c_int, 0x8000) else @as(c_int, 0x8000));
29122905 });
2913
2906
29142907 if (std.Target.current.abi == .msvc) {
29152908 cases.add("nameless struct fields",
29162909 \\typedef struct NAMED