JDBtracker
/
libostd
forked from OctaForge/libostd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add a format() overload to format a single spec without a format string + use

master
Daniel Kolesa 2017-02-11 00:18:41 +01:00
parent d56a233120
commit 13477db869
3 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
ostd/format.hh
View File

@ -197,7 +197,7 @@ struct FormatSpec {
} }
template<typename R> template<typename R>
size_t build_spec(R &&out, ConstCharRange spec) { size_t build_spec(R &&out, ConstCharRange spec) const {
size_t ret = out.put('%'); size_t ret = out.put('%');
if (p_flags & FMT_FLAG_DASH ) { if (p_flags & FMT_FLAG_DASH ) {
ret += out.put('-'); ret += out.put('-');
@ -503,19 +503,18 @@ namespace detail {
template<typename R, typename ...A> template<typename R, typename ...A>
static ptrdiff_t format_impl( static ptrdiff_t format_impl(
R &writer, size_t &fmtn, bool escape, R &writer, bool escape, ConstCharRange fmt, A const &...args
ConstCharRange fmt, A const &...args
); );
template<size_t I> template<size_t I>
struct FmtTupleUnpacker { struct FmtTupleUnpacker {
template<typename R, typename T, typename ...A> template<typename R, typename T, typename ...A>
static inline ptrdiff_t unpack( static inline ptrdiff_t unpack(
R &writer, size_t &fmtn, bool esc, ConstCharRange fmt, R &writer, bool esc, ConstCharRange fmt,
T const &item, A const &...args T const &item, A const &...args
) { ) {
return FmtTupleUnpacker<I - 1>::unpack( return FmtTupleUnpacker<I - 1>::unpack(
writer, fmtn, esc, fmt, item, std::get<I - 1>(item), args... writer, esc, fmt, item, std::get<I - 1>(item), args...
); );
} }
}; };
@ -524,10 +523,10 @@ namespace detail {
struct FmtTupleUnpacker<0> { struct FmtTupleUnpacker<0> {
template<typename R, typename T, typename ...A> template<typename R, typename T, typename ...A>
static inline ptrdiff_t unpack( static inline ptrdiff_t unpack(
R &writer, size_t &fmtn, bool esc, ConstCharRange fmt, R &writer, bool esc, ConstCharRange fmt,
T const &, A const &...args T const &, A const &...args
) { ) {
return format_impl(writer, fmtn, esc, fmt, args...); return format_impl(writer, esc, fmt, args...);
} }
}; };
@ -545,23 +544,23 @@ namespace detail {
template<typename R, typename T> template<typename R, typename T>
inline ptrdiff_t format_ritem( inline ptrdiff_t format_ritem(
R &writer, size_t &fmtn, bool esc, bool, ConstCharRange fmt, R &writer, bool esc, bool, ConstCharRange fmt,
T const &item, std::enable_if_t<!is_tuple_like<T>, bool> = true T const &item, std::enable_if_t<!is_tuple_like<T>, bool> = true
) { ) {
return format_impl(writer, fmtn, esc, fmt, item); return format_impl(writer, esc, fmt, item);
} }
template<typename R, typename T> template<typename R, typename T>
inline ptrdiff_t format_ritem( inline ptrdiff_t format_ritem(
R &writer, size_t &fmtn, bool esc, bool expandval, ConstCharRange fmt, R &writer, bool esc, bool expandval, ConstCharRange fmt,
T const &item, std::enable_if_t<is_tuple_like<T>, bool> = true T const &item, std::enable_if_t<is_tuple_like<T>, bool> = true
) { ) {
if (expandval) { if (expandval) {
return FmtTupleUnpacker<std::tuple_size<T>::value>::unpack( return FmtTupleUnpacker<std::tuple_size<T>::value>::unpack(
writer, fmtn, esc, fmt, item writer, esc, fmt, item
); );
} }
return format_impl(writer, fmtn, esc, fmt, item); return format_impl(writer, esc, fmt, item);
} }
template<typename R, typename T> template<typename R, typename T>
@ -576,17 +575,16 @@ namespace detail {
return 0; return 0;
} }
ptrdiff_t ret = 0; ptrdiff_t ret = 0;
size_t fmtn = 0;
/* test first item */ /* test first item */
ret += format_ritem( ret += format_ritem(
writer, fmtn, escape, expandval, fl->rest(), range.front() writer, escape, expandval, fl->rest(), range.front()
); );
range.pop_front(); range.pop_front();
/* write the rest (if any) */ /* write the rest (if any) */
for (; !range.empty(); range.pop_front()) { for (; !range.empty(); range.pop_front()) {
ret += writer.put_n(&sep[0], sep.size()); ret += writer.put_n(&sep[0], sep.size());
ret += format_ritem( ret += format_ritem(
writer, fmtn, escape, expandval, fl->rest(), range.front() writer, escape, expandval, fl->rest(), range.front()
); );
} }
return ret; return ret;
@ -661,12 +659,11 @@ namespace detail {
constexpr bool FmtTofmtTest = decltype(test_tofmt<T, R>(0))::value; constexpr bool FmtTofmtTest = decltype(test_tofmt<T, R>(0))::value;
struct WriteSpec: FormatSpec { struct WriteSpec: FormatSpec {
WriteSpec(): FormatSpec() {} using FormatSpec::FormatSpec;
WriteSpec(ConstCharRange fmt, bool esc): FormatSpec(fmt, esc) {}
/* string base writer */ /* string base writer */
template<typename R> template<typename R>
ptrdiff_t write_str(R &writer, bool escape, ConstCharRange val) { ptrdiff_t write_str(R &writer, bool escape, ConstCharRange val) const {
if (escape) { if (escape) {
return write_str(writer, false, escape_fmt_str(val)); return write_str(writer, false, escape_fmt_str(val));
} }
@ -683,7 +680,7 @@ namespace detail {
/* char values */ /* char values */
template<typename R> template<typename R>
ptrdiff_t write_char(R &writer, bool escape, char val) { ptrdiff_t write_char(R &writer, bool escape, char val) const {
if (escape) { if (escape) {
char const *esc = escape_fmt_char(val, '\''); char const *esc = escape_fmt_char(val, '\'');
if (esc) { if (esc) {
@ -712,7 +709,7 @@ namespace detail {
/* floating point */ /* floating point */
template<typename R, typename T, bool Long = std::is_same_v<T, ldouble>> template<typename R, typename T, bool Long = std::is_same_v<T, ldouble>>
ptrdiff_t write_float(R &writer, bool, T val) { ptrdiff_t write_float(R &writer, bool, T val) const {
char buf[16], rbuf[128]; char buf[16], rbuf[128];
char fmtspec[Long + 1]; char fmtspec[Long + 1];
@ -751,7 +748,7 @@ namespace detail {
} }
template<typename R, typename T> template<typename R, typename T>
ptrdiff_t write_val(R &writer, bool escape, T const &val) { ptrdiff_t write_val(R &writer, bool escape, T const &val) const {
/* stuff fhat can be custom-formatted goes first */ /* stuff fhat can be custom-formatted goes first */
if constexpr(FmtTofmtTest<T, TostrRange<R>>) { if constexpr(FmtTofmtTest<T, TostrRange<R>>) {
TostrRange<R> sink(writer); TostrRange<R> sink(writer);
@ -784,11 +781,13 @@ namespace detail {
* char pointers are handled by the string case above * char pointers are handled by the string case above
*/ */
if constexpr(std::is_pointer_v<T>) { if constexpr(std::is_pointer_v<T>) {
if (this->p_spec == 's') { FormatSpec sp{
this->p_spec = 'x'; (spec() == 's') ? 'x' : spec(),
this->p_flags |= FMT_FLAG_HASH; has_width() ? width() : -1,
} has_precision() ? precision() : -1,
return write_val(writer, false, size_t(val)); (spec() == 's') ? (flags() | FMT_FLAG_HASH) : flags()
};
return detail::write_u(writer, &sp, false, size_t(val));
} }
/* integers */ /* integers */
if constexpr(std::is_integral_v<T>) { if constexpr(std::is_integral_v<T>) {
@ -823,7 +822,7 @@ namespace detail {
template<typename R, typename T, typename ...A> template<typename R, typename T, typename ...A>
ptrdiff_t write_arg( ptrdiff_t write_arg(
R &writer, size_t idx, T const &val, A const &...args R &writer, size_t idx, T const &val, A const &...args
) { ) const {
if (idx) { if (idx) {
if constexpr(!sizeof...(A)) { if constexpr(!sizeof...(A)) {
throw format_error{"not enough format arguments"}; throw format_error{"not enough format arguments"};
@ -840,7 +839,7 @@ namespace detail {
ptrdiff_t write_range( ptrdiff_t write_range(
R &writer, size_t idx, bool expandval, ConstCharRange sep, R &writer, size_t idx, bool expandval, ConstCharRange sep,
T const &val, A const &...args T const &val, A const &...args
) { ) const {
if (idx) { if (idx) {
if constexpr(!sizeof...(A)) { if constexpr(!sizeof...(A)) {
throw format_error{"not enough format arguments"}; throw format_error{"not enough format arguments"};
@ -857,9 +856,9 @@ namespace detail {
template<typename R, typename ...A> template<typename R, typename ...A>
inline ptrdiff_t format_impl( inline ptrdiff_t format_impl(
R &writer, size_t &fmtn, bool escape, ConstCharRange fmt, A const &...args R &writer, bool escape, ConstCharRange fmt, A const &...args
) { ) {
size_t argidx = 1, retn = 0, twr = 0; size_t argidx = 1, twr = 0;
ptrdiff_t written = 0; ptrdiff_t written = 0;
detail::WriteSpec spec(fmt, escape); detail::WriteSpec spec(fmt, escape);
while (spec.read_until_spec(writer, &twr)) { while (spec.read_until_spec(writer, &twr)) {
@ -913,35 +912,30 @@ namespace detail {
written += sw; written += sw;
} }
written += twr; written += twr;
fmtn = retn;
return written; return written;
} }
template<typename R, typename ...A> template<typename R>
inline ptrdiff_t format_impl( inline ptrdiff_t format_impl(R &writer, bool, ConstCharRange fmt) {
R &writer, size_t &fmtn, bool, ConstCharRange fmt
) {
size_t written = 0; size_t written = 0;
detail::WriteSpec spec(fmt, false); detail::WriteSpec spec(fmt, false);
if (spec.read_until_spec(writer, &written)) { if (spec.read_until_spec(writer, &written)) {
throw format_error{"format spec without format arguments"}; throw format_error{"format spec without format arguments"};
} }
fmtn = 0;
return written; return written;
} }
} /* namespace detail */ } /* namespace detail */
template<typename R, typename ...A> template<typename R, typename ...A>
inline ptrdiff_t format( inline ptrdiff_t format(R &&writer, ConstCharRange fmt, A const &...args) {
R &&writer, size_t &fmtn, ConstCharRange fmt, A const &...args return detail::format_impl(writer, false, fmt, args...);
) {
return detail::format_impl(writer, fmtn, false, fmt, args...);
} }
template<typename R, typename ...A> template<typename R, typename T>
ptrdiff_t format(R &&writer, ConstCharRange fmt, A const &...args) { inline ptrdiff_t format(R &&writer, FormatSpec const &fmt, T const &val) {
size_t fmtn = 0; /* we can do this as there are no members added... but ugly, FIXME later */
return format(writer, fmtn, fmt, args...); detail::WriteSpec const &wsp = static_cast<detail::WriteSpec const &>(fmt);
return wsp.write_arg(writer, 0, val);
} }
} /* namespace ostd */ } /* namespace ostd */

3
ostd/io.hh
View File

@ -165,8 +165,7 @@ namespace detail {
template<typename T> template<typename T>
inline void write(T const &v) { inline void write(T const &v) {
// TODO: switch to direct FormatSpec later format(detail::StdoutRange{}, FormatSpec{'s'}, v);
format(detail::StdoutRange{}, "%s", v);
} }
template<typename T, typename ...A> template<typename T, typename ...A>

3
ostd/stream.hh
View File

@ -201,8 +201,7 @@ namespace detail {
template<typename T> template<typename T>
inline bool Stream::write(T const &v) { inline bool Stream::write(T const &v) {
// TODO: switch to direct FormatSpec later return format(detail::FmtStreamRange{*this}, FormatSpec{'s'}, v) >= 0;
return format(detail::FmtStreamRange{*this}, "%s", v) >= 0;
} }
template<typename ...A> template<typename ...A>