songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use std::invoke, CGAL::cpp20, ...

This commit is contained in:
Mael Rouxel-Labbé 2025-03-15 22:13:43 +01:00
parent f9001833b1
commit 96524bdf2b
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Filtered_kernel/include/CGAL/Lazy.h
View File

@ -1074,10 +1074,10 @@ struct Lazy_construction_nt {
template<class...L> template<class...L>
auto operator()(L const&...l) const -> auto operator()(L const&...l) const ->
Lazy_exact_nt<std::remove_cv_t<std::remove_reference_t<decltype(ec(CGAL::exact(l)...))>>> Lazy_exact_nt<CGAL::cpp20::remove_cvref_t<decltype(ec(CGAL::exact(l)...))>>
{ {
typedef std::remove_cv_t<std::remove_reference_t<decltype(ec(CGAL::exact(l)...))>> ET; typedef CGAL::cpp20::remove_cvref_t<decltype(ec(CGAL::exact(l)...))> ET;
typedef std::remove_cv_t<std::remove_reference_t<decltype(ac(CGAL::approx(l)...))>> AT; typedef CGAL::cpp20::remove_cvref_t<decltype(ac(CGAL::approx(l)...))> AT;
CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp); CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp);
{ {
Protect_FPU_rounding<Protection> P; Protect_FPU_rounding<Protection> P;
@ -1440,13 +1440,13 @@ struct Lazy_construction
decltype(auto) decltype(auto)
operator()(const L&... l) const operator()(const L&... l) const
{ {
typedef typename Type_mapper<decltype(std::declval<EC>()(std::declval<typename Type_mapper<L, LK, EK>::type>()...)),EK,EK>::type ET; typedef typename Type_mapper<std::invoke_result_t<AC, typename Type_mapper<L, LK, AK>::type...>, AK, AK>::type AT;
typedef typename Type_mapper<decltype(std::declval<AC>()(std::declval<typename Type_mapper<L, LK, AK>::type>()...)),AK,AK>::type AT;
typedef Lazy<AT, ET, E2A> Handle;
// ----------------------- FT ----------------------- // ----------------------- FT -----------------------
if constexpr (std::is_same_v<AT, typename AK::FT>) if constexpr (std::is_same_v<AT, typename AK::FT>)
{ {
typedef typename Type_mapper<std::invoke_result_t<EC,typename Type_mapper<L, LK, EK>::type...>,EK,EK>::type ET;
typedef Lazy_exact_nt<CGAL::cpp20::remove_cvref_t<decltype(ec(CGAL::exact(l)...))>> result_type; typedef Lazy_exact_nt<CGAL::cpp20::remove_cvref_t<decltype(ec(CGAL::exact(l)...))>> result_type;
CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp); CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp);
@ -1481,14 +1481,13 @@ struct Lazy_construction
// ----------------------- CGAL::Object ----------------------- // ----------------------- CGAL::Object -----------------------
else if constexpr (std::is_same_v<AT, CGAL::Object>) else if constexpr (std::is_same_v<AT, CGAL::Object>)
{ {
typedef CGAL::Object result_type;
typedef Lazy<Object, Object, E2A> Lazy_object; typedef Lazy<Object, Object, E2A> Lazy_object;
CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp); CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp);
{ {
Protect_FPU_rounding<Protection> P; Protect_FPU_rounding<Protection> P;
try { try {
Lazy_object lo(new Lazy_rep_n<result_type, result_type, AC, EC, E2A, false, L...>(ac, ec, l...)); Lazy_object lo(new Lazy_rep_n<CGAL::Object, CGAL::Object, AC, EC, E2A, false, L...>(ac, ec, l...));
if(lo.approx().is_empty()) if(lo.approx().is_empty())
return Object(); return Object();
@ -1531,13 +1530,15 @@ struct Lazy_construction
CGAL_BRANCH_PROFILER_BRANCH(tmp); CGAL_BRANCH_PROFILER_BRANCH(tmp);
Protect_FPU_rounding<!Protection> P2(CGAL_FE_TONEAREST); Protect_FPU_rounding<!Protection> P2(CGAL_FE_TONEAREST);
CGAL_expensive_assertion(FPU_get_cw() == CGAL_FE_TONEAREST); CGAL_expensive_assertion(FPU_get_cw() == CGAL_FE_TONEAREST);
ET eto = ec(CGAL::exact(l)...); CGAL::Object eto = ec(CGAL::exact(l)...);
return make_lazy<LK>(eto); return make_lazy<LK>(eto);
} }
// std::optional<std::variant< > > (Intersection_23 result types) // std::optional<std::variant< > > (Intersection_23 result types)
else if constexpr (is_optional_variant<AT>::value) else if constexpr (is_optional_variant<AT>::value)
{ {
typedef typename Type_mapper<decltype(std::declval<AC>()(std::declval<typename Type_mapper<L, LK, AK>::type>()...)),AK,LK>::type result_type; typedef typename Type_mapper<std::invoke_result_t<EC, typename Type_mapper<L, LK, EK>::type...>,EK,EK>::type ET;
typedef typename Type_mapper<std::invoke_result_t<AC, typename Type_mapper<L, LK, AK>::type...>, AK, LK>::type result_type;
CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp); CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp);
{ {
@ -1580,7 +1581,10 @@ struct Lazy_construction
// ----------------------- GENERIC ----------------------- // ----------------------- GENERIC -----------------------
else else
{ {
typedef typename Type_mapper<decltype(std::declval<AC>()(std::declval<typename Type_mapper<L, LK, AK>::type>()...)),AK,LK>::type result_type; typedef typename Type_mapper<std::invoke_result_t<EC,typename Type_mapper<L, LK, EK>::type...>,EK,EK>::type ET;
typedef Lazy<AT, ET, E2A> Handle;
typedef typename Type_mapper<std::invoke_result_t<AC, typename Type_mapper<L, LK, AK>::type...>, AK, LK>::type result_type;
static const bool noprune = Disable_lazy_pruning<AK, AC>::value; static const bool noprune = Disable_lazy_pruning<AK, AC>::value;
@ -1602,8 +1606,8 @@ struct Lazy_construction
decltype(auto) decltype(auto)
operator()() const operator()() const
{ {
typedef decltype(std::declval<AC>()()) AT; typedef std::invoke_result_t<AC> AT;
typedef decltype(std::declval<EC>()()) ET; typedef std::invoke_result_t<EC> ET;
typedef Lazy<AT, ET, E2A> Handle; typedef Lazy<AT, ET, E2A> Handle;
typedef typename Type_mapper<AT, AK, LK>::type result_type; typedef typename Type_mapper<AT, AK, LK>::type result_type;