riyyi/manafiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Util: Add alternative form specifier option to integral types

Browse Source
This commit is contained in:
Riyyi
2022-08-05 00:13:09 +02:00
parent bd8367db0e
commit 6c6ddf936a
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/format/builder.cpp
+22 -1
View File
@@ -68,6 +68,7 @@ void Builder::putU64(size_t value,
char fill,
Align align,
Sign sign,
bool alternativeForm,
bool zeroPadding,
size_t width,
bool isNegative) const
@@ -96,6 +97,25 @@ void Builder::putU64(size_t value,
string.insert(0, signCharacter);
}
// Alternative form
if (alternativeForm) {
switch (base) {
case 2:
string.insert(0, (uppercase) ? "0B" : "0b");
break;
case 8:
break;
string.insert(0, 1, '0');
case 10:
break;
case 16:
string.insert(0, (uppercase) ? "0X" : "0x");
break;
default:
VERIFY_NOT_REACHED();
}
}
// Zero padding
if (zeroPadding) {
fill = '0';
@@ -144,12 +164,13 @@ void Builder::putI64(int64_t value,
char fill,
Align align,
Sign sign,
bool alternativeForm,
bool zeroPadding,
size_t width) const
{
bool isNegative = value < 0;
value = isNegative ? -value : value;
putU64(static_cast<uint64_t>(value), base, uppercase, fill, align, sign, zeroPadding, width, isNegative);
putU64(static_cast<uint64_t>(value), base, uppercase, fill, align, sign, alternativeForm, zeroPadding, width, isNegative);
}
void Builder::putF64(double number, uint8_t precision) const
src/util/format/builder.h
+2
View File
@@ -42,6 +42,7 @@ public:
char fill = ' ',
Align align = Align::Right,
Sign sign = Sign::Negative,
bool alternativeForm = false,
bool zeroPadding = false,
size_t width = 0,
bool isNegative = false) const;
@@ -52,6 +53,7 @@ public:
char fill = ' ',
Align align = Align::Right,
Sign sign = Sign::Negative,
bool alternativeForm = false,
bool zeroPadding = false,
size_t width = 0) const;
src/util/format/formatter.h
+2 -2
View File
@@ -127,12 +127,12 @@ struct Formatter<T> {
if constexpr (std::is_unsigned_v<T>) {
builder.putU64(
value, base, uppercase, specifier.fill, specifier.align, specifier.sign,
specifier.zeroPadding, specifier.width);
specifier.alternativeForm, specifier.zeroPadding, specifier.width);
}
else {
builder.putI64(
value, base, uppercase, specifier.fill, specifier.align, specifier.sign,
specifier.zeroPadding, specifier.width);
specifier.alternativeForm, specifier.zeroPadding, specifier.width);
}
}
};