Changeset c1e11d32 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

d91b329

Parents:

7c84fce

git-author:

Dzejrou <dzejrou@…> (2017-12-18 12:25:48)

git-committer:

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

Message:

cpp: num_get now properly parses hexadecimal numbers

File:

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

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

@@ -329 +329 @@
                 auto loc = base.getloc();
                 const auto& ct = use_facet<ctype<char_type>>(loc);
+                auto hex = ((base.flags() & ios_base::hex) != 0);
 
                 size_t i{};
@@ -337 +338 @@
                 {
                     auto c = *in;
-                    if (ct.is(ctype_base::digit, c))
+                    if (ct.is(ctype_base::digit, c) || (hex &&
+                       ((c >= ct.widen('A') && c <= ct.widen('F')) ||
+                        (c >= ct.widen('a') && c <= ct.widen('f')))))
                     {
                         ++in;
@@ -345 +348 @@
                         break;
                 }
-                base.buffer_[i] = '\0';
+                base.buffer_[i] = char_type{};
 
                 return i;