1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 23:52:26 +00:00

Tidy up; forward construction arguments.

This commit is contained in:
Thomas Harte 2023-06-10 15:58:13 -04:00
parent 4e12d5a70a
commit c0547f6e14

View File

@ -23,20 +23,21 @@ struct Dispatcher {
/// Perform @c target.perform<n>() for the input range `start <= n < end`; /// Perform @c target.perform<n>() for the input range `start <= n < end`;
/// @c ConverterT()(n) will be applied to each individual step before it becomes the relevant template argument. /// @c ConverterT()(n) will be applied to each individual step before it becomes the relevant template argument.
void dispatch(SequencerT &target, int start, int end) { template <typename... Args>
void dispatch(SequencerT &target, int start, int end, Args&&... args) {
// Minor optimisation: do a comparison with end once outside the loop and if it implies so // Minor optimisation: do a comparison with end once outside the loop and if it implies so
// then do no further comparisons within the loop. This is somewhat targetted at expected // then do no further comparisons within the loop. This is somewhat targetted at expected
// use cases. // use cases.
if(end < max) { if(end < max) {
dispatch<true>(target, start, end); dispatch<true>(target, start, end, args...);
} else { } else {
dispatch<false>(target, start, end); dispatch<false>(target, start, end, args...);
} }
} }
private: private:
template <bool use_end> void dispatch(SequencerT &target, int start, int end) { template <bool use_end, typename... Args> void dispatch(SequencerT &target, int start, int end, Args&&... args) {
static_assert(max < 2048); static_assert(max < 2048);
// Yes, macros, yuck. But I want an actual switch statement for the dispatch to start // Yes, macros, yuck. But I want an actual switch statement for the dispatch to start
@ -45,15 +46,15 @@ private:
// //
// Sensible choices by the optimiser are assumed. // Sensible choices by the optimiser are assumed.
#define index(n) \ #define index(n) \
case n: \ case n: \
if constexpr (n <= max) { \ if constexpr (n <= max) { \
if constexpr (n == max) return; \ if constexpr (n == max) return; \
if constexpr (n < max) { \ if constexpr (n < max) { \
if(use_end && end == n) return; \ if(use_end && end == n) return; \
} \ } \
target.template perform<ConverterT()(n)>(); \ target.template perform<ConverterT()(n)>(args...); \
} \ } \
[[fallthrough]]; [[fallthrough]];
#define index2(n) index(n); index(n+1); #define index2(n) index(n); index(n+1);