Changeset 800968b7 in mainline

Timestamp:

2018-07-05T21:41:23Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

f56e741c

Parents:

a30c04d

git-author:

Dzejrou <dzejrou@…> (2018-05-04 16:08:44)

git-committer:

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

Message:

cpp: added support for reference_wrapper to bind

File:

• uspace/lib/cpp/include/impl/functional.hpp (modified) (5 diffs)

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

@@ -1144 +1144 @@
         };
 
+        template<class F, class... Args>
+        class bind_t;
+
         template<class... Args>
         class bind_arg_filter
@@ -1152 +1155 @@
                 { /* DUMMY BODY */ }
 
-                // TODO: enable if T != ref_wrapper
                 template<class T>
                 constexpr decltype(auto) operator[](T&& t)
@@ -1161 +1163 @@
                 template<int N>
                 constexpr decltype(auto) operator[](const placeholder_t<N>)
-                {
+                { // Since placeholders are constexpr, this is the best match for them.
                     /**
                      * Come on, it's int! Why not use -1 as not placeholder
                      * and start them at 0? -.-
                      */
-                    /* return get<is_placeholder_v<decay_t<T>> - 1>(args_); */
                     return get<N - 1>(args_);
                 }
 
-                // TODO: overload the operator for reference_wrapper
+                template<class T>
+                constexpr T& operator[](reference_wrapper<T> ref)
+                {
+                    return ref.get();
+                }
+
+                template<class F, class... BindArgs>
+                constexpr decltype(auto) operator[](const bind_t<F, BindArgs...> b)
+                {
+                    return b; // TODO: bind subexpressions
+                }
+
 
             private:
@@ -1181 +1193 @@
             // TODO: conditional typedefs
             public:
+                // TODO: T& gets captured by ref, should be by value :/
                 template<class... BoundArgs>
                 constexpr bind_t(F&& f, BoundArgs&&... args)
@@ -1186 +1199 @@
                       bound_args_{forward<BoundArgs>(args)...}
                 { /* DUMMY BODY */ }
+
+                constexpr bind_t(const bind_t& other) = default;
+                constexpr bind_t(bind_t&& other) = default;
 
                 template<class... ActualArgs>