fix min and max

sabudilovskiy · Oct 12, 2023 · 52c7381 · 52c7381
1 parent aca9c71
commit 52c7381
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/src/openapi/base/array_traits.hpp b/src/openapi/base/array_traits.hpp
@@ -16,7 +16,7 @@ concept HasMin = requires
     {
         T::kMin
     }
-    ->std::convertible_to<utils::ConstexprOptional<size_t>>;
+    ->std::convertible_to<utils::ConstexprOptional<std::int64_t>>;
 };
 
 template <typename T>
@@ -25,7 +25,7 @@ concept HasMax = requires
     {
         T::kMax
     }
-    ->std::convertible_to<utils::ConstexprOptional<size_t>>;
+    ->std::convertible_to<utils::ConstexprOptional<std::int64_t>>;
 };
 
 template <typename T>
@@ -58,7 +58,7 @@ constexpr auto _getMin()
 template <checks::HasNotMin T>
 constexpr auto _getMin()
 {
-    return utils::ConstexprOptional<size_t>{utils::kNull};
+    return utils::ConstexprOptional<std::int64_t>{utils::kNull};
 }
 
 template <checks::HasMax T>
@@ -70,7 +70,7 @@ constexpr auto _getMax()
 template <checks::HasNotMax T>
 constexpr auto _getMax()
 {
-    return utils::ConstexprOptional<size_t>{utils::kNull};
+    return utils::ConstexprOptional<std::int64_t>{utils::kNull};
 }
 
 template <checks::HasUniqueItems T>
@@ -89,12 +89,12 @@ constexpr auto _getUniqueItems()
 namespace traits
 {
 template <typename T>
-constexpr utils::ConstexprOptional<size_t> GetMin()
+constexpr utils::ConstexprOptional<std::int64_t> GetMin()
 {
     return detail::_getMin<T>();
 }
 template <typename T>
-constexpr utils::ConstexprOptional<size_t> GetMax()
+constexpr utils::ConstexprOptional<std::int64_t> GetMax()
 {
     return detail::_getMax<T>();
 }
@@ -107,9 +107,9 @@ constexpr utils::ConstexprOptional<bool> GetUniqueItems()
 template <typename Traits>
 struct ArrayHelperTraits : NamedHelperTraits<Traits>
 {
-    static constexpr utils::ConstexprOptional<size_t> min =
+    static constexpr utils::ConstexprOptional<std::int64_t> min =
         traits::GetMin<Traits>();
-    static constexpr utils::ConstexprOptional<size_t> max =
+    static constexpr utils::ConstexprOptional<std::int64_t> max =
         traits::GetMax<Traits>();
     static constexpr utils::ConstexprOptional<bool> unique_items =
         traits::GetUniqueItems<Traits>();

diff --git a/src/openapi/base/preferences.hpp b/src/openapi/base/preferences.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 #include <utils/constexpr_string.hpp>
 
 namespace openapi::preferences
@@ -9,12 +10,12 @@ struct value_holder
     static auto constexpr kValue = value;
 };
 
-template <size_t value>
+template <std::int64_t value>
 struct Min : value_holder<value>
 {
 };
 
-template <size_t value>
+template <std::int64_t value>
 struct Max : value_holder<value>
 {
 };

diff --git a/src/openapi/types/array_type.hpp b/src/openapi/types/array_type.hpp
@@ -10,8 +10,8 @@ namespace openapi
 namespace detail
 {
 template <utils::ConstexprString Name,
-          utils::ConstexprOptional<size_t> Min = utils::kNull,
-          utils::ConstexprOptional<size_t> Max = utils::kNull,
+          utils::ConstexprOptional<std::int64_t> Min = utils::kNull,
+          utils::ConstexprOptional<std::int64_t> Max = utils::kNull,
           utils::ConstexprOptional<bool> UniqueItems = utils::kNull>
 struct ArrayTraits : NamedTraits<Name>
 {
@@ -31,9 +31,9 @@ struct ArrayTraitsHolder
 {
     std::array<char, 256> Name{};
     size_t Name_was_changed = 0;
-    utils::ConstexprOptional<size_t> Min = utils::kNull;
+    utils::ConstexprOptional<std::int64_t> Min = utils::kNull;
     size_t Min_was_changed = 0;
-    utils::ConstexprOptional<size_t> Max = utils::kNull;
+    utils::ConstexprOptional<std::int64_t> Max = utils::kNull;
     size_t Max_was_changed = 0;
     utils::ConstexprOptional<bool> UniqueItems = utils::kNull;
     size_t UniqueItems_was_changed = 0;
@@ -61,14 +61,14 @@ void consteval Apply(ArrayTraitsHolder&, const T&)
         ![] {}, "You are used unknown option");
 }
 
-template <size_t value>
+template <std::int64_t value>
 void consteval Apply(ArrayTraitsHolder& traits, preferences::Min<value>)
 {
     traits.Min = value;
     traits.Min_was_changed++;
 }
 
-template <size_t value>
+template <std::int64_t value>
 void consteval Apply(ArrayTraitsHolder& traits, preferences::Max<value>)
 {
     traits.Max = value;

diff --git a/src/utils/constexpr_string.hpp b/src/utils/constexpr_string.hpp
@@ -72,7 +72,9 @@ struct ConstexprString
 template <std::size_t n>
 ConstexprString(char const (&)[n]) -> ConstexprString<n>;
 
-template <std::array<char, 256> arr_>
+using FixedString = std::array<char, 256>;
+
+template <FixedString arr_>
 auto consteval MakeConstexprString()
 {
     constexpr auto real_end_it = std::find(begin(arr_), end(arr_), '\0');