Changeset 69cc156 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

09416c12

Parents:

ddd287d

git-author:

Dzejrou <dzejrou@…> (2018-05-17 23:46:22)

git-committer:

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

Message:

cpp: renamed aux::invoke to aux::INVOKE to match standard and avoid conflicts with std::invoke, added functional tests and fixed some bugs found by them

Location:

uspace/lib/cpp

Files:

• Makefile (modified) (1 diff)
• include/__bits/functional/bind.hpp (modified) (2 diffs)
• include/__bits/functional/invoke.hpp (modified) (2 diffs)
• include/__bits/functional/reference_wrapper.hpp (modified) (1 diff)
• include/__bits/test/tests.hpp (modified) (1 diff)
• include/__bits/type_traits/result_of.hpp (modified) (1 diff)
• include/impl/functional.hpp (modified) (2 diffs)
• include/impl/mutex.hpp (modified) (1 diff)
• src/__bits/test/functional.cpp (added)

uspace/lib/cpp/Makefile

@@ -60 +60 @@
         src/__bits/test/bitset.cpp \
         src/__bits/test/deque.cpp \
+        src/__bits/test/functional.cpp \
         src/__bits/test/list.cpp \
         src/__bits/test/map.cpp \

uspace/lib/cpp/include/__bits/functional/bind.hpp

@@ -163 +163 @@
                 }
 
-            private:
-                function<decay_t<F>> func_;
+            private: // TODO: This has problem with member function pointers.
+                function<remove_reference_t<F>> func_;
                 tuple<decay_t<Args>...> bound_args_;
 
@@ -183 +183 @@
                     bind_arg_filter<ActualArgs...> filter{forward<ActualArgs>(args)...};
 
-                    return aux::invoke(
+                    return aux::INVOKE(
                         func_,
                         filter[get<Is>(bound_args_)]...

uspace/lib/cpp/include/__bits/functional/invoke.hpp

@@ -52 +52 @@
 
     template<class R, class T, class T1, class... Ts>
-    decltype(auto) invoke(R T::* f, T1&& t1, Ts&&... args)
+    decltype(auto) INVOKE(R T::* f, T1&& t1, Ts&&... args)
     {
         if constexpr (is_member_function_pointer<decltype(f)>::value)
@@ -88 +88 @@
 
     template<class F, class... Args>
-    decltype(auto) invoke(F&& f, Args&&... args)
+    decltype(auto) INVOKE(F&& f, Args&&... args)
     {
         // (1.5)

uspace/lib/cpp/include/__bits/functional/reference_wrapper.hpp

@@ -75 +75 @@
 
             template<class... Args>
-            result_of_t<type&(Args&&...)> operator()(Args&&... args) const
+            decltype(auto) operator()(Args&&... args) const
             {
-                return invoke(*data_, std::forward<Args>(args)...);
+                return aux::INVOKE(*data_, std::forward<Args>(args)...);
             }
 

uspace/lib/cpp/include/__bits/test/tests.hpp

@@ -274 +274 @@
             const char* name() override;
     };
+
+    class functional_test: public test_suite
+    {
+        public:
+            bool run(bool) override;
+            const char* name() override;
+        private:
+            void test_reference_wrapper();
+            void test_function();
+            void test_bind();
+    };
 }
 

uspace/lib/cpp/include/__bits/type_traits/result_of.hpp

@@ -62 +62 @@
             is_class<typename decay<F>::type>::value ||
             is_member_pointer<typename decay<F>::type>::value,
-            decltype(aux::invoke(declval<F>(), declval<ArgTypes>()...))
+            decltype(aux::INVOKE(declval<F>(), declval<ArgTypes>()...))
         >::type
     >

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

@@ -46 +46 @@
     decltype(auto) invoke(F&& f, Args&&... args)
     {
-        return aux::invoke(forward<F>(f)(forward<Args>(args)...));
+        return aux::INVOKE(forward<F>(f)(forward<Args>(args)...));
     }
 
@@ -67 +67 @@
                 decltype(auto) operator()(Args&&... args)
                 {
-                    return invoke(func_, forward<Args>(args)...);
+                    return INVOKE(func_, forward<Args>(args)...);
                 }
 

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

@@ -791 +791 @@
             // TODO: exception handling
 
-            aux::invoke(forward<Callable>(func), forward<Args>(args)...);
+            aux::INVOKE(forward<Callable>(func), forward<Args>(args)...);
             flag.called_ = true;
         }