Replace MIN# / MAX# with variadic MIN / MAX (#11960)
This commit is contained in:
AnoNymous
committed by
Scott Lahteine
Scott Lahteine
parent
e10f730478
commit
b30ca652ae
@ -20,8 +20,9 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _CORE_MACROS_H_
|
||||
#define _CORE_MACROS_H_
|
||||
#pragma once
|
||||
|
||||
#include "minmax.h"
|
||||
|
||||
#define NUM_AXIS 4
|
||||
#define ABCE 4
|
||||
@ -93,10 +94,6 @@
|
||||
#define IS_POWER_OF_2(x) ((x) && !((x) & ((x) - 1)))
|
||||
|
||||
// Macros to constrain values
|
||||
// Avoid double evaluation of arguments to NOMORE/NOLESS/LIMIT
|
||||
#undef NOMORE
|
||||
#undef NOLESS
|
||||
#undef LIMIT
|
||||
#ifdef __cplusplus
|
||||
|
||||
// C++11 solution that is standards compliant.
|
||||
@ -207,49 +204,13 @@
|
||||
|
||||
#define CEILING(x,y) (((x) + (y) - 1) / (y))
|
||||
|
||||
// Avoid double evaluation of arguments on MIN/MAX/ABS
|
||||
#undef MIN
|
||||
#undef MAX
|
||||
#undef ABS
|
||||
#ifdef __cplusplus
|
||||
|
||||
// C++11 solution that is standards compliant. Return type is deduced automatically
|
||||
template <class L, class R> static inline constexpr auto MIN(const L lhs, const R rhs) -> decltype(lhs + rhs) {
|
||||
return lhs < rhs ? lhs : rhs;
|
||||
}
|
||||
template <class L, class R> static inline constexpr auto MAX(const L lhs, const R rhs) -> decltype(lhs + rhs){
|
||||
return lhs > rhs ? lhs : rhs;
|
||||
}
|
||||
template <class T> static inline constexpr const T ABS(const T v) {
|
||||
return v >= 0 ? v : -v;
|
||||
}
|
||||
template <class T> static inline constexpr const T ABS(const T v) { return v >= 0 ? v : -v; }
|
||||
#else
|
||||
|
||||
// Using GCC extensions, but Travis GCC version does not like it and gives
|
||||
// "error: statement-expressions are not allowed outside functions nor in template-argument lists"
|
||||
#define MIN(a, b) \
|
||||
({__typeof__(a) _a = (a); \
|
||||
__typeof__(b) _b = (b); \
|
||||
_a < _b ? _a : _b;})
|
||||
|
||||
#define MAX(a, b) \
|
||||
({__typeof__(a) _a = (a); \
|
||||
__typeof__(b) _b = (b); \
|
||||
_a > _b ? _a : _b;})
|
||||
|
||||
#define ABS(a) \
|
||||
({__typeof__(a) _a = (a); \
|
||||
_a >= 0 ? _a : -_a;})
|
||||
|
||||
#define ABS(a) ({__typeof__(a) _a = (a); _a >= 0 ? _a : -_a;})
|
||||
#endif
|
||||
|
||||
#define MIN3(a, b, c) MIN(MIN(a, b), c)
|
||||
#define MIN4(a, b, c, d) MIN(MIN3(a, b, c), d)
|
||||
#define MIN5(a, b, c, d, e) MIN(MIN4(a, b, c, d), e)
|
||||
#define MAX3(a, b, c) MAX(MAX(a, b), c)
|
||||
#define MAX4(a, b, c, d) MAX(MAX3(a, b, c), d)
|
||||
#define MAX5(a, b, c, d, e) MAX(MAX4(a, b, c, d), e)
|
||||
|
||||
#define UNEAR_ZERO(x) ((x) < 0.000001f)
|
||||
#define NEAR_ZERO(x) WITHIN(x, -0.000001f, 0.000001f)
|
||||
#define NEAR(x,y) NEAR_ZERO((x)-(y))
|
||||
@ -269,5 +230,3 @@
|
||||
#define LROUND(x) lroundf(x)
|
||||
#define FMOD(x, y) fmodf(x, y)
|
||||
#define HYPOT(x,y) SQRT(HYPOT2(x,y))
|
||||
|
||||
#endif // _CORE_MACROS_H_
|
||||
|
||||
68
Marlin/src/core/minmax.h
Normal file
68
Marlin/src/core/minmax.h
Normal file
@ -0,0 +1,68 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||
*
|
||||
* Based on Sprinter and grbl.
|
||||
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#undef MIN
|
||||
#undef MAX
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
extern "C++" {
|
||||
|
||||
// C++11 solution that is standards compliant. Return type is deduced automatically
|
||||
template <class L, class R> static inline constexpr auto MIN(const L lhs, const R rhs) -> decltype(lhs + rhs) {
|
||||
return lhs < rhs ? lhs : rhs;
|
||||
}
|
||||
template <class L, class R> static inline constexpr auto MAX(const L lhs, const R rhs) -> decltype(lhs + rhs) {
|
||||
return lhs > rhs ? lhs : rhs;
|
||||
}
|
||||
template<class T, class ... Ts> static inline constexpr const T MIN(T V, Ts... Vs) { return MIN(V, MIN(Vs...)); }
|
||||
template<class T, class ... Ts> static inline constexpr const T MAX(T V, Ts... Vs) { return MAX(V, MAX(Vs...)); }
|
||||
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
// NUM_ARGS(...) evaluates to the number of arguments
|
||||
#define _NUM_ARGS(X,X6,X5,X4,X3,X2,X1,N,...) N
|
||||
#define NUM_ARGS(...) _NUM_ARGS(0, __VA_ARGS__ ,6,5,4,3,2,1,0)
|
||||
|
||||
#define MIN_2(a,b) ({__typeof__(a) _a = (a); __typeof__(b) _b = (b); _a > _b ? _a : _b;})
|
||||
#define MIN_3(a,...) MIN_2(a,MIN_2(__VA_ARGS__))
|
||||
#define MIN_4(a,...) MIN_2(a,MIN_3(__VA_ARGS__))
|
||||
#define MIN_5(a,...) MIN_2(a,MIN_4(__VA_ARGS__))
|
||||
#define MIN_6(a,...) MIN_2(a,MIN_4(__VA_ARGS__))
|
||||
#define __MIN_N(N, ...) MIN_ ## N(__VA_ARGS__)
|
||||
#define _MIN_N(N, ...) __MIN_N(N, __VA_ARGS__)
|
||||
#define MIN(...) _MIN_N(NUM_ARGS(__VA_ARGS__), __VA_ARGS__)
|
||||
|
||||
#define MAX_2(a,b) ({__typeof__(a) _a = (a); __typeof__(b) _b = (b); _a > _b ? _a : _b;})
|
||||
#define MAX_3(a,...) MAX_2(a,MAX_2(__VA_ARGS__))
|
||||
#define MAX_4(a,...) MAX_2(a,MAX_3(__VA_ARGS__))
|
||||
#define MAX_5(a,...) MAX_2(a,MAX_4(__VA_ARGS__))
|
||||
#define MAX_6(a,...) MAX_2(a,MAX_4(__VA_ARGS__))
|
||||
#define __MAX_N(N, ...) MAX_ ## N(__VA_ARGS__)
|
||||
#define _MAX_N(N, ...) __MAX_N(N, __VA_ARGS__)
|
||||
#define MAX(...) _MAX_N(NUM_ARGS(__VA_ARGS__), __VA_ARGS__)
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user