mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-10-02 13:02:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add to_string_view

Browse Source
This commit is contained in:
Victor Zverovich 2018-10-01 07:34:13 -07:00
parent 4e0c314654
commit 63a87beba4
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/fmt/core.h
View File

@ -1314,6 +1314,11 @@ struct checked_args: format_arg_store<
basic_format_args<context> operator*() const { return *this; } basic_format_args<context> operator*() const { return *this; }
}; };
template <typename S>
inline basic_string_view<FMT_CHAR(S)> to_string_view(const S &s) {
return basic_string_view<FMT_CHAR(S)>(s);
}
template <typename Char> template <typename Char>
std::basic_string<Char> vformat( std::basic_string<Char> vformat(
basic_string_view<Char> format_str, basic_string_view<Char> format_str,
@ -1361,17 +1366,15 @@ inline typename std::enable_if<
std::back_insert_iterator<Container>>::type std::back_insert_iterator<Container>>::type
format_to(std::back_insert_iterator<Container> out, const S &format_str, format_to(std::back_insert_iterator<Container> out, const S &format_str,
const Args &... args) { const Args &... args) {
return vformat_to( return vformat_to(out, internal::to_string_view(format_str),
out, basic_string_view<FMT_CHAR(S)>(format_str), internal::checked_args<S, Args...>(format_str, args...));
internal::checked_args<S, Args...>(format_str, args...));
} }
template <typename S> template <typename S>
inline std::basic_string<FMT_CHAR(S)> vformat( inline std::basic_string<FMT_CHAR(S)> vformat(
const S &format_str, const S &format_str,
basic_format_args<typename buffer_context<FMT_CHAR(S)>::type> args) { basic_format_args<typename buffer_context<FMT_CHAR(S)>::type> args) {
// Convert format string to string_view to reduce the number of overloads. return internal::vformat(internal::to_string_view(format_str), args);
return internal::vformat(basic_string_view<FMT_CHAR(S)>(format_str), args);
} }
/** /**
@ -1388,7 +1391,7 @@ template <typename S, typename... Args>
inline std::basic_string<FMT_CHAR(S)> format( inline std::basic_string<FMT_CHAR(S)> format(
const S &format_str, const Args &... args) { const S &format_str, const Args &... args) {
return internal::vformat( return internal::vformat(
basic_string_view<FMT_CHAR(S)>(format_str), internal::to_string_view(format_str),
*internal::checked_args<S, Args...>(format_str, args...)); *internal::checked_args<S, Args...>(format_str, args...));
} }
@ -1409,7 +1412,7 @@ FMT_API void vprint(std::FILE *f, wstring_view format_str, wformat_args args);
template <typename S, typename... Args> template <typename S, typename... Args>
inline typename std::enable_if<internal::is_format_string<S>::value>::type inline typename std::enable_if<internal::is_format_string<S>::value>::type
print(std::FILE *f, const S &format_str, const Args &... args) { print(std::FILE *f, const S &format_str, const Args &... args) {
vprint(f, basic_string_view<FMT_CHAR(S)>(format_str), vprint(f, internal::to_string_view(format_str),
internal::checked_args<S, Args...>(format_str, args...)); internal::checked_args<S, Args...>(format_str, args...));
} }
@ -1428,7 +1431,7 @@ FMT_API void vprint(wstring_view format_str, wformat_args args);
template <typename S, typename... Args> template <typename S, typename... Args>
inline typename std::enable_if<internal::is_format_string<S>::value>::type inline typename std::enable_if<internal::is_format_string<S>::value>::type
print(const S &format_str, const Args &... args) { print(const S &format_str, const Args &... args) {
vprint(basic_string_view<FMT_CHAR(S)>(format_str), vprint(internal::to_string_view(format_str),
internal::checked_args<S, Args...>(format_str, args...)); internal::checked_args<S, Args...>(format_str, args...));
} }
FMT_END_NAMESPACE FMT_END_NAMESPACE