Stream fixes

Author: OnePatchGuy

CMakeLists.txt

@@ -63,9 +63,9 @@ add_executable(unittesting include/stream.h
                            include/detail/continuation_impl.h
                            tests/stream_deduction_guides.cpp
                            tests/filters_int_finite_stream.cpp
-                           #[[tests/filters_int_infinite_stream.cpp
+                           tests/filters_int_infinite_stream.cpp
                            tests/filters_generic_int_stream.cpp
-                           tests/filters_move_only_finite_stream.cpp
+                           #[[tests/filters_move_only_finite_stream.cpp
                            tests/filters_move_only_infinite_stream.cpp
                            tests/filters_generic_move_only_stream.cpp
                            tests/noisy.h

include/detail/continuation_impl.h

@@ -17,13 +17,15 @@ namespace stream
                 : continuation(::std::forward<F>(continuation))
             {}
 
-            template<typename V, typename S, typename ::std::enable_if_t<ManagesFiniteness>* = nullptr>
+            template<typename V, typename S, bool Fin = ManagesFiniteness,
+                     ::std::enable_if_t<Fin>* = nullptr>
             decltype(auto) operator()(V &&value, const S& stream, bool &end)
             {
                 return continuation(::std::forward<V>(value), stream, end);
             }
 
-            template<typename V, typename S, typename ::std::enable_if_t<!ManagesFiniteness>* = nullptr>
+            template<typename V, typename S, bool Fin = ManagesFiniteness,
+                     ::std::enable_if_t<!Fin>* = nullptr>
             decltype(auto) operator()(V &&value, const S& stream)
             {
                 return continuation(::std::forward<V>(value), stream);

include/detail/stream_impl.h

@@ -35,7 +35,7 @@ namespace stream
             {}
 
             StreamImpl(Container &&container)
-                : container(::std::move(container)), it(container.begin())
+                : container(::std::move(container)), it(this->container.begin())
             {}
 
             StreamImpl(::std::initializer_list<T> initList)
@@ -223,7 +223,6 @@ namespace stream
         public:
             using RealType = ValueHolder<T>;
 
-
             StreamImpl(OldStream &&oldStream, Continuation<F, ManagesFiniteness> &&continuation)
                 : oldStream(::std::move(oldStream)), continuation(::std::move(continuation))
             {}
@@ -247,11 +246,24 @@ namespace stream
 
                 if constexpr (ManagesFiniteness)
                 {
-                    return continuation(::std::move(oldNext).get(), static_cast<const OldStream &>(oldStream), end);
+                    auto result = continuation(::std::move(*oldNext), static_cast<const OldStream &>(oldStream), end);
+
+                    if (!result)
+                    {
+                        return ::std::nullopt;
+                    }
+
+                    return ::std::move(*result);
                 }
                 else
                 {
-                    return continuation(::std::move(oldNext).get(), static_cast<const OldStream &>(oldStream));
+                    auto result = continuation(::std::move(*oldNext), static_cast<const OldStream &>(oldStream));
+                    if (!result)
+                    {
+                        return ::std::nullopt;
+                    }
+
+                    return ::std::move(*result);
                 }
             }
 

include/value_holder.h

@@ -11,7 +11,7 @@ namespace stream
     class ValueHolder
     {
     public:
-        static_assert(::std::is_rvalue_reference<T>::value, "RValue references isn't allowed");
+        static_assert(!::std::is_rvalue_reference<T>::value, "RValue references isn't allowed");
 
         template<typename... Args>
         ValueHolder(Args&&... args)