Merge pull request #131 from MarcDirven/dev

Dev
MarcDirven · Nov 11, 2022 · 184909f · 184909f
2 parents 42cc850 + 3f5f178
commit 184909f
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 38 deletions.
diff --git a/include/Lz/Lz.hpp b/include/Lz/Lz.hpp
@@ -6,6 +6,7 @@
 #    include "Lz/CartesianProduct.hpp"
 #    include "Lz/ChunkIf.hpp"
 #    include "Lz/Chunks.hpp"
+#    include "Lz/CString.hpp"
 #    include "Lz/Enumerate.hpp"
 #    include "Lz/Except.hpp"
 #    include "Lz/Exclude.hpp"
@@ -21,6 +22,7 @@
 #    include "Lz/Rotate.hpp"
 #    include "Lz/TakeEvery.hpp"
 #    include "Lz/Unique.hpp"
+#    include "Lz/ZipLongest.hpp"
 // Function tools includes:
 // Concatenate.hpp
 // Filter.hpp
@@ -59,7 +61,7 @@ class IterView;
  * @return An iterator view object.
  */
 template<LZ_CONCEPT_ITERATOR Iterator>
-LZ_CONSTEXPR_CXX_20 IterView<Iterator> toIterRange(Iterator begin, Iterator end) {
+LZ_CONSTEXPR_CXX_20 IterView<Iterator> chainRange(Iterator begin, Iterator end) {
     return lz::IterView<Iterator>(std::move(begin), std::move(end));
 }
 
@@ -70,7 +72,7 @@ LZ_CONSTEXPR_CXX_20 IterView<Iterator> toIterRange(Iterator begin, Iterator end)
  */
 template<LZ_CONCEPT_ITERABLE Iterable>
 LZ_CONSTEXPR_CXX_20 IterView<internal::IterTypeFromIterable<Iterable>> chain(Iterable&& iterable) {
-    return toIterRange(internal::begin(std::forward<Iterable>(iterable)), internal::end(std::forward<Iterable>(iterable)));
+    return chainRange(internal::begin(std::forward<Iterable>(iterable)), internal::end(std::forward<Iterable>(iterable)));
 }
 
 // End of group

diff --git a/include/Lz/StringSplitter.hpp b/include/Lz/StringSplitter.hpp
@@ -1,10 +1,14 @@
 #pragma once
 
 #ifndef LZ_STRING_SPLITTER_HPP
-#define LZ_STRING_SPLITTER_HPP
+#    define LZ_STRING_SPLITTER_HPP
 
-#include "detail/BasicIteratorView.hpp"
-#include "detail/SplitIterator.hpp"
+#    if !defined(LZ_HAS_STRING_VIEW) && defined(LZ_STANDALONE)
+#        include <Lz/CString.hpp>
+#    endif
+
+#    include "detail/BasicIteratorView.hpp"
+#    include "detail/SplitIterator.hpp"
 
 namespace lz {
 template<class SubString, class String, class StringType>
@@ -29,13 +33,13 @@ class StringSplitter final : public internal::BasicIteratorView<internal::SplitI
  * @{
  */
 
-#if defined(LZ_HAS_STRING_VIEW)
+#    if defined(LZ_HAS_STRING_VIEW)
 template<class SubString = std::string_view>
-#elif defined(LZ_STANDALONE)
-template<class SubString = std::string>
-#else
+#    elif defined(LZ_STANDALONE)
+template<class SubString = lz::CString<char, false>>
+#    else
 template<class SubString = fmt::string_view>
-#endif
+#    endif
 /**
  * @brief This is a lazy evaluated string splitter function. It splits a string using `delimiter`.
  * @tparam SubString The string type of the substring. If C++17, this will default to `std::string_view`. If `LZ_STANDALONE` is
@@ -51,13 +55,13 @@ split(const std::string& str, std::string delimiter) {
     return { str, std::move(delimiter) };
 }
 
-#if defined(LZ_HAS_STRING_VIEW)
+#    if defined(LZ_HAS_STRING_VIEW)
 template<class SubString = std::string_view>
-#elif defined(LZ_STANDALONE)
-template<class SubString = std::string>
-#else
+#    elif defined(LZ_STANDALONE)
+template<class SubString = lz::CString<char, false>>
+#    else
 template<class SubString = fmt::string_view>
-#endif
+#    endif
 /**
  * @brief This is a lazy evaluated string splitter function. It splits a string using `delimiter`.
  * @tparam SubString The string type of the substring. If C++17, this will default to `std::string_view`. If `LZ_STANDALONE` is
@@ -72,25 +76,25 @@ LZ_NODISCARD LZ_CONSTEXPR_CXX_20 StringSplitter<SubString, std::string, char> sp
     return { str, delimiter };
 }
 
-#if defined(LZ_HAS_STRING_VIEW)
+#    if defined(LZ_HAS_STRING_VIEW)
 template<class SubString = std::string_view>
-#elif defined(LZ_STANDALONE)
+#    elif defined(LZ_STANDALONE)
 template<class SubString = std::string>
-#else
+#    else
 template<class SubString = fmt::string_view>
-#endif
+#    endif
 StringSplitter<SubString, std::string, char> split(std::string&& str, char delimiter) = delete;
 
-#if defined(LZ_HAS_STRING_VIEW)
+#    if defined(LZ_HAS_STRING_VIEW)
 template<class SubString = std::string_view>
-#elif defined(LZ_STANDALONE)
-template<class SubString = std::string>
-#else
+#    elif defined(LZ_STANDALONE)
+template<class SubString = lz::CString<char, false>>
+#    else
 template<class SubString = fmt::string_view>
-#endif
+#    endif
 StringSplitter<SubString, std::string, std::string> split(std::string&& str, std::string delimiter) = delete;
 
-#ifdef LZ_HAS_STRING_VIEW
+#    ifdef LZ_HAS_STRING_VIEW
 /**
  * @brief This is a lazy evaluated string splitter function. It splits a string using `delimiter`.
  * @tparam SubString The string type of the substring.
@@ -106,8 +110,7 @@ split(const std::string_view& str, std::string delimiter) {
 }
 
 template<class SubString = std::string_view>
-LZ_NODISCARD constexpr StringSplitter<SubString, std::string_view, char>
-split(const std::string_view& str, char delimiter) {
+LZ_NODISCARD constexpr StringSplitter<SubString, std::string_view, char> split(const std::string_view& str, char delimiter) {
     return { str, delimiter };
 }
 
@@ -116,7 +119,7 @@ StringSplitter<SubString, std::string_view, std::string> split(std::string_view&
 
 template<class SubString = std::string_view>
 StringSplitter<SubString, std::string_view, std::string> split(std::string_view&& str, std::string delimiter) = delete;
-#endif // LZ_HAS_STRING_VIEW
+#    endif // LZ_HAS_STRING_VIEW
 
 // End of group
 /**

diff --git a/include/Lz/detail/CStringIterator.hpp b/include/Lz/detail/CStringIterator.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef LZ_REPEAT_ITERATOR_HPP
-#    define LZ_REPEAT_ITERATOR_HPP
+#ifndef LZ_C_STRING_ITERATOR_HPP
+#    define LZ_C_STRING_ITERATOR_HPP
 
 #    include "LzTools.hpp"
 
@@ -122,4 +122,4 @@ class CStringIterator {
 } // namespace internal
 } // namespace lz
 
-#endif
+#endif // LZ_C_STRING_ITERATOR_HPP
diff --git a/include/Lz/detail/RangeIterator.hpp b/include/Lz/detail/RangeIterator.hpp
@@ -10,7 +10,7 @@ namespace lz {
 namespace internal {
 #    ifdef __cpp_if_constexpr
 template<class ValueType>
-std::ptrdiff_t plusImpl(const ValueType difference, const ValueType step) noexcept(!std::is_floating_point_v<ValueType>) {
+std::ptrdiff_t LZ_CONSTEXPR_CXX_20 plusImpl(const ValueType difference, const ValueType step) noexcept(!std::is_floating_point_v<ValueType>) {
     if constexpr (std::is_floating_point_v<ValueType>) {
         return static_cast<std::ptrdiff_t>(std::ceil(difference / step));
     }
@@ -79,10 +79,16 @@ class RangeIterator {
     }
 
     LZ_NODISCARD friend difference_type
-    operator-(const RangeIterator& a, const RangeIterator& b) noexcept(!std::is_floating_point<Arithmetic>::value) {
+    LZ_CONSTEXPR_CXX_20 operator-(const RangeIterator& a, const RangeIterator& b) noexcept(!std::is_floating_point<Arithmetic>::value) {
         LZ_ASSERT(a._step == b._step, "incompatible iterator types: difference step size");
         const auto difference = a._iterator - b._iterator;
-        return std::abs(plusImpl(static_cast<Arithmetic>(difference), a._step));
+        const auto result = plusImpl(static_cast<Arithmetic>(difference), a._step);
+        if LZ_CONSTEXPR_IF (std::is_floating_point<Arithmetic>::value) {
+            return std::abs(result);
+        }
+        else {
+            return result < 0 ? -result : result;
+        }
     }
 
     LZ_NODISCARD LZ_CONSTEXPR_CXX_20 reference operator[](const difference_type offset) const noexcept {

diff --git a/include/Lz/detail/ZipLongestIterator.hpp b/include/Lz/detail/ZipLongestIterator.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef LZ_ZIP_ITERATOR_HPP
-#    define LZ_ZIP_ITERATOR_HPP
+#ifndef LZ_ZIP_LONGEST_ITERATOR_HPP
+#    define LZ_ZIP_LONGEST_ITERATOR_HPP
 
 #    include "LzTools.hpp"
 #    include "Optional.hpp"
@@ -312,4 +312,4 @@ class ZipLongestIterator<true /*is random access*/, Iterators...> {
 };
 } // namespace internal
 } // namespace lz
-#endif
+#endif // LZ_ZIP_LONGEST_ITERATOR_HPP
diff --git a/tests/standalone.cpp b/tests/standalone.cpp
@@ -24,7 +24,7 @@ TEST_CASE("Overall tests with LZ_STANDALONE defined") {
 #ifdef LZ_HAS_CXX_17
     REQUIRE(std::is_same_v<decltype(*splitter.begin()), std::string_view>);
 #else
-    REQUIRE(std::is_same<decltype(*splitter.begin()), std::string>::value);
+    REQUIRE(std::is_same<decltype(*splitter.begin()), lz::CString<char, false>>::value);
 #endif
 
     std::array<double, 4> vec = { 1.1, 2.2, 3.3, 4.4 };