Changeset a9caea1 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

a3067af

Parents:

51a3eef

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-11-05 21:07:14)

git-committer:

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

Message:

cpp: added some basic implementations to std::basic_istream, but for more locale and numeric_limits is needed

File:

• uspace/lib/cpp/include/impl/istream.hpp (modified) (6 diffs)

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

@@ -31 +31 @@
 
 #include <iosfwd>
+#include <utility>
 
 namespace std
@@ -54 +55 @@
 
             explicit basic_istream(basic_streambuf<Char, Traits>* sb)
-            {
-                // TODO: implement
+                : gcount_{0}
+            {
+                basic_ios::init(sb);
             }
 
             virtual ~basic_stream()
-            {
-                // TODO: implement
-            }
+            { /* DUMMY BODY */ }
 
             /**
@@ -67 +67 @@
              */
 
-            class sentry;
+            class sentry
+            {
+                public:
+                    explicit sentry(basic_istream<Char, Traits>& is, bool noskipws = false)
+                        : ok_{false}
+                    {
+                        if (!is.good())
+                            is.setstate(ios_base::failbit);
+                        else
+                        {
+                            if (is.tie())
+                                is.tie()->flush();
+
+                            if (!noskipws && ((is.flags() & ios_base::skipws) != 0))
+                            {
+                                // TODO: implement when we have istream_iterator and locale,
+                                //       skip whitespace using is.locale()
+                            }
+                        }
+                    }
+
+                    ~sentry() = default;
+
+                    explicit operator bool() const
+                    {
+                        return ok_;
+                    }
+
+                    sentry(const sentry&) = delete;
+                    sentry& operator=(const sentry&) = delete;
+
+                private:
+                    using traits_type = Traits;
+                    bool ok_;
+            }
 
             /**
@@ -170 +204 @@
             streamsize gcount() const
             {
-                // TODO: implement
+                return gcount_;
             }
 
@@ -264 +298 @@
 
         protected:
+            streamsize gcount_;
+
             basic_istream(const basic_istream&) = delete;
 
             basic_istream(basic_istream&& rhs)
             {
-                // TODO: implement
+                gcount_ = rhs.gcout_;
+
+                basic_ios::move(rhs);
+
+                rhs.gcount_ = 0;
             }
 
@@ -279 +319 @@
             basic_istream& operator=(basic_istream&& rhs)
             {
-                // TODO: implement
+                swap(rhs);
+
+                return *this;
             }
 
             void swap(basic_stream& rhs)
             {
-                // TODO: implement
+                basic_ios::swap(rhs);
+                swap(gcoung_, rhs.gcount_);
             }
     };