Index: uspace/lib/cpp/include/internal/locale/num_get.hpp =================================================================== --- uspace/lib/cpp/include/internal/locale/num_get.hpp (revision fe3953059613a7ec22fee87de02f637f86ad7417) +++ uspace/lib/cpp/include/internal/locale/num_get.hpp (revision e8c4c593555b7bbf278da2b0834907cb847a9ae7) @@ -31,6 +31,8 @@ #include +#include #include #include +#include namespace std @@ -47,5 +49,6 @@ using iter_type = InputIterator; - explicit num_get(size_t refs = 0); + explicit num_get(size_t refs = 0) + { /* DUMMY BODY */ } iter_type get(iter_type in, iter_type end, ios_base& base, @@ -117,5 +120,6 @@ static locale::id id; - ~num_get(); + ~num_get() + { /* DUMMY BODY */ } protected: @@ -123,9 +127,139 @@ ios_base::iostate& err, bool& v) const { + if (in == end) + { + err = ios_base::eofbit; + return in; + } + + if ((base.flags() & ios_base::boolalpha) == 0) + { + int8_t tmp{}; + in = get_integral_(in, end, base, err, tmp); + + if (tmp == 0) + v = false; + else if (tmp == 1) + v = true; + else + { + v = true; + err = ios_base::failbit; + } + } + else + { + /** + * We track both truename() and falsename() + * at the same time, once either is matched + * or the input is too big without a match + * or the input ends the conversion ends + * and the result is deduced. + */ + + auto loc = base.getloc(); + const auto& nt = use_facet>(loc); + + auto true_target = nt.truename(); + auto false_target = nt.falsename(); + + if (true_target == "" || false_target == "") + { + v = (err == ios_base::failbit); + return in; + } + + auto true_str = true_target; + auto false_str = false_target; + + size_t i{}; + while (true) + { + if (true_str.size() <= i && false_str.size() <= i) + break; + auto c = *in++; + + if (i < true_str.size()) + true_str[i] = c; + if (i < false_str.size()) + false_str[i] = c; + ++i; + + if (in == end || *in == '\n') + { + err = ios_base::eofbit; + break; + } + } + + if (i == true_str.size() && true_str == true_target) + { + v = true; + + if (++in == end) + err = ios_base::eofbit; + else + err = ios_base::goodbit; + } + else if (i == false_str.size() && false_str == false_target) + { + v = false; + + if (in == end) + err = (ios_base::failbit | ios_base::eofbit); + else + err = ios_base::failbit; + } + else + err = ios_base::failbit; + } + + return in; + } + + iter_type do_get(iter_type in, iter_type end, ios_base& base, + ios_base::iostate& err, long& v) const + { + return get_integral_(in, end, base, err, v); + } + + iter_type do_get(iter_type in, iter_type end, ios_base& base, + ios_base::iostate& err, long long& v) const + { + return get_integral_(in, end, base, err, v); + } + + iter_type do_get(iter_type in, iter_type end, ios_base& base, + ios_base::iostate& err, unsigned short& v) const + { + return get_integral_(in, end, base, err, v); + } + + iter_type do_get(iter_type in, iter_type end, ios_base& base, + ios_base::iostate& err, unsigned int& v) const + { + return get_integral_(in, end, base, err, v); + } + + iter_type do_get(iter_type in, iter_type end, ios_base& base, + ios_base::iostate& err, unsigned long& v) const + { + return get_integral_(in, end, base, err, v); + } + + iter_type do_get(iter_type in, iter_type end, ios_base& base, + ios_base::iostate& err, unsigned long long& v) const + { + return get_integral_(in, end, base, err, v); + } + + iter_type do_get(iter_type in, iter_type end, ios_base& base, + ios_base::iostate& err, float& v) const + { // TODO: implement } iter_type do_get(iter_type in, iter_type end, ios_base& base, - ios_base::iostate& err, long& v) const + ios_base::iostate& err, double& v) const { // TODO: implement @@ -133,5 +267,5 @@ iter_type do_get(iter_type in, iter_type end, ios_base& base, - ios_base::iostate& err, long long& v) const + ios_base::iostate& err, long double& v) const { // TODO: implement @@ -139,49 +273,79 @@ iter_type do_get(iter_type in, iter_type end, ios_base& base, - ios_base::iostate& err, unsigned short& v) const + ios_base::iostate& err, void*& v) const { // TODO: implement } - iter_type do_get(iter_type in, iter_type end, ios_base& base, - ios_base::iostate& err, unsigned int& v) const - { - // TODO: implement - } - - iter_type do_get(iter_type in, iter_type end, ios_base& base, - ios_base::iostate& err, unsigned long& v) const - { - // TODO: implement - } - - iter_type do_get(iter_type in, iter_type end, ios_base& base, - ios_base::iostate& err, unsigned long long& v) const - { - // TODO: implement - } - - iter_type do_get(iter_type in, iter_type end, ios_base& base, - ios_base::iostate& err, float& v) const - { - // TODO: implement - } - - iter_type do_get(iter_type in, iter_type end, ios_base& base, - ios_base::iostate& err, double& v) const - { - // TODO: implement - } - - iter_type do_get(iter_type in, iter_type end, ios_base& base, - ios_base::iostate& err, long double& v) const - { - // TODO: implement - } - - iter_type do_get(iter_type in, iter_type end, ios_base& base, - ios_base::iostate& err, void*& v) const - { - // TODO: implement + private: + template + iter_type get_integral_(iter_type in, iter_type end, ios_base& base, + ios_base::iostate err, T& v) const + { + BaseType res{}; + unsigned int num_base{10}; + + auto basefield = (base.flags() & ios_base::basefield); + if (basefield == ios_base::oct) + num_base = 8; + else if (basefield == ios_base::hex) + num_base = 16; + + auto size = fill_buffer_integral_(in, end, base); + if (size > 0) + { + if constexpr (is_signed::value) + str_int64_t(base.buffer_, nullptr, num_base, false, &res); + else + str_uint64_t(base.buffer_, nullptr, num_base, false, &res); + + if (res > static_cast(numeric_limits::max())) + { + err |= ios_base::failbit; + v = numeric_limits::max(); + } + else if (res < static_cast(numeric_limits::min())) + { + err |= ios_base::failbit; + v = numeric_limits::min(); + } + else + v = static_cast(res); + } + else + { + err |= ios_base::failbit; + v = 0; + } + + return in; + } + + size_t fill_buffer_integral_(iter_type& in, iter_type end, ios_base& base) const + { + if (in == end) + return 0; + + auto loc = base.getloc(); + const auto& ct = use_facet>(loc); + + size_t i{}; + if (*in == '+' || *in == '-') + base.buffer_[i++] = *in++; + + while (in != end && i < ios_base::buffer_size_ - 1) + { + auto c = *in; + if (ct.is(ctype_base::digit, c)) + { + ++in; + base.buffer_[i++] = c; + } + else + break; + } + base.buffer_[i] = '\0'; + + return i; } };