{#syntax#}const mem = @import("std").mem;
-const array1 = []u32{1,2};
-const array2 = []u32{3,4};
+const array1 = [_]u32{1,2};
+const array2 = [_]u32{3,4};
const together = array1 ++ array2;
-mem.eql(u32, together, []u32{1,2,3,4}){#endsyntax#}
+mem.eql(u32, together, [_]u32{1,2,3,4}){#endsyntax#}
This pointer attribute allows a pointer to have address zero. This is only ever needed on the - freestanding OS target, where the address zero is mappable. In this code example, if the pointer - did not have the {#syntax#}allowzero{#endsyntax#} attribute, this would be a - {#link|Pointer Cast Invalid Null#} panic: + freestanding OS target, where the address zero is mappable. If you want to represent null pointers, use + {#link|Optional Pointers#} instead. In this code example, if the pointer did not have the + {#syntax#}allowzero{#endsyntax#} attribute, this would be a {#link|Pointer Cast Invalid Null#} panic:
{#code_begin|test|allowzero#} const std = @import("std"); @@ -2048,7 +2048,7 @@ test "allowzero" { const assert = @import("std").debug.assert; test "basic slices" { - var array = []i32{ 1, 2, 3, 4 }; + var array = [_]i32{ 1, 2, 3, 4 }; // A slice is a pointer and a length. The difference between an array and // a slice is that the array's length is part of the type and known at // compile-time, whereas the slice's length is known at runtime. @@ -2116,7 +2116,7 @@ test "slice pointer" { test "slice widening" { // Zig supports slice widening and slice narrowing. Cast a slice of u8 // to a slice of anything else, and Zig will perform the length conversion. - const array align(@alignOf(u32)) = []u8{ 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13 }; + const array align(@alignOf(u32)) = [_]u8{ 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13 }; const slice = @bytesToSlice(u32, array[0..]); assert(slice.len == 2); assert(slice[0] == 0x12121212); @@ -3245,7 +3245,7 @@ fn typeNameLength(comptime T: type) usize { const assert = @import("std").debug.assert; test "for basics" { - const items = []i32 { 4, 5, 3, 4, 0 }; + const items = [_]i32 { 4, 5, 3, 4, 0 }; var sum: i32 = 0; // For loops iterate over slices and arrays. @@ -3275,7 +3275,7 @@ test "for basics" { } test "for reference" { - var items = []i32 { 3, 4, 2 }; + var items = [_]i32 { 3, 4, 2 }; // Iterate over the slice by reference by // specifying that the capture value is a pointer. @@ -3290,20 +3290,20 @@ test "for reference" { test "for else" { // For allows an else attached to it, the same as a while loop. - var items = []?i32 { 3, 4, null, 5 }; + var items = [_]?i32 { 3, 4, null, 5 }; // For loops can also be used as expressions. + // Similar to while loops, when you break from a for loop, the else branch is not evaluated. var sum: i32 = 0; const result = for (items) |value| { - if (value == null) { - break 9; - } else { + if (value != null) { sum += value.?; } } else blk: { - assert(sum == 7); + assert(sum == 12); break :blk sum; }; + assert(result == 12); } {#code_end#} {#header_open|Labeled for#} @@ -3315,8 +3315,8 @@ const assert = std.debug.assert; test "nested break" { var count: usize = 0; - outer: for ([]i32{ 1, 2, 3, 4, 5 }) |_| { - for ([]i32{ 1, 2, 3, 4, 5 }) |_| { + outer: for ([_]i32{ 1, 2, 3, 4, 5 }) |_| { + for ([_]i32{ 1, 2, 3, 4, 5 }) |_| { count += 1; break :outer; } @@ -3326,8 +3326,8 @@ test "nested break" { test "nested continue" { var count: usize = 0; - outer: for ([]i32{ 1, 2, 3, 4, 5, 6, 7, 8 }) |_| { - for ([]i32{ 1, 2, 3, 4, 5 }) |_| { + outer: for ([_]i32{ 1, 2, 3, 4, 5, 6, 7, 8 }) |_| { + for ([_]i32{ 1, 2, 3, 4, 5 }) |_| { count += 1; continue :outer; } @@ -3349,7 +3349,7 @@ test "nested continue" { const assert = @import("std").debug.assert; test "inline for loop" { - const nums = []i32{2, 4, 6}; + const nums = [_]i32{2, 4, 6}; var sum: usize = 0; inline for (nums) |i| { const T = switch (i) { @@ -4698,7 +4698,7 @@ test "implicit casting to optionals wrapped in error union" { {#code_end#} {#header_close#} {#header_open|Implicit Cast: Error Unions#} -The the payload type of an {#link|Error Union Type#} as well as the {#link|Error Set Type#} +
The payload type of an {#link|Error Union Type#} as well as the {#link|Error Set Type#} implicitly cast to the error union type:
{#code_begin|test#} @@ -4883,7 +4883,7 @@ test "peer type resolution: [0]u8 and []const u8" { } fn peerTypeEmptyArrayAndSlice(a: bool, slice: []const u8) []const u8 { if (a) { - return []const u8{}; + return [_]u8{}; } return slice[0..1]; @@ -4904,7 +4904,7 @@ test "peer type resolution: [0]u8, []const u8, and anyerror![]u8" { } fn peerTypeEmptyArrayAndSliceAndError(a: bool, slice: []u8) anyerror![]u8 { if (a) { - return []u8{}; + return [_]u8{}; } return slice[0..1]; @@ -4985,7 +4985,7 @@ fn eql_i32(a: i32, b: i32) bool { return a == b; } {#code_end#} -Note that this is different than using a dummy value for the hash map value. +
Note that this is different from using a dummy value for the hash map value. By using {#syntax#}void{#endsyntax#} as the type of the value, the hash map entry type has no value field, and thus the hash map takes up less space. Further, all the code that deals with storing and loading the value is deleted, as seen above. @@ -5192,7 +5192,7 @@ const CmdFn = struct { func: fn(i32) i32, }; -const cmd_fns = []CmdFn{ +const cmd_fns = [_]CmdFn{ CmdFn {.name = "one", .func = one}, CmdFn {.name = "two", .func = two}, CmdFn {.name = "three", .func = three}, @@ -5933,7 +5933,7 @@ async fn testAsyncSeq() void { suspend; seq('d'); } -var points = []u8{0} ** "abcdefg".len; +var points = [_]u8{0} ** "abcdefg".len; var index: usize = 0; fn seq(c: u8) void { @@ -6071,7 +6071,7 @@ async fn another() i32 { return 1234; } -var seq_points = []u8{0} ** "abcdefghi".len; +var seq_points = [_]u8{0} ** "abcdefghi".len; var seq_index: usize = 0; fn seq(c: u8) void { @@ -6225,7 +6225,7 @@ comptime { {#header_close#} {#header_open|@bitOffsetOf#} -
{#syntax#}@bitOffsetOf(comptime T: type, comptime field_name: [] const u8) comptime_int{#endsyntax#}
+ {#syntax#}@bitOffsetOf(comptime T: type, comptime field_name: []const u8) comptime_int{#endsyntax#}
Returns the bit offset of a field relative to its containing struct.
@@ -6283,7 +6283,7 @@ comptime { {#header_close#} {#header_open|@byteOffsetOf#} -{#syntax#}@byteOffsetOf(comptime T: type, comptime field_name: [] const u8) comptime_int{#endsyntax#}
+ {#syntax#}@byteOffsetOf(comptime T: type, comptime field_name: []const u8) comptime_int{#endsyntax#}
Returns the byte offset of a field relative to its containing struct.
@@ -7391,7 +7391,7 @@ const std = @import("std"); const assert = std.debug.assert; test "@This()" { - var items = []i32{ 1, 2, 3, 4 }; + var items = [_]i32{ 1, 2, 3, 4 }; const list = List(i32){ .items = items[0..] }; assert(list.length() == 4); } @@ -8305,7 +8305,7 @@ comptime {At runtime:
{#code_begin|exe_err#} pub fn main() !void { - var array align(4) = []u32{ 0x11111111, 0x11111111 }; + var array align(4) = [_]u32{ 0x11111111, 0x11111111 }; const bytes = @sliceToBytes(array[0..]); if (foo(bytes) != 0x11111111) return error.Wrong; } @@ -8937,7 +8937,7 @@ pub fn build(b: *Builder) void { const lib = b.addSharedLibrary("mathtest", "mathtest.zig", b.version(1, 0, 0)); const exe = b.addExecutable("test", null); - exe.addCSourceFile("test.c", [][]const u8{"-std=c99"}); + exe.addCSourceFile("test.c", [_][]const u8{"-std=c99"}); exe.linkLibrary(lib); exe.linkSystemLibrary("c"); @@ -9002,7 +9002,7 @@ pub fn build(b: *Builder) void { const obj = b.addObject("base64", "base64.zig"); const exe = b.addCExecutable("test"); - exe.addCompileFlags([][]const u8 { + exe.addCompileFlags([_][]const u8 { "-std=c99", }); exe.addSourceFile("test.c"); diff --git a/example/mix_o_files/build.zig b/example/mix_o_files/build.zig index c945ce6bd6..7c72cfcc3a 100644 --- a/example/mix_o_files/build.zig +++ b/example/mix_o_files/build.zig @@ -4,7 +4,7 @@ pub fn build(b: *Builder) void { const obj = b.addObject("base64", "base64.zig"); const exe = b.addExecutable("test", null); - exe.addCSourceFile("test.c", [][]const u8{"-std=c99"}); + exe.addCSourceFile("test.c", [_][]const u8{"-std=c99"}); exe.addObject(obj); exe.linkSystemLibrary("c"); diff --git a/example/shared_library/build.zig b/example/shared_library/build.zig index 37af059ae0..129c5dc1c9 100644 --- a/example/shared_library/build.zig +++ b/example/shared_library/build.zig @@ -4,7 +4,7 @@ pub fn build(b: *Builder) void { const lib = b.addSharedLibrary("mathtest", "mathtest.zig", b.version(1, 0, 0)); const exe = b.addExecutable("test", null); - exe.addCSourceFile("test.c", [][]const u8{"-std=c99"}); + exe.addCSourceFile("test.c", [_][]const u8{"-std=c99"}); exe.linkLibrary(lib); exe.linkSystemLibrary("c"); diff --git a/src-self-hosted/arg.zig b/src-self-hosted/arg.zig index 7bbd233a75..8f95e2d7ef 100644 --- a/src-self-hosted/arg.zig +++ b/src-self-hosted/arg.zig @@ -178,7 +178,7 @@ pub const Args = struct { else => @panic("attempted to retrieve flag with wrong type"), } } else { - return []const []const u8{}; + return [_][]const u8{}; } } }; @@ -238,11 +238,11 @@ pub const Flag = struct { }; test "parse arguments" { - const spec1 = comptime []const Flag{ + const spec1 = comptime [_]Flag{ Flag.Bool("--help"), Flag.Bool("--init"), Flag.Arg1("--build-file"), - Flag.Option("--color", []const []const u8{ + Flag.Option("--color", [_][]const u8{ "on", "off", "auto", @@ -252,7 +252,7 @@ test "parse arguments" { Flag.ArgN("--library", 1), }; - const cliargs = []const []const u8{ + const cliargs = [_][]const u8{ "build", "--help", "pos1", diff --git a/src-self-hosted/c_int.zig b/src-self-hosted/c_int.zig index 10ce54da05..33d2faa5c1 100644 --- a/src-self-hosted/c_int.zig +++ b/src-self-hosted/c_int.zig @@ -15,7 +15,7 @@ pub const CInt = struct { ULongLong, }; - pub const list = []CInt{ + pub const list = [_]CInt{ CInt{ .id = Id.Short, .zig_name = "c_short", diff --git a/src-self-hosted/compilation.zig b/src-self-hosted/compilation.zig index 450fde7219..5171b80ddc 100644 --- a/src-self-hosted/compilation.zig +++ b/src-self-hosted/compilation.zig @@ -102,8 +102,8 @@ pub const ZigCompiler = struct { /// Must be called only once, ever. Sets global state. pub fn setLlvmArgv(allocator: *Allocator, llvm_argv: []const []const u8) !void { if (llvm_argv.len != 0) { - var c_compatible_args = try std.cstr.NullTerminated2DArray.fromSlices(allocator, [][]const []const u8{ - [][]const u8{"zig (LLVM option parsing)"}, + var c_compatible_args = try std.cstr.NullTerminated2DArray.fromSlices(allocator, [_][]const []const u8{ + [_][]const u8{"zig (LLVM option parsing)"}, llvm_argv, }); defer c_compatible_args.deinit(); @@ -421,20 +421,20 @@ pub const Compilation = struct { .strip = false, .is_static = is_static, .linker_rdynamic = false, - .clang_argv = [][]const u8{}, - .lib_dirs = [][]const u8{}, - .rpath_list = [][]const u8{}, - .assembly_files = [][]const u8{}, - .link_objects = [][]const u8{}, + .clang_argv = [_][]const u8{}, + .lib_dirs = [_][]const u8{}, + .rpath_list = [_][]const u8{}, + .assembly_files = [_][]const u8{}, + .link_objects = [_][]const u8{}, .fn_link_set = event.Locked(FnLinkSet).init(loop, FnLinkSet.init()), .windows_subsystem_windows = false, .windows_subsystem_console = false, .link_libs_list = undefined, .libc_link_lib = null, .err_color = errmsg.Color.Auto, - .darwin_frameworks = [][]const u8{}, + .darwin_frameworks = [_][]const u8{}, .darwin_version_min = DarwinVersionMin.None, - .test_filters = [][]const u8{}, + .test_filters = [_][]const u8{}, .test_name_prefix = null, .emit_file_type = Emit.Binary, .link_out_file = null, @@ -487,7 +487,7 @@ pub const Compilation = struct { comp.name = try Buffer.init(comp.arena(), name); comp.llvm_triple = try target.getTriple(comp.arena()); comp.llvm_target = try Target.llvmTargetFromTriple(comp.llvm_triple); - comp.zig_std_dir = try std.fs.path.join(comp.arena(), [][]const u8{ zig_lib_dir, "std" }); + comp.zig_std_dir = try std.fs.path.join(comp.arena(), [_][]const u8{ zig_lib_dir, "std" }); const opt_level = switch (build_mode) { builtin.Mode.Debug => llvm.CodeGenLevelNone, @@ -1196,7 +1196,7 @@ pub const Compilation = struct { const file_name = try std.fmt.allocPrint(self.gpa(), "{}{}", file_prefix[0..], suffix); defer self.gpa().free(file_name); - const full_path = try std.fs.path.join(self.gpa(), [][]const u8{ tmp_dir, file_name[0..] }); + const full_path = try std.fs.path.join(self.gpa(), [_][]const u8{ tmp_dir, file_name[0..] }); errdefer self.gpa().free(full_path); return Buffer.fromOwnedSlice(self.gpa(), full_path); @@ -1217,7 +1217,7 @@ pub const Compilation = struct { const zig_dir_path = try getZigDir(self.gpa()); defer self.gpa().free(zig_dir_path); - const tmp_dir = try std.fs.path.join(self.arena(), [][]const u8{ zig_dir_path, comp_dir_name[0..] }); + const tmp_dir = try std.fs.path.join(self.arena(), [_][]const u8{ zig_dir_path, comp_dir_name[0..] }); try std.fs.makePath(self.gpa(), tmp_dir); return tmp_dir; } diff --git a/src-self-hosted/dep_tokenizer.zig b/src-self-hosted/dep_tokenizer.zig index 0dde6da71c..796202499a 100644 --- a/src-self-hosted/dep_tokenizer.zig +++ b/src-self-hosted/dep_tokenizer.zig @@ -900,7 +900,7 @@ fn printLabel(out: var, label: []const u8, bytes: []const u8) !void { var i: usize = text.len; const end = 79; while (i < 79) : (i += 1) { - try out.write([]const u8{label[0]}); + try out.write([_]u8{label[0]}); } try out.write("\n"); } @@ -993,7 +993,7 @@ fn printHexValue(out: var, value: u64, width: u8) !void { fn printCharValues(out: var, bytes: []const u8) !void { for (bytes) |b| { - try out.write([]const u8{printable_char_tab[b]}); + try out.write([_]u8{printable_char_tab[b]}); } } @@ -1002,7 +1002,7 @@ fn printUnderstandableChar(out: var, char: u8) !void { std.fmt.format(out.context, anyerror, out.output, "\\x{X2}", char) catch {}; } else { try out.write("'"); - try out.write([]const u8{printable_char_tab[char]}); + try out.write([_]u8{printable_char_tab[char]}); try out.write("'"); } } diff --git a/src-self-hosted/introspect.zig b/src-self-hosted/introspect.zig index 538232e620..d5204f031e 100644 --- a/src-self-hosted/introspect.zig +++ b/src-self-hosted/introspect.zig @@ -8,10 +8,10 @@ const warn = std.debug.warn; /// Caller must free result pub fn testZigInstallPrefix(allocator: *mem.Allocator, test_path: []const u8) ![]u8 { - const test_zig_dir = try fs.path.join(allocator, [][]const u8{ test_path, "lib", "zig" }); + const test_zig_dir = try fs.path.join(allocator, [_][]const u8{ test_path, "lib", "zig" }); errdefer allocator.free(test_zig_dir); - const test_index_file = try fs.path.join(allocator, [][]const u8{ test_zig_dir, "std", "std.zig" }); + const test_index_file = try fs.path.join(allocator, [_][]const u8{ test_zig_dir, "std", "std.zig" }); defer allocator.free(test_index_file); var file = try fs.File.openRead(test_index_file); diff --git a/src-self-hosted/libc_installation.zig b/src-self-hosted/libc_installation.zig index 7ca849d10c..e6236c567a 100644 --- a/src-self-hosted/libc_installation.zig +++ b/src-self-hosted/libc_installation.zig @@ -35,7 +35,7 @@ pub const LibCInstallation = struct { ) !void { self.initEmpty(); - const keys = []const []const u8{ + const keys = [_][]const u8{ "include_dir", "lib_dir", "static_lib_dir", @@ -183,7 +183,7 @@ pub const LibCInstallation = struct { async fn findNativeIncludeDirLinux(self: *LibCInstallation, loop: *event.Loop) !void { const cc_exe = std.os.getenv("CC") orelse "cc"; - const argv = []const []const u8{ + const argv = [_][]const u8{ cc_exe, "-E", "-Wp,-v", @@ -231,7 +231,7 @@ pub const LibCInstallation = struct { while (path_i < search_paths.len) : (path_i += 1) { const search_path_untrimmed = search_paths.at(search_paths.len - path_i - 1); const search_path = std.mem.trimLeft(u8, search_path_untrimmed, " "); - const stdlib_path = try fs.path.join(loop.allocator, [][]const u8{ search_path, "stdlib.h" }); + const stdlib_path = try fs.path.join(loop.allocator, [_][]const u8{ search_path, "stdlib.h" }); defer loop.allocator.free(stdlib_path); if (try fileExists(stdlib_path)) { @@ -257,7 +257,7 @@ pub const LibCInstallation = struct { const stdlib_path = try fs.path.join( loop.allocator, - [][]const u8{ result_buf.toSliceConst(), "stdlib.h" }, + [_][]const u8{ result_buf.toSliceConst(), "stdlib.h" }, ); defer loop.allocator.free(stdlib_path); @@ -289,7 +289,7 @@ pub const LibCInstallation = struct { } const ucrt_lib_path = try fs.path.join( loop.allocator, - [][]const u8{ result_buf.toSliceConst(), "ucrt.lib" }, + [_][]const u8{ result_buf.toSliceConst(), "ucrt.lib" }, ); defer loop.allocator.free(ucrt_lib_path); if (try fileExists(ucrt_lib_path)) { @@ -309,7 +309,7 @@ pub const LibCInstallation = struct { } async fn findNativeDynamicLinker(self: *LibCInstallation, loop: *event.Loop) FindError!void { - var dyn_tests = []DynTest{ + var dyn_tests = [_]DynTest{ DynTest{ .name = "ld-linux-x86-64.so.2", .result = null, @@ -367,7 +367,7 @@ pub const LibCInstallation = struct { } const kernel32_path = try fs.path.join( loop.allocator, - [][]const u8{ result_buf.toSliceConst(), "kernel32.lib" }, + [_][]const u8{ result_buf.toSliceConst(), "kernel32.lib" }, ); defer loop.allocator.free(kernel32_path); if (try fileExists(kernel32_path)) { @@ -395,7 +395,7 @@ async fn ccPrintFileName(loop: *event.Loop, o_file: []const u8, want_dirname: bo const cc_exe = std.os.getenv("CC") orelse "cc"; const arg1 = try std.fmt.allocPrint(loop.allocator, "-print-file-name={}", o_file); defer loop.allocator.free(arg1); - const argv = []const []const u8{ cc_exe, arg1 }; + const argv = [_][]const u8{ cc_exe, arg1 }; // TODO This simulates evented I/O for the child process exec await (async loop.yield() catch unreachable); diff --git a/src-self-hosted/link.zig b/src-self-hosted/link.zig index a47dbbbe92..95b71a55c9 100644 --- a/src-self-hosted/link.zig +++ b/src-self-hosted/link.zig @@ -311,7 +311,7 @@ fn constructLinkerArgsElf(ctx: *Context) !void { } fn addPathJoin(ctx: *Context, dirname: []const u8, basename: []const u8) !void { - const full_path = try std.fs.path.join(&ctx.arena.allocator, [][]const u8{ dirname, basename }); + const full_path = try std.fs.path.join(&ctx.arena.allocator, [_][]const u8{ dirname, basename }); const full_path_with_null = try std.cstr.addNullByte(&ctx.arena.allocator, full_path); try ctx.args.append(full_path_with_null.ptr); } @@ -670,7 +670,7 @@ const DarwinPlatform = struct { Compilation.DarwinVersionMin.None => blk: { assert(comp.target.getOs() == .macosx); result.kind = Kind.MacOS; - break :blk "10.10"; + break :blk "10.14"; }, }; @@ -722,7 +722,7 @@ fn darwinGetReleaseVersion(str: []const u8, major: *u32, minor: *u32, micro: *u3 return error.InvalidDarwinVersionString; var start_pos: usize = 0; - for ([]*u32{ major, minor, micro }) |v| { + for ([_]*u32{ major, minor, micro }) |v| { const dot_pos = mem.indexOfScalarPos(u8, str, start_pos, '.'); const end_pos = dot_pos orelse str.len; v.* = std.fmt.parseUnsigned(u32, str[start_pos..end_pos], 10) catch return error.InvalidDarwinVersionString; diff --git a/src-self-hosted/main.zig b/src-self-hosted/main.zig index 4095caa8c4..8917809533 100644 --- a/src-self-hosted/main.zig +++ b/src-self-hosted/main.zig @@ -74,7 +74,7 @@ pub fn main() !void { process.exit(1); } - const commands = []Command{ + const commands = [_]Command{ Command{ .name = "build-exe", .exec = cmdBuildExe, @@ -190,14 +190,14 @@ const usage_build_generic = \\ ; -const args_build_generic = []Flag{ +const args_build_generic = [_]Flag{ Flag.Bool("--help"), - Flag.Option("--color", []const []const u8{ + Flag.Option("--color", [_][]const u8{ "auto", "off", "on", }), - Flag.Option("--mode", []const []const u8{ + Flag.Option("--mode", [_][]const u8{ "debug", "release-fast", "release-safe", @@ -205,7 +205,7 @@ const args_build_generic = []Flag{ }), Flag.ArgMergeN("--assembly", 1), - Flag.Option("--emit", []const []const u8{ + Flag.Option("--emit", [_][]const u8{ "asm", "bin", "llvm-ir", @@ -525,10 +525,10 @@ pub const usage_fmt = \\ ; -pub const args_fmt_spec = []Flag{ +pub const args_fmt_spec = [_]Flag{ Flag.Bool("--help"), Flag.Bool("--check"), - Flag.Option("--color", []const []const u8{ + Flag.Option("--color", [_][]const u8{ "auto", "off", "on", @@ -756,7 +756,7 @@ async fn fmtPath(fmt: *Fmt, file_path_ref: []const u8, check_mode: bool) FmtErro var group = event.Group(FmtError!void).init(fmt.loop); while (try dir.next()) |entry| { if (entry.kind == fs.Dir.Entry.Kind.Directory or mem.endsWith(u8, entry.name, ".zig")) { - const full_path = try fs.path.join(fmt.loop.allocator, [][]const u8{ file_path, entry.name }); + const full_path = try fs.path.join(fmt.loop.allocator, [_][]const u8{ file_path, entry.name }); try group.call(fmtPath, fmt, full_path, check_mode); } } @@ -855,7 +855,7 @@ fn cmdVersion(allocator: *Allocator, args: []const []const u8) !void { try stdout.print("{}\n", std.mem.toSliceConst(u8, c.ZIG_VERSION_STRING)); } -const args_test_spec = []Flag{Flag.Bool("--help")}; +const args_test_spec = [_]Flag{Flag.Bool("--help")}; fn cmdHelp(allocator: *Allocator, args: []const []const u8) !void { try stdout.write(usage); @@ -897,7 +897,7 @@ fn cmdInternal(allocator: *Allocator, args: []const []const u8) !void { process.exit(1); } - const sub_commands = []Command{Command{ + const sub_commands = [_]Command{Command{ .name = "build-info", .exec = cmdInternalBuildInfo, }}; diff --git a/src-self-hosted/stage1.zig b/src-self-hosted/stage1.zig index bc1a746154..9acc45c99a 100644 --- a/src-self-hosted/stage1.zig +++ b/src-self-hosted/stage1.zig @@ -287,7 +287,7 @@ fn fmtPath(fmt: *Fmt, file_path_ref: []const u8, check_mode: bool) FmtError!void while (try dir.next()) |entry| { if (entry.kind == fs.Dir.Entry.Kind.Directory or mem.endsWith(u8, entry.name, ".zig")) { - const full_path = try fs.path.join(fmt.allocator, [][]const u8{ file_path, entry.name }); + const full_path = try fs.path.join(fmt.allocator, [_][]const u8{ file_path, entry.name }); try fmtPath(fmt, full_path, check_mode); } } diff --git a/src-self-hosted/value.zig b/src-self-hosted/value.zig index f1c7fc0b50..328646d2cd 100644 --- a/src-self-hosted/value.zig +++ b/src-self-hosted/value.zig @@ -391,7 +391,7 @@ pub const Value = struct { const array_llvm_value = (try base_array.val.getLlvmConst(ofile)).?; const ptr_bit_count = ofile.comp.target_ptr_bits; const usize_llvm_type = llvm.IntTypeInContext(ofile.context, ptr_bit_count) orelse return error.OutOfMemory; - const indices = []*llvm.Value{ + const indices = [_]*llvm.Value{ llvm.ConstNull(usize_llvm_type) orelse return error.OutOfMemory, llvm.ConstInt(usize_llvm_type, base_array.elem_index, 0) orelse return error.OutOfMemory, }; diff --git a/src/all_types.hpp b/src/all_types.hpp index 810c6b2be7..703ff5aea1 100644 --- a/src/all_types.hpp +++ b/src/all_types.hpp @@ -464,6 +464,7 @@ enum NodeType { NodeTypeContainerInitExpr, NodeTypeStructValueField, NodeTypeArrayType, + NodeTypeInferredArrayType, NodeTypeErrorType, NodeTypeIfErrorExpr, NodeTypeIfOptional, @@ -689,6 +690,10 @@ struct AstNodePointerType { bool is_volatile; }; +struct AstNodeInferredArrayType { + AstNode *child_type; +}; + struct AstNodeArrayType { AstNode *size; AstNode *child_type; @@ -993,6 +998,7 @@ struct AstNode { AstNodeContinueExpr continue_expr; AstNodeUnreachableExpr unreachable_expr; AstNodeArrayType array_type; + AstNodeInferredArrayType inferred_array_type; AstNodeErrorType error_type; AstNodeErrorSetDecl err_set_decl; AstNodeCancelExpr cancel_expr; @@ -2636,6 +2642,7 @@ struct IrInstructionContainerInitList { IrInstruction base; IrInstruction *container_type; + IrInstruction *elem_type; size_t item_count; IrInstruction **items; LLVMValueRef tmp_ptr; diff --git a/src/analyze.cpp b/src/analyze.cpp index 6299ac6699..0168dad6ea 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -3030,6 +3030,7 @@ void scan_decls(CodeGen *g, ScopeDecls *decls_scope, AstNode *node) { case NodeTypeContainerInitExpr: case NodeTypeStructValueField: case NodeTypeArrayType: + case NodeTypeInferredArrayType: case NodeTypeErrorType: case NodeTypeIfErrorExpr: case NodeTypeIfOptional: @@ -6394,12 +6395,14 @@ static void resolve_llvm_types_slice(CodeGen *g, ZigType *type, ResolveStatus wa len_debug_size_in_bits, len_debug_align_in_bits, len_offset_in_bits, - 0, usize_llvm_di_type), + ZigLLVM_DIFlags_Zero, + usize_llvm_di_type), }; ZigLLVMDIType *replacement_di_type = ZigLLVMCreateDebugStructType(g->dbuilder, compile_unit_scope, buf_ptr(&type->name), - di_file, line, debug_size_in_bits, debug_align_in_bits, 0, + di_file, line, debug_size_in_bits, debug_align_in_bits, + ZigLLVM_DIFlags_Zero, nullptr, di_element_types, 1, 0, nullptr, ""); ZigLLVMReplaceTemporary(g->dbuilder, type->llvm_di_type, replacement_di_type); @@ -6431,18 +6434,19 @@ static void resolve_llvm_types_slice(CodeGen *g, ZigType *type, ResolveStatus wa ptr_debug_size_in_bits, ptr_debug_align_in_bits, ptr_offset_in_bits, - 0, get_llvm_di_type(g, ptr_type)), + ZigLLVM_DIFlags_Zero, get_llvm_di_type(g, ptr_type)), ZigLLVMCreateDebugMemberType(g->dbuilder, ZigLLVMTypeToScope(type->llvm_di_type), "len", di_file, line, len_debug_size_in_bits, len_debug_align_in_bits, len_offset_in_bits, - 0, usize_llvm_di_type), + ZigLLVM_DIFlags_Zero, usize_llvm_di_type), }; ZigLLVMDIType *replacement_di_type = ZigLLVMCreateDebugStructType(g->dbuilder, compile_unit_scope, buf_ptr(&type->name), - di_file, line, debug_size_in_bits, debug_align_in_bits, 0, + di_file, line, debug_size_in_bits, debug_align_in_bits, + ZigLLVM_DIFlags_Zero, nullptr, di_element_types, 2, 0, nullptr, ""); ZigLLVMReplaceTemporary(g->dbuilder, type->llvm_di_type, replacement_di_type); @@ -6603,7 +6607,7 @@ static void resolve_llvm_types_struct(CodeGen *g, ZigType *struct_type, ResolveS debug_size_in_bits, debug_align_in_bits, debug_offset_in_bits, - 0, field_di_type); + ZigLLVM_DIFlags_Zero, field_di_type); assert(di_element_types[debug_field_index]); debug_field_index += 1; } @@ -6616,7 +6620,8 @@ static void resolve_llvm_types_struct(CodeGen *g, ZigType *struct_type, ResolveS di_file, line, debug_size_in_bits, debug_align_in_bits, - 0, nullptr, di_element_types, (int)debug_field_count, 0, nullptr, ""); + ZigLLVM_DIFlags_Zero, + nullptr, di_element_types, (int)debug_field_count, 0, nullptr, ""); ZigLLVMReplaceTemporary(g->dbuilder, struct_type->llvm_di_type, replacement_di_type); struct_type->llvm_di_type = replacement_di_type; @@ -6645,7 +6650,8 @@ static void resolve_llvm_types_enum(CodeGen *g, ZigType *enum_type) { import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1), debug_size_in_bits, debug_align_in_bits, - 0, nullptr, di_element_types, (int)debug_field_count, 0, nullptr, ""); + ZigLLVM_DIFlags_Zero, + nullptr, di_element_types, (int)debug_field_count, 0, nullptr, ""); return; } @@ -6729,7 +6735,7 @@ static void resolve_llvm_types_union(CodeGen *g, ZigType *union_type, ResolveSta store_size_in_bits, abi_align_in_bits, 0, - 0, field_di_type); + ZigLLVM_DIFlags_Zero, field_di_type); } @@ -6758,7 +6764,7 @@ static void resolve_llvm_types_union(CodeGen *g, ZigType *union_type, ResolveSta import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1), union_type->data.unionation.union_abi_size * 8, most_aligned_union_member->abi_align * 8, - 0, union_inner_di_types, + ZigLLVM_DIFlags_Zero, union_inner_di_types, gen_field_count, 0, ""); ZigLLVMReplaceTemporary(g->dbuilder, union_type->llvm_di_type, replacement_di_type); @@ -6792,7 +6798,7 @@ static void resolve_llvm_types_union(CodeGen *g, ZigType *union_type, ResolveSta ZigLLVMTypeToScope(union_type->llvm_di_type), "AnonUnion", import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1), most_aligned_union_member->size_in_bits, 8*most_aligned_union_member->abi_align, - 0, union_inner_di_types, gen_field_count, 0, ""); + ZigLLVM_DIFlags_Zero, union_inner_di_types, gen_field_count, 0, ""); uint64_t union_offset_in_bits = 8*LLVMOffsetOfElement(g->target_data_ref, union_type->llvm_type, union_type->data.unionation.gen_union_index); @@ -6805,7 +6811,7 @@ static void resolve_llvm_types_union(CodeGen *g, ZigType *union_type, ResolveSta most_aligned_union_member->size_in_bits, 8*most_aligned_union_member->abi_align, union_offset_in_bits, - 0, union_di_type); + ZigLLVM_DIFlags_Zero, union_di_type); uint64_t tag_debug_size_in_bits = tag_type->size_in_bits; uint64_t tag_debug_align_in_bits = 8*tag_type->abi_align; @@ -6816,7 +6822,7 @@ static void resolve_llvm_types_union(CodeGen *g, ZigType *union_type, ResolveSta tag_debug_size_in_bits, tag_debug_align_in_bits, tag_offset_in_bits, - 0, get_llvm_di_type(g, tag_type)); + ZigLLVM_DIFlags_Zero, get_llvm_di_type(g, tag_type)); ZigLLVMDIType *di_root_members[2]; di_root_members[union_type->data.unionation.gen_tag_index] = tag_member_di_type; @@ -6830,7 +6836,7 @@ static void resolve_llvm_types_union(CodeGen *g, ZigType *union_type, ResolveSta import->data.structure.root_struct->di_file, (unsigned)(decl_node->line + 1), debug_size_in_bits, debug_align_in_bits, - 0, nullptr, di_root_members, 2, 0, nullptr, ""); + ZigLLVM_DIFlags_Zero, nullptr, di_root_members, 2, 0, nullptr, ""); ZigLLVMReplaceTemporary(g->dbuilder, union_type->llvm_di_type, replacement_di_type); union_type->llvm_di_type = replacement_di_type; @@ -6958,18 +6964,18 @@ static void resolve_llvm_types_optional(CodeGen *g, ZigType *type) { val_debug_size_in_bits, val_debug_align_in_bits, val_offset_in_bits, - 0, child_llvm_di_type), + ZigLLVM_DIFlags_Zero, child_llvm_di_type), ZigLLVMCreateDebugMemberType(g->dbuilder, ZigLLVMTypeToScope(type->llvm_di_type), "maybe", di_file, line, maybe_debug_size_in_bits, maybe_debug_align_in_bits, maybe_offset_in_bits, - 0, bool_llvm_di_type), + ZigLLVM_DIFlags_Zero, bool_llvm_di_type), }; ZigLLVMDIType *replacement_di_type = ZigLLVMCreateDebugStructType(g->dbuilder, compile_unit_scope, buf_ptr(&type->name), - di_file, line, debug_size_in_bits, debug_align_in_bits, 0, + di_file, line, debug_size_in_bits, debug_align_in_bits, ZigLLVM_DIFlags_Zero, nullptr, di_element_types, 2, 0, nullptr, ""); ZigLLVMReplaceTemporary(g->dbuilder, type->llvm_di_type, replacement_di_type); @@ -7022,13 +7028,13 @@ static void resolve_llvm_types_error_union(CodeGen *g, ZigType *type) { tag_debug_size_in_bits, tag_debug_align_in_bits, tag_offset_in_bits, - 0, get_llvm_di_type(g, err_set_type)), + ZigLLVM_DIFlags_Zero, get_llvm_di_type(g, err_set_type)), ZigLLVMCreateDebugMemberType(g->dbuilder, ZigLLVMTypeToScope(type->llvm_di_type), "value", di_file, line, value_debug_size_in_bits, value_debug_align_in_bits, value_offset_in_bits, - 0, get_llvm_di_type(g, payload_type)), + ZigLLVM_DIFlags_Zero, get_llvm_di_type(g, payload_type)), }; ZigLLVMDIType *replacement_di_type = ZigLLVMCreateDebugStructType(g->dbuilder, @@ -7037,7 +7043,7 @@ static void resolve_llvm_types_error_union(CodeGen *g, ZigType *type) { di_file, line, debug_size_in_bits, debug_align_in_bits, - 0, + ZigLLVM_DIFlags_Zero, nullptr, di_element_types, 2, 0, nullptr, ""); ZigLLVMReplaceTemporary(g->dbuilder, type->llvm_di_type, replacement_di_type); diff --git a/src/ast_render.cpp b/src/ast_render.cpp index 078cd61edd..6ea6dc4eff 100644 --- a/src/ast_render.cpp +++ b/src/ast_render.cpp @@ -239,6 +239,8 @@ static const char *node_type_str(NodeType node_type) { return "ContainerInitExpr"; case NodeTypeArrayType: return "ArrayType"; + case NodeTypeInferredArrayType: + return "InferredArrayType"; case NodeTypeErrorType: return "ErrorType"; case NodeTypeIfErrorExpr: @@ -352,7 +354,7 @@ static void string_literal_escape(Buf *source, Buf *dest) { } else if (is_printable(c)) { buf_append_char(dest, c); } else { - buf_appendf(dest, "\\x%x", (int)c); + buf_appendf(dest, "\\x%02x", (int)c); } } } @@ -848,6 +850,12 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) { render_node_ungrouped(ar, node->data.array_type.child_type); break; } + case NodeTypeInferredArrayType: + { + fprintf(ar->f, "[_]"); + render_node_ungrouped(ar, node->data.inferred_array_type.child_type); + break; + } case NodeTypePromiseType: { fprintf(ar->f, "promise"); diff --git a/src/codegen.cpp b/src/codegen.cpp index 4fa13c39a2..763e1e1c50 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -48,7 +48,7 @@ static void init_darwin_native(CodeGen *g) { } else if (ios_target) { g->mios_version_min = buf_create_from_str(ios_target); } else if (g->zig_target->os != OsIOS) { - g->mmacosx_version_min = buf_create_from_str("10.10"); + g->mmacosx_version_min = buf_create_from_str("10.14"); } } @@ -674,7 +674,7 @@ static ZigLLVMDIScope *get_di_scope(CodeGen *g, Scope *scope) { bool is_optimized = g->build_mode != BuildModeDebug; bool is_internal_linkage = (fn_table_entry->body_node != nullptr && fn_table_entry->export_list.length == 0); - unsigned flags = 0; + unsigned flags = ZigLLVM_DIFlags_StaticMember; ZigLLVMDIScope *fn_di_scope = get_di_scope(g, scope->parent); assert(fn_di_scope != nullptr); ZigLLVMDISubprogram *subprogram = ZigLLVMCreateFunction(g->dbuilder, @@ -7267,7 +7267,7 @@ static void define_builtin_types(CodeGen *g) { buf_init_from_str(&entry->name, "void"); entry->llvm_di_type = ZigLLVMCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name), 0, - ZigLLVMEncoding_DW_ATE_unsigned()); + ZigLLVMEncoding_DW_ATE_signed()); g->builtin_types.entry_void = entry; g->primitive_type_table.put(&entry->name, entry); } diff --git a/src/ir.cpp b/src/ir.cpp index 2ad36a81f2..84c7dc6342 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -1484,15 +1484,17 @@ static IrInstruction *ir_build_un_op(IrBuilder *irb, Scope *scope, AstNode *sour } static IrInstruction *ir_build_container_init_list(IrBuilder *irb, Scope *scope, AstNode *source_node, - IrInstruction *container_type, size_t item_count, IrInstruction **items) + IrInstruction *container_type, IrInstruction *elem_type, size_t item_count, IrInstruction **items) { IrInstructionContainerInitList *container_init_list_instruction = ir_build_instruction