constexpr selection_sorter (#58)

Morwenn · Jul 10, 2022 · 7afc95a · 7afc95a
1 parent 403fdda
commit 7afc95a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/include/cpp-sort/detail/min_element.h b/include/cpp-sort/detail/min_element.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Morwenn
+ * Copyright (c) 2015-2022 Morwenn
  * SPDX-License-Identifier: MIT
  */
 #ifndef CPPSORT_DETAIL_MIN_ELEMENT_H_
@@ -17,8 +17,8 @@ namespace cppsort
 namespace detail
 {
     template<typename ForwardIterator, typename Compare, typename Projection>
-    auto unchecked_min_element(ForwardIterator first, ForwardIterator last,
-                               Compare compare, Projection projection)
+    constexpr auto unchecked_min_element(ForwardIterator first, ForwardIterator last,
+                                         Compare compare, Projection projection)
         -> ForwardIterator
     {
         // Same algorithm as min_element, but assumes that the
@@ -38,11 +38,13 @@ namespace detail
     }
 
     template<typename ForwardIterator, typename Compare, typename Projection>
-    auto min_element(ForwardIterator first, ForwardIterator last,
-                     Compare compare, Projection projection)
+    constexpr auto min_element(ForwardIterator first, ForwardIterator last,
+                               Compare compare, Projection projection)
         -> ForwardIterator
     {
-        if (first == last) return last;
+        if (first == last) {
+            return last;
+        }
         return unchecked_min_element(std::move(first), std::move(last),
                                      std::move(compare), std::move(projection));
     }

diff --git a/include/cpp-sort/detail/selection_sort.h b/include/cpp-sort/detail/selection_sort.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017 Morwenn
+ * Copyright (c) 2015-2022 Morwenn
  * SPDX-License-Identifier: MIT
  */
 #ifndef CPPSORT_DETAIL_SELECTION_SORT_H_
@@ -16,11 +16,11 @@ namespace cppsort
 namespace detail
 {
     template<typename ForwardIterator, typename Compare, typename Projection>
-    auto selection_sort(ForwardIterator first, ForwardIterator last,
-                        Compare compare, Projection projection)
+    constexpr auto selection_sort(ForwardIterator first, ForwardIterator last,
+                                  Compare compare, Projection projection)
         -> void
     {
-        for (ForwardIterator it = first ; it != last ; ++it) {
+        for (auto it = first; it != last; ++it) {
             using utility::iter_swap;
             iter_swap(it, unchecked_min_element(it, last, compare, projection));
         }

diff --git a/include/cpp-sort/sorters/selection_sorter.h b/include/cpp-sort/sorters/selection_sorter.h
@@ -35,8 +35,8 @@ namespace cppsort
                     is_projection_iterator_v<Projection, ForwardIterator, Compare>
                 >
             >
-            auto operator()(ForwardIterator first, ForwardIterator last,
-                            Compare compare={}, Projection projection={}) const
+            constexpr auto operator()(ForwardIterator first, ForwardIterator last,
+                                      Compare compare={}, Projection projection={}) const
                 -> void
             {
                 static_assert(

diff --git a/tests/sorters/every_sorter_constexpr.cpp b/tests/sorters/every_sorter_constexpr.cpp
@@ -27,7 +27,8 @@ namespace
 }
 
 TEMPLATE_TEST_CASE( "test every constexpr sorter", "[sorters][constexpr]",
-                    cppsort::insertion_sorter )
+                    cppsort::insertion_sorter,
+                    cppsort::selection_sorter )
 {
     constexpr bool is_sorted = test_constexpr_sorter<TestType>();
     STATIC_CHECK( is_sorted );