drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

[Mammoth] Move all callers of FromCapability to OwnedMemoryObject.

Browse source
This commit is contained in:
Drew Galbraith 2023-11-19 20:33:15 -08:00
parent 337126cabb
commit 8e827a5dfb
24 changed files with 175 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/glacier/string/str_format.cpp
View file

@ -20,27 +20,32 @@ void StrFormatNumber(StringBuilder& builder, uint64_t value, uint64_t base) {
} // namespace
template <>
void StrFormatValue(StringBuilder& builder, uint8_t value, StringView opts) {
void StrFormatValue(StringBuilder& builder, const uint8_t& value,
StringView opts) {
StrFormatValue(builder, static_cast<uint64_t>(value), opts);
}
template <>
void StrFormatValue(StringBuilder& builder, uint16_t value, StringView opts) {
void StrFormatValue(StringBuilder& builder, const uint16_t& value,
StringView opts) {
StrFormatValue(builder, static_cast<uint64_t>(value), opts);
}
template <>
void StrFormatValue(StringBuilder& builder, int32_t value, StringView opts) {
void StrFormatValue(StringBuilder& builder, const int32_t& value,
StringView opts) {
StrFormatValue(builder, static_cast<uint64_t>(value), opts);
}
template <>
void StrFormatValue(StringBuilder& builder, uint32_t value, StringView opts) {
void StrFormatValue(StringBuilder& builder, const uint32_t& value,
StringView opts) {
StrFormatValue(builder, static_cast<uint64_t>(value), opts);
}
template <>
void StrFormatValue(StringBuilder& builder, uint64_t value, StringView opts) {
void StrFormatValue(StringBuilder& builder, const uint64_t& value,
StringView opts) {
if (opts.find('x') != opts.npos) {
builder.PushBack("0x");
StrFormatNumber(builder, value, 16);
@ -50,23 +55,26 @@ void StrFormatValue(StringBuilder& builder, uint64_t value, StringView opts) {
}
template <>
void StrFormatValue(StringBuilder& builder, ErrorCode value, StringView opts) {
void StrFormatValue(StringBuilder& builder, const ErrorCode& value,
StringView opts) {
StrFormatValue(builder, static_cast<uint64_t>(value), opts);
}
template <>
void StrFormatValue(StringBuilder& builder, char value, StringView opts) {
void StrFormatValue(StringBuilder& builder, const char& value,
StringView opts) {
builder.PushBack(value);
}
template <>
void StrFormatValue(StringBuilder& builder, const char* value,
void StrFormatValue(StringBuilder& builder, char const* const& value,
StringView opts) {
StrFormatValue(builder, StringView(value), opts);
StrFormatInternal(builder, StringView(value));
}
template <>
void StrFormatValue(StringBuilder& builder, StringView value, StringView opts) {
void StrFormatValue(StringBuilder& builder, const StringView& value,
StringView opts) {
StrFormatInternal(builder, value);
}

38
lib/glacier/string/str_format.h
View file

@ -7,41 +7,51 @@
namespace glcr {
// FIXME: We need some meta-programming here to allow pass-by-value for pointers
// and primitives.
template <typename T>
void StrFormatValue(StringBuilder& builder, T value, StringView opts);
void StrFormatValue(StringBuilder& builder, const T& value, StringView opts);
template <>
void StrFormatValue(StringBuilder& builder, uint8_t value, StringView opts);
void StrFormatValue(StringBuilder& builder, const uint8_t& value,
StringView opts);
template <>
void StrFormatValue(StringBuilder& builder, uint16_t value, StringView opts);
void StrFormatValue(StringBuilder& builder, const uint16_t& value,
StringView opts);
template <>
void StrFormatValue(StringBuilder& builder, int32_t value, StringView opts);
void StrFormatValue(StringBuilder& builder, const int32_t& value,
StringView opts);
template <>
void StrFormatValue(StringBuilder& builder, uint32_t value, StringView opts);
void StrFormatValue(StringBuilder& builder, const uint32_t& value,
StringView opts);
template <>
void StrFormatValue(StringBuilder& builder, uint64_t value, StringView opts);
void StrFormatValue(StringBuilder& builder, const uint64_t& value,
StringView opts);
template <>
void StrFormatValue(StringBuilder& builder, ErrorCode value, StringView opts);
void StrFormatValue(StringBuilder& builder, const ErrorCode& value,
StringView opts);
template <>
void StrFormatValue(StringBuilder& builder, char value, StringView opts);
void StrFormatValue(StringBuilder& builder, const char& value, StringView opts);
template <>
void StrFormatValue(StringBuilder& builder, const char* value, StringView opts);
void StrFormatValue(StringBuilder& builder, char const* const& value,
StringView opts);
template <>
void StrFormatValue(StringBuilder& builder, StringView value, StringView opts);
void StrFormatValue(StringBuilder& builder, const StringView& value,
StringView opts);
void StrFormatInternal(StringBuilder& builder, StringView format);
template <typename T, typename... Args>
void StrFormatInternal(StringBuilder& builder, StringView format, T value,
Args... args) {
void StrFormatInternal(StringBuilder& builder, StringView format,
const T& value, Args&&... args) {
uint64_t posl = format.find('{');
uint64_t posr = format.find('}', posl);
if (posl == format.npos || posr == format.npos) {
@ -56,7 +66,7 @@ void StrFormatInternal(StringBuilder& builder, StringView format, T value,
}
template <typename... Args>
String StrFormat(StringView format, Args... args) {
String StrFormat(StringView format, Args&&... args) {
VariableStringBuilder builder;
StrFormatInternal(builder, format, args...);
return builder.ToString();
@ -64,7 +74,7 @@ String StrFormat(StringView format, Args... args) {
template <typename... Args>
void StrFormatIntoBuffer(StringBuilder& builder, StringView format,
Args... args) {
Args&&... args) {
StrFormatInternal(builder, format, args...);
}