Add function::call to conditionally call function, close #1

kfrlib · Sep 1, 2016 · 6b8b9b7 · 6b8b9b7
1 parent 84b4972
commit 6b8b9b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/include/cometa.hpp b/include/cometa.hpp
@@ -1484,9 +1484,11 @@ struct function<Result(Args...)>
         fn = temp;
         return *this;
     }
-    CMT_INTRIN Result operator()(Args... args) const
+    CMT_INTRIN Result operator()(Args... args) const { return (*fn)(std::forward<Args>(args)...); }
+    template <typename TResult>
+    CMT_INTRIN Result call(TResult&& default_result, Args... args) const
     {
-        return (*fn)(std::forward<Args>(args)...);
+        return fn ? (*fn)(std::forward<Args>(args)...) : std::forward<TResult>(default_result);
     }
     CMT_INTRIN explicit operator bool() const noexcept { return !!fn; }
 
@@ -1987,7 +1989,7 @@ constexpr size_t typename_postfix = sizeof("]") - 1;
 template <size_t... indices, size_t Nout = 1 + sizeof...(indices)>
 constexpr cstring<Nout> gettypename_impl(const char* str, csizes_t<indices...>) noexcept
 {
-    return cstring<Nout>{{ (str[indices])..., 0 }};
+    return cstring<Nout>{ { (str[indices])..., 0 } };
 }
 }
 

diff --git a/tests/cometa_test.cpp b/tests/cometa_test.cpp
@@ -99,6 +99,10 @@ int main(int, char**)
         int& z = fn(x);
         (void)y;
         (void)z;
+        function<int&(int&)> empty_fn;
+        int d;
+        int& a = fn.call(d, x);
+        (void)a;
     }
 
     return 0;