Iterators...

jtomschroeder · Aug 19, 2016 · 3e52dd9 · 3e52dd9
1 parent c1af0c4
commit 3e52dd9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/lambda/core/type_traits.hpp b/lib/lambda/core/type_traits.hpp
@@ -10,12  10,15 @@ namespace detail {
 struct nope {};
 }
 
-// iterator has begin(T) and end(T)
 //
 // iterator has T.begin() and T.end()
 // TODO! T::value_type, T  
 //
 template <typename T>
 struct is_iterator {
 private:
     template <typename G>
-    static auto check(G &&g) -> std::pair<decltype(begin(g)), decltype(end(g))>;
     static auto check(G &&g) -> std::pair<decltype(g.begin()), decltype(g.end())>;
 
     static detail::nope check(...);
 

diff --git a/lib/lambda/stream/stream.hpp b/lib/lambda/stream/stream.hpp
@@ -18,20  18,20 @@ template <class R>
 class Range : public Stream {
     R range;
 
-    decltype(begin(range)) begin_;
-    decltype(end(range)) end_;
     decltype(range.begin()) begin_;
     decltype(range.end()) end_;
 
 public:
     using Type = typename R::value_type;
 
-    explicit Range(R &&range) : range(range), begin_(begin(range)), end_(end(range)) {}
     explicit Range(R range) : range(range), begin_(range.begin()), end_(range.end()) {}
 
     Maybe<Type> next() { return begin_ != end_ ? some(std::move(*begin_  )) : none; }
 };
 
 template <class R, REQUIRE_CONCEPT(is_iterator_v<R>)>
-auto stream(R &&c) {
-    return Range<R>{std::forward<R>(c)};
 auto stream(R range) {
     return Range<R>{std::move(range)};
 }
 
 template <class F>