Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update math macros to avoid computing callable arguments more than once #140

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update math macros to avoid computing callable arguments more than once #140

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57dec20
Add C++ template versions of C macros
Keating950 Feb 5, 2021
be460bc
make C macros evaluate arguments once; reduce unnecessary parentheses
Keating950 Feb 5, 2021
18f5095
minimize diff; fix missing paren
Keating950 Feb 17, 2021
585f67a
remove trailing newline
Keating950 Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 81 additions & 35 deletions api/Common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,92 @@ typedef enum {
#define SERIAL 0x0
#define DISPLAY 0x1

#ifndef constrain
#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
#ifdef __cplusplus
} // extern "C"
#endif

#ifndef radians
#define radians(deg) ((deg)*DEG_TO_RAD)
#endif
#ifdef __cplusplus

template<class T, class L>
auto min(const T& a, const L& b) -> decltype(b < a ? b : a)
{
return (b < a) ? b : a;
}

template<class T, class L>
auto max(const T& a, const L& b) -> decltype(b < a ? b : a)
{
return (a < b) ? b : a;
}


template<class T, class U, class V>
auto constrain(const T& amt, const U& low, const V& high) -> decltype(amt < low ? low : (amt > high ? high : amt))
{
return amt < low ? low : (amt > high ? high : amt);
}

template<class T>
auto radians(const T& deg) -> decltype(deg * DEG_TO_RAD)
{
return deg * DEG_TO_RAD;
}

template<class T>
auto degrees(const T& rad) -> decltype(rad * RAD_TO_DEG)
{
return rad * RAD_TO_DEG;
}

#ifndef degrees
#define degrees(rad) ((rad)*RAD_TO_DEG)
template<class T>
auto sq(const T& x) -> decltype(x*x)
{
return x*x;
}
#else
#ifndef constrain
#define constrain(amt,low,high) \
({ __typeof__ (amt) _amt = (amt); \
__typeof__ (low) _low = (low); \
__typeof__ (high) _high = (high); \
_amt < _low ? _low : (_amt > _high ? _high :_amt); }
#endif

#ifndef radians
#define radians(deg) \
({ __typeof__ (deg) _deg = deg; \
_deg * DEG_TO_RAD; })
#endif

#ifndef degrees
#define degrees(rad) \
({ __typeof__ (rad) _rad = rad; \
_rad * RAD_TO_DEG; })
#endif

#ifndef sq
#define sq(x) \
({ __typeof__ (x) _x = x; \
_x * _x; })
#endif

#ifndef min
#define min(a,b) \
({ __typeof__ (a) _a = (a); \
__typeof__ (b) _b = (b); \
_a < _b ? _a : _b; })
#endif

#ifndef max
#define max(a,b) \
({ __typeof__ (a) _a = (a); \
__typeof__ (b) _b = (b); \
_a > _b ? _a : _b; })
#endif
#endif

#ifndef sq
#define sq(x) ((x)*(x))
#ifdef __cplusplus
extern "C"{
#endif

typedef void (*voidFuncPtr)(void);
Expand Down Expand Up @@ -119,32 +191,6 @@ void loop(void);
} // extern "C"
#endif

#ifdef __cplusplus
template<class T, class L>
auto min(const T& a, const L& b) -> decltype((b < a) ? b : a)
{
return (b < a) ? b : a;
}

template<class T, class L>
auto max(const T& a, const L& b) -> decltype((b < a) ? b : a)
{
return (a < b) ? b : a;
}
#else
#ifndef min
#define min(a,b) \
({ __typeof__ (a) _a = (a); \
__typeof__ (b) _b = (b); \
_a < _b ? _a : _b; })
#endif
#ifndef max
#define max(a,b) \
({ __typeof__ (a) _a = (a); \
__typeof__ (b) _b = (b); \
_a > _b ? _a : _b; })
#endif
#endif

#ifdef __cplusplus

Expand Down