Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-15 16:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: Fix endless loop in fmt impl

Browse Source 
Apparently there's a stage1 bug that may sometimes lead to an endless
loop being generated when unrolling the fmt impl.

Closes #9961
This commit is contained in:
LemonBoy 2021-10-17 15:52:19 +02:00 committed by Andrew Kelley
parent 98a37dfb23
commit 51be575745
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/std/fmt.zig
View File

@ -295,21 +295,21 @@ pub fn format(
}
// Parse the width parameter
options.width = init: {
if (comptime parser.maybe('[')) {
const arg_name = comptime parser.until(']');
options.width = comptime init: {
if (parser.maybe('[')) {
const arg_name = parser.until(']');
if (!comptime parser.maybe(']')) {
if (!parser.maybe(']')) {
@compileError("Expected closing ]");
}
const index = comptime meta.fieldIndex(ArgsType, arg_name) orelse
const index = meta.fieldIndex(ArgsType, arg_name) orelse
@compileError("No argument with name '" ++ arg_name ++ "'");
const arg_index = comptime arg_state.nextArg(index);
const arg_index = arg_state.nextArg(index);
break :init @field(args, fields_info[arg_index].name);
} else {
break :init comptime parser.number();
break :init parser.number();
}
};
@ -321,21 +321,21 @@ pub fn format(
}
// Parse the precision parameter
options.precision = init: {
if (comptime parser.maybe('[')) {
const arg_name = comptime parser.until(']');
options.precision = comptime init: {
if (parser.maybe('[')) {
const arg_name = parser.until(']');
if (!comptime parser.maybe(']')) {
if (!parser.maybe(']')) {
@compileError("Expected closing ]");
}
const arg_i = comptime meta.fieldIndex(ArgsType, arg_name) orelse
const arg_i = meta.fieldIndex(ArgsType, arg_name) orelse
@compileError("No argument with name '" ++ arg_name ++ "'");
const arg_to_use = comptime arg_state.nextArg(arg_i);
const arg_to_use = arg_state.nextArg(arg_i);
break :init @field(args, fields_info[arg_to_use].name);
} else {
break :init comptime parser.number();
break :init parser.number();
}
};
@ -2576,6 +2576,8 @@ test "runtime width specifier" {
var width: usize = 9;
try expectFmt("~~hello~~", "{s:~^[1]}", .{ "hello", width });
try expectFmt("~~hello~~", "{s:~^[width]}", .{ .string = "hello", .width = width });
try expectFmt(" hello", "{s:[1]}", .{ "hello", width });
try expectFmt("42 hello", "{d} {s:[2]}", .{ 42, "hello", width });
}
test "runtime precision specifier" {