| author |  Andrew Kelley <andrew@ziglang.org> 2021-04-29 20:33:29-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2021-04-29 20:33:29-07:00 |
| log | 474ade88b58b6fd7239049ec445129eabafa3cbd |
| tree | d7d27c3812dfaf85be4d6aa98b3b31aae1054a6b |
| parent | 8944240aec6b53106856bb0ac2eb9da180f6b326 |
std: fix compile errors found by stage2 AstGen
5 files changed, 9 insertions(+), 16 deletions(-)
lib/std/c/ast.zig-3
| ... | @@ -673,9 +673,6 @@ pub const Expr = struct { | ... | @@ -673,9 +673,6 @@ pub const Expr = struct { |
| 673 | base: Expr = Expr{ .id = .Infix }, | 673 | base: Expr = Expr{ .id = .Infix }, |
| 674 | lhs: *Expr, | 674 | lhs: *Expr, |
| 675 | op_token: TokenIndex, | 675 | op_token: TokenIndex, |
| 676 | op: Op, | ||
| 677 | rhs: *Expr, | 676 | rhs: *Expr, |
| 678 | |||
| 679 | pub const Op = enum {}; | ||
| 680 | }; | 677 | }; |
| 681 | }; | 678 | }; |
lib/std/c/haiku.zig+1-1
| ... | @@ -70,7 +70,7 @@ pub const pthread_rwlock_t = extern struct { | ... | @@ -70,7 +70,7 @@ pub const pthread_rwlock_t = extern struct { |
| 70 | waiters: [2]?*c_void = [_]?*c_void{ null, null }, | 70 | waiters: [2]?*c_void = [_]?*c_void{ null, null }, |
| 71 | }; | 71 | }; |
| 72 | 72 | ||
| 73 | pub const EAI = extern enum(c_int) { | 73 | pub const EAI = enum(c_int) { |
| 74 | /// address family for hostname not supported | 74 | /// address family for hostname not supported |
| 75 | ADDRFAMILY = 1, | 75 | ADDRFAMILY = 1, |
| 76 | 76 |
lib/std/c/parse.zig+4-4
| ... | @@ -617,18 +617,18 @@ const Parser = struct { | ... | @@ -617,18 +617,18 @@ const Parser = struct { |
| 617 | return false; | 617 | return false; |
| 618 | }; | 618 | }; |
| 619 | switch (ty.id) { | 619 | switch (ty.id) { |
| 620 | .Enum => |e| blk: { | 620 | .Enum => |e| inner: { |
| 621 | if (e.name) |some| | 621 | if (e.name) |some| |
| 622 | if (!parser.tree.tokenEql(some, tok)) | 622 | if (!parser.tree.tokenEql(some, tok)) |
| 623 | break :blk; | 623 | break :inner; |
| 624 | return parser.err(.{ | 624 | return parser.err(.{ |
| 625 | .MustUseKwToRefer = .{ .kw = e.tok, .name = tok }, | 625 | .MustUseKwToRefer = .{ .kw = e.tok, .name = tok }, |
| 626 | }); | 626 | }); |
| 627 | }, | 627 | }, |
| 628 | .Record => |r| blk: { | 628 | .Record => |r| inner: { |
| 629 | if (r.name) |some| | 629 | if (r.name) |some| |
| 630 | if (!parser.tree.tokenEql(some, tok)) | 630 | if (!parser.tree.tokenEql(some, tok)) |
| 631 | break :blk; | 631 | break :inner; |
| 632 | return parser.err(.{ | 632 | return parser.err(.{ |
| 633 | .MustUseKwToRefer = .{ | 633 | .MustUseKwToRefer = .{ |
| 634 | .kw = r.tok, | 634 | .kw = r.tok, |
lib/std/meta.zig+2-6
| ... | @@ -348,9 +348,6 @@ test "std.meta.containerLayout" { | ... | @@ -348,9 +348,6 @@ test "std.meta.containerLayout" { |
| 348 | const E1 = enum { | 348 | const E1 = enum { |
| 349 | A, | 349 | A, |
| 350 | }; | 350 | }; |
| 351 | const E3 = extern enum { | ||
| 352 | A, | ||
| 353 | }; | ||
| 354 | const S1 = struct {}; | 351 | const S1 = struct {}; |
| 355 | const S2 = packed struct {}; | 352 | const S2 = packed struct {}; |
| 356 | const S3 = extern struct {}; | 353 | const S3 = extern struct {}; |
| ... | @@ -365,7 +362,6 @@ test "std.meta.containerLayout" { | ... | @@ -365,7 +362,6 @@ test "std.meta.containerLayout" { |
| 365 | }; | 362 | }; |
| 366 | 363 | ||
| 367 | testing.expect(containerLayout(E1) == .Auto); | 364 | testing.expect(containerLayout(E1) == .Auto); |
| 368 | testing.expect(containerLayout(E3) == .Extern); | ||
| 369 | testing.expect(containerLayout(S1) == .Auto); | 365 | testing.expect(containerLayout(S1) == .Auto); |
| 370 | testing.expect(containerLayout(S2) == .Packed); | 366 | testing.expect(containerLayout(S2) == .Packed); |
| 371 | testing.expect(containerLayout(S3) == .Extern); | 367 | testing.expect(containerLayout(S3) == .Extern); |
| ... | @@ -1026,7 +1022,7 @@ test "std.meta.cast" { | ... | @@ -1026,7 +1022,7 @@ test "std.meta.cast" { |
| 1026 | 1022 | ||
| 1027 | testing.expectEqual(@intToPtr(?*c_void, 2), cast(?*c_void, @intToPtr(*u8, 2))); | 1023 | testing.expectEqual(@intToPtr(?*c_void, 2), cast(?*c_void, @intToPtr(*u8, 2))); |
| 1028 | 1024 | ||
| 1029 | const C_ENUM = extern enum(c_int) { | 1025 | const C_ENUM = enum(c_int) { |
| 1030 | A = 0, | 1026 | A = 0, |
| 1031 | B, | 1027 | B, |
| 1032 | C, | 1028 | C, |
| ... | @@ -1109,7 +1105,7 @@ pub fn sizeof(target: anytype) usize { | ... | @@ -1109,7 +1105,7 @@ pub fn sizeof(target: anytype) usize { |
| 1109 | } | 1105 | } |
| 1110 | 1106 | ||
| 1111 | test "sizeof" { | 1107 | test "sizeof" { |
| 1112 | const E = extern enum(c_int) { One, _ }; | 1108 | const E = enum(c_int) { One, _ }; |
| 1113 | const S = extern struct { a: u32 }; | 1109 | const S = extern struct { a: u32 }; |
| 1114 | 1110 | ||
| 1115 | const ptr_size = @sizeOf(*c_void); | 1111 | const ptr_size = @sizeOf(*c_void); |
lib/std/meta/trait.zig+2-2
| ... | @@ -497,8 +497,8 @@ pub fn hasDecls(comptime T: type, comptime names: anytype) bool { | ... | @@ -497,8 +497,8 @@ pub fn hasDecls(comptime T: type, comptime names: anytype) bool { |
| 497 | test "std.meta.trait.hasDecls" { | 497 | test "std.meta.trait.hasDecls" { |
| 498 | const TestStruct1 = struct {}; | 498 | const TestStruct1 = struct {}; |
| 499 | const TestStruct2 = struct { | 499 | const TestStruct2 = struct { |
| 500 | pub var a: u32; | 500 | pub var a: u32 = undefined; |
| 501 | pub var b: u32; | 501 | pub var b: u32 = undefined; |
| 502 | c: bool, | 502 | c: bool, |
| 503 | pub fn useless() void {} | 503 | pub fn useless() void {} |
| 504 | }; | 504 | }; |