fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-11-28 05:09:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge more format overloads

Browse Source
This commit is contained in:
Victor Zverovich
2018-07-22 09:39:50 -07:00
parent 4f16409730
commit 35538ca66c
5 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/fmt/format.h
View File

@@ -1352,10 +1352,13 @@ FMT_CONSTEXPR unsigned basic_parse_context<Char, ErrorHandler>::next_arg_id() {
return 0;
}
struct compile_string {};
namespace internal {
template <typename S>
struct format_string_traits<
S, typename std::enable_if<std::is_base_of<compile_string, S>::value>::type>:
format_string_traits_base<char> {};
template <typename Char, typename Handler>
FMT_CONSTEXPR void handle_int_type_spec(Char spec, Handler &&handler) {
switch (spec) {
@@ -1536,8 +1539,6 @@ class arg_formatter_base {
writer_type writer_;
format_specs &specs_;
FMT_DISALLOW_COPY_AND_ASSIGN(arg_formatter_base);
struct char_writer {
char_type value;
template <typename It>
@@ -1645,10 +1646,6 @@ class arg_formatter_base {
}
};
template <typename S>
struct is_compile_string:
std::integral_constant<bool, std::is_base_of<compile_string, S>::value> {};
template <typename Char>
FMT_CONSTEXPR bool is_name_start(Char c) {
return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || '_' == c;
@@ -2464,13 +2461,9 @@ class basic_writer {
typedef basic_format_specs<char_type> format_specs;
private:
// Output iterator.
iterator out_;
iterator out_; // Output iterator.
std::unique_ptr<locale_provider> locale_;
FMT_DISALLOW_COPY_AND_ASSIGN(basic_writer);
iterator out() const { return out_; }
// Attempts to reserve space for n extra characters in the output range.
@@ -3677,14 +3670,6 @@ inline std::wstring vformat(wstring_view format_str, wformat_args args) {
return to_string(buffer);
}
template <typename String, typename... Args>
inline typename std::enable_if<
internal::is_compile_string<String>::value, std::string>::type
format(String format_str, const Args & ... args) {
internal::check_format_string<Args...>(format_str);
return vformat(format_str.data(), make_format_args(args...));
}
template <typename String, typename... Args>
inline typename std::enable_if<internal::is_compile_string<String>::value>::type
print(String format_str, const Args & ... args) {
@@ -3983,6 +3968,7 @@ FMT_END_NAMESPACE
struct S : fmt::compile_string { \
static FMT_CONSTEXPR pointer data() { return s; } \
static FMT_CONSTEXPR size_t size() { return sizeof(s); } \
explicit operator fmt::string_view() const { return s; } \
}; \
return S{}; \
}()