Index: uspace/lib/cpp/include/internal/locale.hpp =================================================================== --- uspace/lib/cpp/include/internal/locale.hpp (revision 7258487d88a37537635d8cb06700923def821255) +++ uspace/lib/cpp/include/internal/locale.hpp (revision 4ff55d2c31c0a0a182e2ae14bc5c182c12a47137) @@ -30,5 +30,5 @@ #define LIBCPP_INTERNAL_LOCALE -#include +#include namespace std Index: uspace/lib/cpp/include/internal/locale/ctype.hpp =================================================================== --- uspace/lib/cpp/include/internal/locale/ctype.hpp (revision 7258487d88a37537635d8cb06700923def821255) +++ uspace/lib/cpp/include/internal/locale/ctype.hpp (revision 4ff55d2c31c0a0a182e2ae14bc5c182c12a47137) @@ -32,5 +32,5 @@ #include #include -#include +#include namespace std Index: uspace/lib/cpp/include/internal/locale/num_put.hpp =================================================================== --- uspace/lib/cpp/include/internal/locale/num_put.hpp (revision 7258487d88a37537635d8cb06700923def821255) +++ uspace/lib/cpp/include/internal/locale/num_put.hpp (revision 4ff55d2c31c0a0a182e2ae14bc5c182c12a47137) @@ -48,5 +48,6 @@ using iter_type = OutputIterator; - explicit num_put(size_t refs = 0); + explicit num_put(size_t refs = 0) + { /* DUMMY BODY */ } iter_type put(iter_type it, ios_base& base, char_type fill, bool v) const @@ -90,5 +91,6 @@ } - ~num_put(); + ~num_put() + { /* DUMMY BODY */ } protected: @@ -112,35 +114,197 @@ iter_type do_put(iter_type it, ios_base& base, char_type fill, long v) const { - // TODO: implement + auto basefield = (base.flags() & ios_base::basefield); + auto uppercase = (base.flags() & ios_base::uppercase); + + int ret{}; + if (basefield == ios_base::oct) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%lo", v); + else if ((basefield == ios_base::hex) && !uppercase) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%lx", v); + else if (basefield == ios_base::hex) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%lX", v); + else + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%ld", v); + + return put_adjusted_buffer_(it, base, fill, ret); } iter_type do_put(iter_type it, ios_base& base, char_type fill, long long v) const { - // TODO: implement + auto basefield = (base.flags() & ios_base::basefield); + auto uppercase = (base.flags() & ios_base::uppercase); + + int ret{}; + if (basefield == ios_base::oct) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%llo", v); + else if ((basefield == ios_base::hex) && !uppercase) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%llx", v); + else if (basefield == ios_base::hex) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%llX", v); + else + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%lld", v); + + return put_adjusted_buffer_(it, base, fill, ret); } iter_type do_put(iter_type it, ios_base& base, char_type fill, unsigned long v) const { - // TODO: implement + auto basefield = (base.flags() & ios_base::basefield); + auto uppercase = (base.flags() & ios_base::uppercase); + + int ret{}; + if (basefield == ios_base::oct) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%lo", v); + else if ((basefield == ios_base::hex) && !uppercase) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%lx", v); + else if (basefield == ios_base::hex) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%lX", v); + else + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%lu", v); + + return put_adjusted_buffer_(it, base, fill, ret); } iter_type do_put(iter_type it, ios_base& base, char_type fill, unsigned long long v) const { - // TODO: implement + auto basefield = (base.flags() & ios_base::basefield); + auto uppercase = (base.flags() & ios_base::uppercase); + + // TODO: showbase + int ret{}; + if (basefield == ios_base::oct) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%llo", v); + else if ((basefield == ios_base::hex) && !uppercase) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%llx", v); + else if (basefield == ios_base::hex) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%llX", v); + else + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%llu", v); + + return put_adjusted_buffer_(it, base, fill, ret); } iter_type do_put(iter_type it, ios_base& base, char_type fill, double v) const { - // TODO: implement + auto floatfield = (base.flags() & ios_base::floatfield); + auto uppercase = (base.flags() & ios_base::uppercase); + + // TODO: showbase + // TODO: precision + int ret{}; + if (floatfield == ios_base::fixed) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%f", v); + else if (floatfield == ios_base::scientific && !uppercase) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%e", v); + else if (floatfield == ios_base::scientific) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%E", v); + else if (floatfield == (ios_base::fixed | ios_base::scientific) && !uppercase) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%a", v); + else if (floatfield == (ios_base::fixed | ios_base::scientific)) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%A", v); + else if (!uppercase) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%g", v); + else + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%G", v); + + return put_adjusted_buffer_(it, base, fill, ret); } iter_type do_put(iter_type it, ios_base& base, char_type fill, long double v) const { - // TODO: implement + /** + * Note: Long double is not support at the moment in snprintf. + */ + auto floatfield = (base.flags() & ios_base::floatfield); + auto uppercase = (base.flags() & ios_base::uppercase); + + // TODO: showbase + // TODO: precision + int ret{}; + if (floatfield == ios_base::fixed) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%Lf", v); + else if (floatfield == ios_base::scientific && !uppercase) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%Le", v); + else if (floatfield == ios_base::scientific) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%LE", v); + else if (floatfield == (ios_base::fixed | ios_base::scientific) && !uppercase) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%La", v); + else if (floatfield == (ios_base::fixed | ios_base::scientific)) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%LA", v); + else if (!uppercase) + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%Lg", v); + else + ret = snprintf(base.buffer_, ios_base::buffer_size_, "%LG", v); + + return put_adjusted_buffer_(it, base, fill, ret); } iter_type do_put(iter_type it, ios_base& base, char_type fill, const void* v) const { - // TODO: implement + int ret = snprintf(base.buffer_, ios_base::buffer_size_, "%p", v); + + return put_adjusted_buffer_(it, base, fill, ret); + } + + private: + iter_type put_adjusted_buffer_(iter_type it, ios_base& base, char_type fill, size_t size) const + { + auto adjustfield = (base.flags() & ios_base::adjustfield); + + size_t to_fill{}; + size_t width = static_cast(base.width()); + + if (base.width() > 0 && size < width) + to_fill = width - size; + + if (to_fill > 0) + { + if (adjustfield == ios_base::left) + { + it = put_buffer_(it, base, fill, 0, size); + for (size_t i = 0; i < to_fill; ++i) + *it++ = fill; + } + else if (adjustfield == ios_base::right) + { + for (size_t i = 0; i < to_fill; ++i) + *it++ = fill; + it = put_buffer_(it, base, fill, 0, size); + } + else if (adjustfield == ios_base::internal) + { + // TODO: pad after - or 0x/0X + } + else + { + for (size_t i = 0; i < to_fill; ++i) + *it++ = fill; + it = put_buffer_(it, base, fill, 0, size); + } + } + else + it = put_buffer_(it, base, fill, 0, size); + base.width(0); + + return it; + } + + iter_type put_buffer_(iter_type it, ios_base& base, char_type fill, size_t start, size_t size) const + { + const auto& loc = base.getloc(); + const auto& ct = use_facet>(loc); + const auto& punct = use_facet>(loc); + + for (size_t i = start; i < size; ++i) + { + if (base.buffer_[i] == '.') + *it++ = punct.decimal_point(); + else + *it++ = ct.widen(base.buffer_[i]); + // TODO: Should do grouping & thousands_sep, but that's a low + // priority for now. + } + + return it; } }; Index: uspace/lib/cpp/include/internal/locale/numpunct.hpp =================================================================== --- uspace/lib/cpp/include/internal/locale/numpunct.hpp (revision 7258487d88a37537635d8cb06700923def821255) +++ uspace/lib/cpp/include/internal/locale/numpunct.hpp (revision 4ff55d2c31c0a0a182e2ae14bc5c182c12a47137) @@ -90,5 +90,6 @@ using string_type = basic_string; - explicit numpunct(size_t refs = 0); + explicit numpunct(size_t refs = 0) + { /* DUMMY BODY */ } char_type decimal_point() const @@ -117,5 +118,6 @@ } - ~numpunct(); + ~numpunct() + { /* DUMMY BODY */ } protected: