Skip to content

[formatv] Leave format parameters unstripped #112625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2024
Merged

[formatv] Leave format parameters unstripped #112625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions llvm/lib/Support/FormatVariadic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,21 +64,20 @@ static std::optional<ReplacementItem> parseReplacementItem(StringRef Spec) {
AlignStyle Where = AlignStyle::Right;
StringRef Options;
unsigned Index = ~0U;
RepString = RepString.trim();
RepString = RepString.ltrim();

// If index is not specified, keep it ~0U to indicate unresolved index.
RepString.consumeInteger(0, Index);
RepString = RepString.trim();

if (RepString.consume_front(",")) {
if (!consumeFieldLayout(RepString, Where, Align, Pad)) {
assert(false && "Invalid replacement field layout specification!");
return std::nullopt;
}
}
RepString = RepString.trim();
RepString = RepString.ltrim();
if (RepString.consume_front(":")) {
Options = RepString.trim();
Options = RepString;
RepString = StringRef();
}
RepString = RepString.trim();
Expand Down
2 changes: 1 addition & 1 deletion llvm/unittests/Support/FormatVariadicTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ TEST(FormatVariadicTest, ValidReplacementSequence) {
EXPECT_EQ(0u, Replacements[0].Index);
EXPECT_EQ(3u, Replacements[0].Width);
EXPECT_EQ(AlignStyle::Left, Replacements[0].Where);
EXPECT_EQ("foo", Replacements[0].Options);
EXPECT_EQ(" foo ", Replacements[0].Options);

// 8. Everything after the first option specifier is part of the style, even
// if it contains another option specifier.
Expand Down
Loading