mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-06-25 01:01:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: limits.h removed and the contents moved to quantity.h and quantity_point.h

Browse Source 
Resolves #673
This commit is contained in:
Mateusz Pusz
2025-02-06 17:16:12 +01:00
parent 51559d094b
commit c6e95a9fc7
6 changed files with 120 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/CMakeLists.txt
View File

@ -78,7 +78,6 @@ add_mp_units_module(
include/mp-units/concepts.h
include/mp-units/core.h
include/mp-units/framework.h
include/mp-units/limits.h
MODULE_INTERFACE_UNIT mp-units-core.cpp
)

1
src/core/include/mp-units/core.h
View File

@ -26,7 +26,6 @@
#include <mp-units/compat_macros.h>
#include <mp-units/concepts.h>
#include <mp-units/framework.h>
#include <mp-units/limits.h>
#if MP_UNITS_HOSTED
#include <mp-units/cartesian_vector.h>

60
src/core/include/mp-units/framework/quantity.h
View File

@ -43,6 +43,7 @@
import std;
#else
#include <compare> // IWYU pragma: export
#include <limits>
#include <utility>
#endif
#endif
@ -670,3 +671,62 @@ struct std::common_type<Q, Value> {
template<mp_units::Quantity Q, mp_units::Representation Value>
requires requires { typename std::common_type<Q, Value>; }
struct std::common_type<Value, Q> : std::common_type<Q, Value> {};
template<auto R, typename Rep>
requires requires { typename std::numeric_limits<Rep>; }
class std::numeric_limits<mp_units::quantity<R, Rep>> : public std::numeric_limits<Rep> {
public:
static constexpr mp_units::quantity<R, Rep> min() noexcept
requires requires { mp_units::quantity<R, Rep>::min(); }
{
return mp_units::quantity<R, Rep>::min();
}
static constexpr mp_units::quantity<R, Rep> max() noexcept
requires requires { mp_units::quantity<R, Rep>::max(); }
{
return mp_units::quantity<R, Rep>::max();
}
static constexpr mp_units::quantity<R, Rep> lowest() noexcept
requires requires { std::numeric_limits<Rep>::lowest(); }
{
return {std::numeric_limits<Rep>::lowest(), R};
}
static constexpr mp_units::quantity<R, Rep> epsilon() noexcept
requires requires { std::numeric_limits<Rep>::epsilon(); }
{
return {std::numeric_limits<Rep>::epsilon(), R};
}
static constexpr mp_units::quantity<R, Rep> round_error() noexcept
requires requires { std::numeric_limits<Rep>::round_error(); }
{
return {std::numeric_limits<Rep>::round_error(), R};
}
static constexpr mp_units::quantity<R, Rep> infinity() noexcept
requires requires { std::numeric_limits<Rep>::infinity(); }
{
return {std::numeric_limits<Rep>::infinity(), R};
}
static constexpr mp_units::quantity<R, Rep> quiet_NaN() noexcept
requires requires { std::numeric_limits<Rep>::quiet_NaN(); }
{
return {std::numeric_limits<Rep>::quiet_NaN(), R};
}
static constexpr mp_units::quantity<R, Rep> signaling_NaN() noexcept
requires requires { std::numeric_limits<Rep>::signaling_NaN(); }
{
return {std::numeric_limits<Rep>::signaling_NaN(), R};
}
static constexpr mp_units::quantity<R, Rep> denorm_min() noexcept
requires requires { std::numeric_limits<Rep>::denorm_min(); }
{
return {std::numeric_limits<Rep>::denorm_min(), R};
}
};

60
src/core/include/mp-units/framework/quantity_point.h
View File

@ -35,6 +35,7 @@
import std;
#else
#include <compare> // IWYU pragma: export
#include <limits>
#endif
#endif
@ -561,3 +562,62 @@ explicit(quantity_point_like_traits<QP>::explicit_import) quantity_point(QP)
typename quantity_point_like_traits<QP>::rep>;
} // namespace mp_units
template<auto R, auto PO, typename Rep>
requires requires { typename std::numeric_limits<Rep>; }
class std::numeric_limits<mp_units::quantity_point<R, PO, Rep>> : public std::numeric_limits<Rep> {
public:
static constexpr mp_units::quantity_point<R, PO, Rep> min() noexcept
requires requires { mp_units::quantity_point<R, PO, Rep>::min(); }
{
return mp_units::quantity_point<R, PO, Rep>::min();
}
static constexpr mp_units::quantity_point<R, PO, Rep> max() noexcept
requires requires { mp_units::quantity_point<R, PO, Rep>::max(); }
{
return mp_units::quantity_point<R, PO, Rep>::max();
}
static constexpr mp_units::quantity_point<R, PO, Rep> lowest() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::lowest(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::lowest(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> epsilon() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::epsilon(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::epsilon(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> round_error() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::round_error(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::round_error(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> infinity() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::infinity(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::infinity(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> quiet_NaN() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::quiet_NaN(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::quiet_NaN(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> signaling_NaN() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::signaling_NaN(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::signaling_NaN(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> denorm_min() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::denorm_min(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::denorm_min(), PO};
}
};

154
src/core/include/mp-units/limits.h
View File

@ -1,154 +0,0 @@
// The MIT License (MIT)
//
// Copyright (c) 2018 Mateusz Pusz
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#pragma once
#include <mp-units/bits/module_macros.h>
#include <mp-units/framework/quantity.h>
#include <mp-units/framework/quantity_point.h>
#ifndef MP_UNITS_IN_MODULE_INTERFACE
#ifdef MP_UNITS_IMPORT_STD
import std;
#else
#include <limits>
#endif // MP_UNITS_IMPORT_STD
#endif // MP_UNITS_IN_MODULE_INTERFACE
template<auto R, typename Rep>
requires requires { typename std::numeric_limits<Rep>; }
class std::numeric_limits<mp_units::quantity<R, Rep>> : public std::numeric_limits<Rep> {
public:
static constexpr mp_units::quantity<R, Rep> min() noexcept
requires requires { mp_units::quantity<R, Rep>::min(); }
{
return mp_units::quantity<R, Rep>::min();
}
static constexpr mp_units::quantity<R, Rep> max() noexcept
requires requires { mp_units::quantity<R, Rep>::max(); }
{
return mp_units::quantity<R, Rep>::max();
}
static constexpr mp_units::quantity<R, Rep> lowest() noexcept
requires requires { std::numeric_limits<Rep>::lowest(); }
{
return {std::numeric_limits<Rep>::lowest(), R};
}
static constexpr mp_units::quantity<R, Rep> epsilon() noexcept
requires requires { std::numeric_limits<Rep>::epsilon(); }
{
return {std::numeric_limits<Rep>::epsilon(), R};
}
static constexpr mp_units::quantity<R, Rep> round_error() noexcept
requires requires { std::numeric_limits<Rep>::round_error(); }
{
return {std::numeric_limits<Rep>::round_error(), R};
}
static constexpr mp_units::quantity<R, Rep> infinity() noexcept
requires requires { std::numeric_limits<Rep>::infinity(); }
{
return {std::numeric_limits<Rep>::infinity(), R};
}
static constexpr mp_units::quantity<R, Rep> quiet_NaN() noexcept
requires requires { std::numeric_limits<Rep>::quiet_NaN(); }
{
return {std::numeric_limits<Rep>::quiet_NaN(), R};
}
static constexpr mp_units::quantity<R, Rep> signaling_NaN() noexcept
requires requires { std::numeric_limits<Rep>::signaling_NaN(); }
{
return {std::numeric_limits<Rep>::signaling_NaN(), R};
}
static constexpr mp_units::quantity<R, Rep> denorm_min() noexcept
requires requires { std::numeric_limits<Rep>::denorm_min(); }
{
return {std::numeric_limits<Rep>::denorm_min(), R};
}
};
template<auto R, auto PO, typename Rep>
requires requires { typename std::numeric_limits<Rep>; }
class std::numeric_limits<mp_units::quantity_point<R, PO, Rep>> : public std::numeric_limits<Rep> {
public:
static constexpr mp_units::quantity_point<R, PO, Rep> min() noexcept
requires requires { mp_units::quantity_point<R, PO, Rep>::min(); }
{
return mp_units::quantity_point<R, PO, Rep>::min();
}
static constexpr mp_units::quantity_point<R, PO, Rep> max() noexcept
requires requires { mp_units::quantity_point<R, PO, Rep>::max(); }
{
return mp_units::quantity_point<R, PO, Rep>::max();
}
static constexpr mp_units::quantity_point<R, PO, Rep> lowest() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::lowest(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::lowest(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> epsilon() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::epsilon(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::epsilon(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> round_error() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::round_error(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::round_error(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> infinity() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::infinity(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::infinity(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> quiet_NaN() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::quiet_NaN(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::quiet_NaN(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> signaling_NaN() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::signaling_NaN(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::signaling_NaN(), PO};
}
static constexpr mp_units::quantity_point<R, PO, Rep> denorm_min() noexcept
requires requires { std::numeric_limits<mp_units::quantity<R, Rep>>::denorm_min(); }
{
return {std::numeric_limits<mp_units::quantity<R, Rep>>::denorm_min(), PO};
}
};

1
test/static/limits_test.cpp
View File

@ -20,7 +20,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include <mp-units/limits.h>
#include <mp-units/systems/si.h>
#ifdef MP_UNITS_IMPORT_STD
import std;