Changeset 2e0256b 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:

f5a77a00

Parents:

4ff55d2

git-author:

Dzejrou <dzejrou@…> (2017-12-17 14:56:56)

git-committer:

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

Message:

cpp: moved string extractors and inserters to their own internal header to avoid circular dependencies, added padding to string extractor, implemented std::getline and fixed formatted string i/o

Location:

uspace/lib/cpp/include

Files:

• impl/string.hpp (modified) (1 diff)
• internal/string.hpp (added)
• string (modified) (1 diff)

uspace/lib/cpp/include/impl/string.hpp

@@ -1857 +1857 @@
 
     /**
-     * 21.4.8.9, inserters and extractors:
-     */
-
-    template<class Char, class Traits, class Allocator>
-    basic_istream<Char, Traits>& operator>>(basic_istream<Char, Traits>& is,
-                                            basic_string<Char, Traits, Allocator>& str)
-    {
-        using sentry = typename basic_istream<Char, Traits>::sentry;
-        sentry sen{is, true};
-
-        if (sen)
-        {
-            str.erase();
-
-            auto max_size = is.width();
-            if (max_size == 0)
-                max_size = static_cast<decltype(max_size)>(str.max_size());
-
-            decltype(is.width()) i{};
-            for(; i < max_size; ++i)
-            {
-                auto ic = is.rdbuf()->sgetc();
-                if (Traits::eq_int_type(ic, Traits::eof()))
-                    break;
-
-                auto c = Traits::to_char_type(ic);
-                if(isspace(c, is.getloc()))
-                    break;
-
-                str.append(1, c);
-                is.rdbuf()->sbumpc();
-            }
-        }
-
-        return is;
-    }
-
-    template<class Char, class Traits, class Allocator>
-    basic_ostream<Char, Traits>& operator<<(basic_ostream<Char, Traits>& os,
-                                            basic_string<Char, Traits, Allocator>& str)
-    {
-        // TODO: determine padding as described in 27.7.3.6.1
-        using sentry = typename basic_ostream<Char, Traits>::sentry;
-        sentry sen{os};
-
-        if (sen)
-        {
-            auto size = str.size();
-            if (size < static_cast<decltype(size)>(os.width()))
-                size = os.width();
-
-            os.rdbuf()->sputn(str.data(), size);
-            os.width(0);
-        }
-
-        return os;
-    }
-
-    /**
      * 21.5, numeric conversions:
      */

uspace/lib/cpp/include/string

@@ -28 +28 @@
 
 #include <impl/string.hpp>
+#include <internal/string.hpp>