Changeset e8c4c59 in mainline

Timestamp:

2018-07-05T21:41:19Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7c84fce

Parents:

fe39530

git-author:

Dzejrou <dzejrou@…> (2017-12-17 20:01:30)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:19)

Message:

cpp: added most of the integral conversions

File:

• uspace/lib/cpp/include/internal/locale/num_get.hpp (modified) (6 diffs)

uspace/lib/cpp/include/internal/locale/num_get.hpp

@@ -31 +31 @@
 
 #include <internal/locale.hpp>
+#include <internal/locale/numpunct.hpp>
 #include <ios>
 #include <iterator>
+#include <limits>
 
 namespace std
@@ -47 +49 @@
             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 +120 @@
             static locale::id id;
 
-            ~num_get();
+            ~num_get()
+            { /* DUMMY BODY */ }
 
         protected:
@@ -123 +127 @@
                              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_<int64_t>(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<numpunct<char_type>>(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_<int64_t>(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_<int64_t>(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_<uint64_t>(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_<uint64_t>(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_<uint64_t>(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_<uint64_t>(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 +267 @@
 
             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 +273 @@
 
             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<class BaseType, class T>
+            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<BaseType>::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<BaseType>(numeric_limits<T>::max()))
+                    {
+                        err |= ios_base::failbit;
+                        v = numeric_limits<T>::max();
+                    }
+                    else if (res < static_cast<BaseType>(numeric_limits<T>::min()))
+                    {
+                        err |= ios_base::failbit;
+                        v = numeric_limits<T>::min();
+                    }
+                    else
+                        v = static_cast<T>(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<ctype<char_type>>(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;
             }
     };