mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-26 13:10:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix #10699 - std.format with position with omitted second number does not work (#10716)

Browse source
This commit is contained in:
Richard (Rikki) Andrew Cattermole 2025-03-28 21:49:06 +13:00 • committed by GitHub
parent 530660bd9b
commit 205256abb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
std/format/spec.d
View file

@ -127,14 +127,16 @@ if (is(Unqual!Char == Char))
Counting starts with `1`. Set to `0` if not used. Default: `0`.
*/
ubyte indexStart;
ushort indexStart;
/**
Index of the last argument for positional parameter ranges.
Counting starts with `1`. Set to `0` if not used. Default: `0`.
The maximum value of this field is used as a sentinel to indicate the arguments' length.
*/
ubyte indexEnd;
ushort indexEnd;
version (StdDdoc)
{
@ -851,6 +853,18 @@ if (is(Unqual!Char == Char))
assert(f.indexStart == 0);
}
// https://github.com/dlang/phobos/issues/10699
@safe pure unittest
{
import std.array : appender;
auto f = FormatSpec!char("%1:$d");
auto w = appender!(char[])();
f.writeUpToNextSpec(w);
assert(f.indexStart == 1);
assert(f.indexEnd == ushort.max);
}
/**
Helper function that returns a `FormatSpec` for a single format specifier.

17
std/format/write.d
View file

@ -648,9 +648,16 @@ uint formattedWrite(Writer, Char, Args...)(auto ref Writer w, const scope Char[]
break SWITCH;
}
default:
if (spec.indexEnd == spec.indexEnd.max)
break;
else if (spec.indexEnd == spec.indexStart)
throw new FormatException(
text("Positional specifier %", spec.indexStart, '$', spec.spec,
" index exceeds ", Args.length));
else
throw new FormatException(
text("Positional specifier %", spec.indexStart, ":", spec.indexEnd, '$', spec.spec,
" index exceeds ", Args.length));
}
}
return currentArg;
@ -1199,6 +1206,16 @@ if (isSomeString!(typeof(fmt)))
formattedWrite(stream, "%s", aa);
}
// https://github.com/dlang/phobos/issues/10699
@safe pure unittest
{
import std.array : appender;
auto w = appender!(char[])();
formattedWrite(w, "%1:$d", 1, 2, 3);
assert(w.data == "123");
}
/**
Formats a value of any type according to a format specifier and
writes the result to an output range.