External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix coding conventions.

Browse Source
This commit is contained in:
olivier80 2017-02-05 23:18:12 +01:00
parent 61a1ab27dd
commit 74b1f38715
1 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
fmt/format.h
View File

@ -3870,69 +3870,63 @@ void BasicFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
template <typename Char, typename It> template <typename Char, typename It>
struct ArgJoin struct ArgJoin
{ {
It first; It first;
It last; It last;
BasicCStringRef<Char> sep; BasicCStringRef<Char> sep;
ArgJoin(It first, It last, const BasicCStringRef<Char>& sep) : ArgJoin(It first, It last, const BasicCStringRef<Char>& sep) :
first(first), first(first),
last(last), last(last),
sep(sep) sep(sep) {}
{
}
}; };
template <typename It> template <typename It>
ArgJoin<char, It> join(It first, It last, const BasicCStringRef<char>& sep) ArgJoin<char, It> join(It first, It last, const BasicCStringRef<char>& sep) {
{ return ArgJoin<char, It>(first, last, sep);
return ArgJoin<char, It>(first, last, sep);
} }
template <typename It> template <typename It>
ArgJoin<wchar_t, It> join(It first, It last, const BasicCStringRef<wchar_t>& sep) ArgJoin<wchar_t, It> join(It first, It last, const BasicCStringRef<wchar_t>& sep) {
{ return ArgJoin<wchar_t, It>(first, last, sep);
return ArgJoin<wchar_t, It>(first, last, sep);
} }
#if FMT_HAS_GXX_CXX11 #if FMT_HAS_GXX_CXX11
template <typename Range> template <typename Range>
auto join(const Range& range, const BasicCStringRef<char>& sep) -> ArgJoin<char, decltype(std::begin(range))> auto join(const Range& range, const BasicCStringRef<char>& sep)
{ -> ArgJoin<char, decltype(std::begin(range))> {
return join(std::begin(range), std::end(range), sep); return join(std::begin(range), std::end(range), sep);
} }
template <typename Range> template <typename Range>
auto join(const Range& range, const BasicCStringRef<wchar_t>& sep) -> ArgJoin<wchar_t, decltype(std::begin(range))> auto join(const Range& range, const BasicCStringRef<wchar_t>& sep)
{ -> ArgJoin<wchar_t, decltype(std::begin(range))> {
return join(std::begin(range), std::end(range), sep); return join(std::begin(range), std::end(range), sep);
} }
#endif #endif
template <typename ArgFormatter, typename Char, typename It> template <typename ArgFormatter, typename Char, typename It>
void format_arg(fmt::BasicFormatter<Char, ArgFormatter> &f, void format_arg(fmt::BasicFormatter<Char, ArgFormatter> &f,
const Char *&format_str, const ArgJoin<Char, It>& e) { const Char *&format_str, const ArgJoin<Char, It>& e) {
const Char* end = format_str; const Char* end = format_str;
if (*end == ':') if (*end == ':')
++end; ++end;
while (*end && *end != '}') while (*end && *end != '}')
++end; ++end;
if (*end != '}') if (*end != '}')
FMT_THROW(FormatError("missing '}' in format string")); FMT_THROW(FormatError("missing '}' in format string"));
It it = e.first; It it = e.first;
if (it != e.last) if (it != e.last) {
{ const Char* save = format_str;
const Char* save = format_str; f.format(format_str, internal::MakeArg<fmt::BasicFormatter<Char, ArgFormatter> >(*it++));
while (it != e.last) {
f.writer().write(e.sep);
format_str = save;
f.format(format_str, internal::MakeArg<fmt::BasicFormatter<Char, ArgFormatter> >(*it++)); f.format(format_str, internal::MakeArg<fmt::BasicFormatter<Char, ArgFormatter> >(*it++));
while (it != e.last) }
{ }
f.writer().write(e.sep); format_str = end + 1;
format_str = save;
f.format(format_str, internal::MakeArg<fmt::BasicFormatter<Char, ArgFormatter> >(*it++));
}
}
format_str = end + 1;
} }