Changeset 42ed4855 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:

eb69df4

Parents:

ccf7a7e

git-author:

Dzejrou <dzejrou@…> (2017-12-04 15:55:43)

git-committer:

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

Message:

cpp: added iostream operators for std::string

File:

• uspace/lib/cpp/include/impl/string.hpp (modified) (2 diffs)

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

@@ -679 +679 @@
             size_type max_size() const noexcept
             {
-                return allocator_traits<allocator_type>::max_size(allocator_);
+                return 0x7FFF; // TODO: just temporary
+                /* return allocator_traits<allocator_type>::max_size(allocator_); */
             }
 
@@ -1859 +1860 @@
      */
 
-    // TODO: implement
+    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;
+    }
 
     /**