diff --git a/doc/config_settings.yaml b/doc/config_settings.yaml index cad1056e..52452164 100644 --- a/doc/config_settings.yaml +++ b/doc/config_settings.yaml @@ -433,6 +433,10 @@ values: desc: Shows the time range covered by a graph. - name: show_graph_scale desc: Shows the maximum value in scaled graphs. + - name: graph_gradient_mode + desc: |- + Changes the color space used for interpolation. Arguments are hcl, hsv, + and rgb (default). - name: stippled_borders desc: Border stippling (dashing) in pixels. - name: temperature_unit diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1c764353..4544b48f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -68,6 +68,8 @@ set(conky_sources exec.h fs.cc fs.h + gradient.cc + gradient.h mail.cc mail.h misc.cc @@ -299,14 +301,6 @@ if(BUILD_INTEL_BACKLIGHT) set(optional_sources ${optional_sources} ${intel_backlight}) endif(BUILD_INTEL_BACKLIGHT) -if(BUILD_HCL_GRADIENT) - set(hcl_gradient hcl_gradient.cc hcl_gradient.h) - set(optional_sources ${optional_sources} ${hcl_gradient}) -elseif(BUILD_HSV_GRADIENT) - set(hsv_gradient hsv_gradient.cc hsv_gradient.h) - set(optional_sources ${optional_sources} ${hsv_gradient}) -endif(BUILD_HCL_GRADIENT) - if(BUILD_TESTS) # Create a library strictly for testing add_library(conky_core ${conky_sources} ${optional_sources}) diff --git a/src/colours.cc b/src/colours.cc index 4437aa46..ab1a009b 100644 --- a/src/colours.cc +++ b/src/colours.cc @@ -83,69 +83,6 @@ unsigned int adjust_colours(unsigned int colour) { return colour; } -/* this function returns the next colour between two colours for a gradient */ -std::unique_ptr do_gradient(int width, - unsigned long first_colour, - unsigned long last_colour) { - int red1, green1, blue1; // first colour - int red2, green2, blue2; // last colour - int reddiff, greendiff, bluediff; // difference - short redshift = (2 * colour_depth / 3 + colour_depth % 3); - short greenshift = (colour_depth / 3); - - // Make sure the width is always at least 2 - width = std::max(2, width); - - std::unique_ptr colours(new unsigned long[width]); - - if (colour_depth == 0) { set_up_gradient(); } - red1 = (first_colour & redmask) >> redshift; - green1 = (first_colour & greenmask) >> greenshift; - blue1 = first_colour & bluemask; - red2 = (last_colour & redmask) >> redshift; - green2 = (last_colour & greenmask) >> greenshift; - blue2 = last_colour & bluemask; - reddiff = abs(red1 - red2); - greendiff = abs(green1 - green2); - bluediff = abs(blue1 - blue2); -#ifdef HAVE_OPENMP -#pragma omp parallel for schedule(dynamic, 10) shared(colours) -#endif /* HAVE_OPENMP */ - for (int i = 0; i < width; i++) { - int red3 = 0, green3 = 0, blue3 = 0; // colour components - - float factor = (static_cast(i) / (width - 1)); - - /* the '+ 0.5' bit rounds our floats to ints properly */ - if (red1 >= red2) { - red3 = -(factor * reddiff) - 0.5; - } else if (red1 < red2) { - red3 = factor * reddiff + 0.5; - } - if (green1 >= green2) { - green3 = -(factor * greendiff) - 0.5; - } else if (green1 < green2) { - green3 = factor * greendiff + 0.5; - } - if (blue1 >= blue2) { - blue3 = -(factor * bluediff) - 0.5; - } else if (blue1 < blue2) { - blue3 = factor * bluediff + 0.5; - } - red3 += red1; - green3 += green1; - blue3 += blue1; - if (red3 < 0) { red3 = 0; } - if (green3 < 0) { green3 = 0; } - if (blue3 < 0) { blue3 = 0; } - if (red3 > bluemask) { red3 = bluemask; } - if (green3 > bluemask) { green3 = bluemask; } - if (blue3 > bluemask) { blue3 = bluemask; } - colours[i] = (red3 << redshift) | (green3 << greenshift) | blue3; - } - return colours; -} - #ifdef BUILD_X11 long get_x11_color(const char *name) { XColor color; diff --git a/src/colours.h b/src/colours.h index e943b8a9..e9348369 100644 --- a/src/colours.h +++ b/src/colours.h @@ -33,7 +33,6 @@ #include unsigned int adjust_colours(unsigned int); -std::unique_ptr do_gradient(int, unsigned long, unsigned long); long get_x11_color(const std::string &colour); // XXX: when everyone uses C++ strings, remove this C version diff --git a/src/conky.cc b/src/conky.cc index c4603ce7..75622fc0 100644 --- a/src/conky.cc +++ b/src/conky.cc @@ -130,13 +130,7 @@ #include "openbsd.h" #endif /* __OpenBSD__ */ -#ifdef BUILD_HCL_GRADIENT -#include "hcl_gradient.h" -#endif /* BUILD_HCL_GRADIENT */ - -#ifdef BUILD_HSV_GRADIENT -#include "hsv_gradient.h" -#endif /* BUILD_HSV_GRADIENT */ +#include "gradient.h" #ifdef BUILD_OLD_CONFIG #include "convertconf.h" @@ -295,12 +289,19 @@ conky::range_config_setting diskio_avg_samples("diskio_avg_samples", 1, 14, 2, true); #ifdef BUILD_GUI - +/* graph */ conky::simple_config_setting show_graph_scale("show_graph_scale", false, false); conky::simple_config_setting show_graph_range("show_graph_range", false, false); +enum gradient_state { RGB_GRADIENT = 0, HSV_GRADIENT, HCL_GRADIENT }; +template <> +conky::lua_traits::Map conky::lua_traits::map = + {{"rgb", RGB_GRADIENT}, {"hsv", HSV_GRADIENT}, {"hcl", HCL_GRADIENT}}; +static conky::simple_config_setting graph_gradient_mode( + "graph_gradient_mode", RGB_GRADIENT, false); + /* Position on the screen */ conky::simple_config_setting gap_x("gap_x", 5, true); conky::simple_config_setting gap_y("gap_y", 60, true); @@ -402,6 +403,20 @@ int dpi_scale(int value) { #endif /* BUILD_GUI */ } +conky::gradient_factory *create_gradient_factory(int width, + unsigned long first_colour, + unsigned long last_colour) { + switch (graph_gradient_mode.get(*state)) { + case RGB_GRADIENT: + return new conky::rgb_gradient_factory(width, first_colour, last_colour); + case HSV_GRADIENT: + return new conky::hsv_gradient_factory(width, first_colour, last_colour); + case HCL_GRADIENT: + return new conky::hcl_gradient_factory(width, first_colour, last_colour); + } + return nullptr; +} + /* formatted text to render on screen, generated in generate_text(), * drawn in draw_stuff() */ @@ -1295,17 +1310,10 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied) { std::unique_ptr tmpcolour; if (current->last_colour != 0 || current->first_colour != 0) { -#ifdef BUILD_HCL_GRADIENT - tmpcolour = do_hcl_gradient(w - 1, current->last_colour, - current->first_colour); -#endif /* BUILD_HCL_GRADIENT */ -#ifdef BUILD_HSV_GRADIENT - tmpcolour = do_hsv_gradient(w - 1, current->last_colour, - current->first_colour); -#else /* BUILD_HSV_GRADIENT */ - tmpcolour = do_gradient(w - 1, current->last_colour, - current->first_colour); -#endif /* BUILD_HSV_GRADIENT */ + auto factory = create_gradient_factory(w, current->last_colour, + current->first_colour); + tmpcolour = factory->create_gradient(); + delete factory; } colour_idx = 0; for (i = w - 2; i > -1; i--) { diff --git a/src/gradient.cc b/src/gradient.cc new file mode 100644 index 00000000..8fa1c17b --- /dev/null +++ b/src/gradient.cc @@ -0,0 +1,330 @@ +/* + * + * Conky, a system monitor, based on torsmo + * + * Any original torsmo code is licensed under the BSD license + * + * All code written since the fork of torsmo is licensed under the GPL + * + * Please see COPYING for details + * + * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen + * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * (see AUTHORS) + * All rights reserved. + * + * 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 . + * + */ +#include "gradient.h" +#include "conky.h" +#include "logging.h" + +#ifdef BUILD_X11 +#include "x11.h" +#endif /* BUILD_X11 */ + +namespace conky { +bool gradient_factory::is_set = false; +short gradient_factory::colour_depth = 0; +long gradient_factory::mask[3]; +short gradient_factory::shift[3]; + +gradient_factory::gradient_factory(int width, unsigned long first_colour, + unsigned long last_colour) { + // Make sure the width is always at least 2 + this->width = std::max(2, width); + this->first_colour = first_colour; + this->last_colour = last_colour; + + if (!is_set) { + setup_colour_depth(); + setup_masks(); + setup_shifts(); + is_set = true; + } +} + +void gradient_factory::setup_shifts() { + shift[0] = (2 * colour_depth / 3 + colour_depth % 3); + shift[1] = (colour_depth / 3); + shift[2] = 0; +} + +void gradient_factory::setup_masks() { + mask[0] = mask[1] = mask[2] = 0; + + for (int i = (colour_depth / 3) - 1; i >= 0; i--) { + mask[0] |= 1 << i; + mask[1] |= 1 << i; + mask[2] |= 1 << i; + } + + if (colour_depth % 3 == 1) { mask[1] |= 1 << (colour_depth / 3); } + + mask[0] = mask[0] << (2 * colour_depth / 3 + colour_depth % 3); + mask[1] = mask[1] << (colour_depth / 3); +} + +void gradient_factory::setup_colour_depth() { +#ifdef BUILD_X11 + if (out_to_x.get(*state)) { + colour_depth = DisplayPlanes(display, screen); + } else +#endif /* BUILD_X11 */ + { + colour_depth = 16; + } + + if (colour_depth != 24 && colour_depth != 16) { + NORM_ERR( + "using non-standard colour depth, " + "gradients may look like a lolly-pop"); + } +} + +void gradient_factory::convert_from_rgb(long original, long *array) { + long scaled[3]; + + for (int i = 0; i < 3; i++) { + auto value = (original & mask[i]) >> shift[i]; + scaled[i] = value * SCALE; + } + convert_from_scaled_rgb(scaled, array); +} + +int gradient_factory::convert_to_rgb(long *const array) { + long scaled_rgb[3]; + int rgb = 0; + + convert_to_scaled_rgb(array, scaled_rgb); + for (int i = 0; i < 3; i++) { + auto value = scaled_rgb[i] / SCALE; + rgb |= value << shift[i]; + } + + return rgb; +} + +gradient_factory::colour_array gradient_factory::create_gradient() { + colour_array colours(new unsigned long[width]); + + long first_converted[3]; + long last_converted[3]; + long diff[3], delta[3]; + + colours[0] = first_colour; + colours[width - 1] = last_colour; + + convert_from_rgb(first_colour, first_converted); + convert_from_rgb(last_colour, last_converted); + + for (int i = 0; i < 3; i++) { + diff[i] = last_converted[i] - first_converted[i]; + } + fix_diff(diff); + for (int i = 0; i < 3; i++) { delta[i] = diff[i] / (width - 1); } + for (int i = 1; i < width - 1; i++) { + for (int k = 0; k < 3; k++) { first_converted[k] += delta[k]; } + colours[i] = convert_to_rgb(first_converted); + } + + return colours; +} + +long gradient_factory::get_hue(long *const rgb, long chroma, long value) { + if (chroma == 0) { return 0; } + + long diff, offset; + + if (rgb[0] == value) { + diff = rgb[1] - rgb[2]; + offset = 0; + } else if (rgb[1] == value) { + diff = rgb[2] - rgb[0]; + offset = SCALE2; + } else { + diff = rgb[0] - rgb[1]; + offset = SCALE4; + } + long h = (SCALE * diff) / chroma + offset; + + return 60L * ((SCALE6 + h) % SCALE6); +} + +long gradient_factory::get_intermediate(long hue, long chroma) { + long h = hue / 60L; + long multiplier = SCALE - std::abs(h % SCALE2 - SCALE); + + return (chroma * multiplier) / SCALE; +} + +/* rgb_gradient_factory */ +void rgb_gradient_factory::convert_from_scaled_rgb(long *const scaled, + long *target) { + target[0] = scaled[0] * 360L; + target[1] = scaled[1] * 360L; + target[2] = scaled[2] * 360L; +} + +void rgb_gradient_factory::convert_to_scaled_rgb(long *const target, + long *scaled) { + scaled[0] = target[0] / 360L; + scaled[1] = target[1] / 360L; + scaled[2] = target[2] / 360L; +} +/* rgb_gradient_factory */ + +namespace { +long get_value(long *const rgb) { + if (rgb[0] > rgb[1]) { return std::max(rgb[0], rgb[2]); } + return std::max(rgb[1], rgb[2]); +} + +long get_minimum(long *const rgb) { + if (rgb[0] < rgb[1]) { return std::min(rgb[0], rgb[2]); } + return std::min(rgb[1], rgb[2]); +} +} // namespace + +/* hsv_gradient_factory */ +void hsv_gradient_factory::fix_diff(long *diff) { + if (diff[0] > SCALE180) { + diff[0] -= SCALE360; + } else if (diff[0] < -SCALE180) { + diff[0] += SCALE360; + } +} + +void hsv_gradient_factory::convert_from_scaled_rgb(long *const scaled, + long *target) { + auto value = get_value(scaled); + auto minimum = get_minimum(scaled); + auto chroma = value - minimum; + auto saturation = (SCALE * chroma) / value; + + target[0] = get_hue(scaled, chroma, value); + target[1] = saturation * 360L; + target[2] = value * 360L; +} + +void hsv_gradient_factory::convert_to_scaled_rgb(long *const target, + long *scaled) { + auto hue = target[0] % SCALE360; + auto saturation = target[1] / 360L; + auto value = target[2] / 360L; + auto chroma = (saturation * value) / SCALE; + auto x = get_intermediate(hue, chroma); + + scaled[0] = scaled[1] = scaled[2] = (value - chroma); + + if (hue < SCALE60) { + scaled[0] += chroma; + scaled[1] += x; + } else if (hue < SCALE120) { + scaled[0] += x; + scaled[1] += chroma; + } else if (hue < SCALE180) { + scaled[1] += chroma; + scaled[2] += x; + } else if (hue < SCALE240) { + scaled[1] += x; + scaled[2] += chroma; + } else if (hue < SCALE300) { + scaled[2] += chroma; + scaled[0] += x; + } else { + scaled[2] += x; + scaled[0] += chroma; + } +} +/* hsv_gradient_factory */ + +namespace { +// Using Rec.2020 color space +// Y' = 0.2627 x R + 0.6780 x G + 0.0593 x B +long get_luma(long *const rgb) { + return (2627L * rgb[0] + 6780L * rgb[1] + 593L * rgb[2]) / 10000L; +} + +// Using Rec.2020 color space +// m = Y' - (0.2627 x R + 0.6780 x G + 0.0593 x B) +long get_minimum_from_luma(long luma, long r, long g, long b) { + return luma - (2627L * r + 6780L * g + 593L * b) / 10000L; +} +} // namespace + +/* hcl_gradient_factory */ +void hcl_gradient_factory::fix_diff(long *diff) { + if (diff[0] > SCALE180) { + diff[0] -= SCALE360; + } else if (diff[0] < -SCALE180) { + diff[0] += SCALE360; + } +} + +void hcl_gradient_factory::convert_from_scaled_rgb(long *const scaled, + long *target) { + auto value = get_value(scaled); + auto minimum = get_minimum(scaled); + auto luma = get_luma(scaled); + auto chroma = value - minimum; + + target[0] = get_hue(scaled, chroma, value); + target[1] = chroma * 360L; + target[2] = luma * 360L; +} + +void hcl_gradient_factory::convert_to_scaled_rgb(long *const target, + long *scaled) { + auto hue = target[0] % SCALE360; + auto chroma = target[1] / 360L; + auto luma = target[2] / 360L; + + auto x = get_intermediate(hue, chroma); + long m; + + if (hue < SCALE60) { + m = get_minimum_from_luma(luma, chroma, x, 0); + scaled[0] = scaled[1] = scaled[2] = m; + scaled[0] += chroma; + scaled[1] += x; + } else if (hue < SCALE120) { + m = get_minimum_from_luma(luma, x, chroma, 0); + scaled[0] = scaled[1] = scaled[2] = m; + scaled[0] += x; + scaled[1] += chroma; + } else if (hue < SCALE180) { + m = get_minimum_from_luma(luma, 0, chroma, x); + scaled[0] = scaled[1] = scaled[2] = m; + scaled[1] += chroma; + scaled[2] += x; + } else if (hue < SCALE240) { + m = get_minimum_from_luma(luma, 0, x, chroma); + scaled[0] = scaled[1] = scaled[2] = m; + scaled[1] += x; + scaled[2] += chroma; + } else if (hue < SCALE300) { + m = get_minimum_from_luma(luma, x, 0, chroma); + scaled[0] = scaled[1] = scaled[2] = m; + scaled[2] += chroma; + scaled[0] += x; + } else { + m = get_minimum_from_luma(luma, chroma, 0, x); + scaled[0] = scaled[1] = scaled[2] = m; + scaled[2] += x; + scaled[0] += chroma; + } +} +/* hcl_gradient_factory */ +} // namespace conky diff --git a/src/gradient.h b/src/gradient.h new file mode 100644 index 00000000..cbcab996 --- /dev/null +++ b/src/gradient.h @@ -0,0 +1,108 @@ +/* + * + * Conky, a system monitor, based on torsmo + * + * Any original torsmo code is licensed under the BSD license + * + * All code written since the fork of torsmo is licensed under the GPL + * + * Please see COPYING for details + * + * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen + * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * (see AUTHORS) + * All rights reserved. + * + * 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 . + * + */ + +#ifndef _GRADIENT_H +#define _GRADIENT_H + +#include + +namespace conky { +class gradient_factory { + public: + typedef std::unique_ptr colour_array; + static const long SCALE = 512L; + static const long SCALE2 = SCALE * 2; + static const long SCALE4 = SCALE * 4; + static const long SCALE6 = SCALE * 6; + static const long SCALE60 = SCALE * 60; + static const long SCALE120 = SCALE * 120; + static const long SCALE180 = SCALE * 180; + static const long SCALE240 = SCALE * 240; + static const long SCALE300 = SCALE * 300; + static const long SCALE360 = SCALE * 360; + + public: + gradient_factory(int width, unsigned long first_colour, + unsigned long last_colour); + + colour_array create_gradient(); + + virtual void convert_from_scaled_rgb(long *const scaled, long *target) = 0; + virtual void convert_to_scaled_rgb(long *const target, long *scaled) = 0; + + protected: + void convert_from_rgb(long original, long *array); + int convert_to_rgb(long *const array); + long get_hue(long *const scaled, long chroma, long value); + long get_intermediate(long hue, long chroma); + virtual void fix_diff(long *diff) {} + + static short colour_depth; + static long mask[3]; + static short shift[3]; + + private: + int width; + unsigned long first_colour; + unsigned long last_colour; + + static bool is_set; + static void setup_colour_depth(); + static void setup_masks(); + static void setup_shifts(); +}; + +class rgb_gradient_factory : public gradient_factory { + using gradient_factory::gradient_factory; + + public: + void convert_from_scaled_rgb(long *const scaled, long *target); + void convert_to_scaled_rgb(long *const target, long *scaled); +}; + +class hsv_gradient_factory : public gradient_factory { + using gradient_factory::gradient_factory; + + public: + void fix_diff(long *diff); + void convert_from_scaled_rgb(long *const scaled, long *target); + void convert_to_scaled_rgb(long *const target, long *scaled); +}; + +class hcl_gradient_factory : public gradient_factory { + using gradient_factory::gradient_factory; + + public: + void fix_diff(long *diff); + void convert_from_scaled_rgb(long *const scaled, long *target); + void convert_to_scaled_rgb(long *const target, long *scaled); +}; +} // namespace conky + +#endif /* _GRADIENT_H */ diff --git a/src/hcl_gradient.cc b/src/hcl_gradient.cc deleted file mode 100644 index 516e4796..00000000 --- a/src/hcl_gradient.cc +++ /dev/null @@ -1,244 +0,0 @@ -/* - * - * Conky, a system monitor, based on torsmo - * - * Any original torsmo code is licensed under the BSD license - * - * All code written since the fork of torsmo is licensed under the GPL - * - * Please see COPYING for details - * - * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. - * (see AUTHORS) - * All rights reserved. - * - * 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 . - * - */ -#include "hcl_gradient.h" -#include "colours.h" -#include "conky.h" -#include "logging.h" - -#ifdef BUILD_X11 -#include "x11.h" -#endif /* BUILD_X11 */ - -#define CONST_SCALE 512L -#define CONST_SCALE_HALF (CONST_SCALE / 2) -#define CONST_SCALE2 (CONST_SCALE * 2L) -#define CONST_SCALE4 (CONST_SCALE * 4L) -#define CONST_SCALE6 (CONST_SCALE * 6L) -#define CONST_SCALE60 (CONST_SCALE * 60L) -#define CONST_SCALE120 (CONST_SCALE * 120L) -#define CONST_SCALE180 (CONST_SCALE * 180L) -#define CONST_SCALE240 (CONST_SCALE * 240L) -#define CONST_SCALE300 (CONST_SCALE * 300L) -#define CONST_SCALE360 (CONST_SCALE * 360L) - -long to_decimal_scale(long value, long max_value) { - if (value == 0) { - return 0; - } else if (value > 0) { - return (value * CONST_SCALE) / max_value; - } - return -((std::abs(value) * CONST_SCALE) / max_value); -} - -long from_decimal_scale(long value, long max_value) { - if (value == 0) { - return 0; - } else if (value > 0) { - return (value * max_value) / CONST_SCALE; - } - return -((std::abs(value) * max_value) / CONST_SCALE); -} - -long cap_scaled_color(long colour) { - if (colour < 0) { - return 0; - } else if (colour > CONST_SCALE) { - return CONST_SCALE; - } - return colour; -} - -void scaled_rgb_to_scaled_hcl(long *const rgb, long *hcl) { - long value = - rgb[0] > rgb[1] ? std::max(rgb[0], rgb[2]) : std::max(rgb[1], rgb[2]); - long minimum = - rgb[0] < rgb[1] ? std::min(rgb[0], rgb[2]) : std::min(rgb[1], rgb[2]); - long chroma = value - minimum; - long luma = (2627L * rgb[0] + 6780L * rgb[1] + 593L * rgb[2]) / - 10000L; // Use Rec.2020 color space - long hue; - - if (chroma == 0) { - hue = 0; - } else { - long diff; - long offset; - - if (rgb[0] == value) { - diff = rgb[1] - rgb[2]; - offset = 0; - } else if (rgb[1] == value) { - diff = rgb[2] - rgb[0]; - offset = CONST_SCALE2; - } else { - diff = rgb[0] - rgb[1]; - offset = CONST_SCALE4; - } - long h = (CONST_SCALE * diff) / chroma + offset; - hue = 60L * ((CONST_SCALE6 + h) % CONST_SCALE6); - } - - hcl[0] = hue; - hcl[1] = chroma * 360L; - hcl[2] = luma * 360L; -} - -void scaled_hcl_to_scaled_rgb(long *const hcl, long *rgb) { - long hue = hcl[0] % CONST_SCALE360; - long chroma = hcl[1] / 360L; - long luma = hcl[2] / 360L; - - long h = hue / 60L; - long x = (chroma * (CONST_SCALE - std::abs(h % CONST_SCALE2 - CONST_SCALE))) / - CONST_SCALE; - long m; - - // use Rec.2020 color space - if (hue < CONST_SCALE60) { - m = luma - (2627L * chroma + 6780L * x) / 10000L; - rgb[0] = rgb[1] = rgb[2] = m; - rgb[0] += chroma; - rgb[1] += x; - } else if (hue < CONST_SCALE120) { - m = luma - (2627L * x + 6780L * chroma) / 10000L; - rgb[0] = rgb[1] = rgb[2] = m; - rgb[0] += x; - rgb[1] += chroma; - } else if (hue < CONST_SCALE180) { - m = luma - (6780L * chroma + 593L * x) / 10000L; - rgb[0] = rgb[1] = rgb[2] = m; - rgb[1] += chroma; - rgb[2] += x; - } else if (hue < CONST_SCALE240) { - m = luma - (6780L * x + 593L * chroma) / 10000L; - rgb[0] = rgb[1] = rgb[2] = m; - rgb[1] += x; - rgb[2] += chroma; - } else if (hue < CONST_SCALE300) { - m = luma - (2627L * x + 593L * chroma) / 10000L; - rgb[0] = rgb[1] = rgb[2] = m; - rgb[2] += chroma; - rgb[0] += x; - } else { - m = luma - (2627L * chroma + 593L * x) / 10000L; - rgb[0] = rgb[1] = rgb[2] = m; - rgb[2] += x; - rgb[0] += chroma; - } - - rgb[0] = cap_scaled_color(rgb[0]); - rgb[1] = cap_scaled_color(rgb[1]); - rgb[2] = cap_scaled_color(rgb[2]); -} - -void rgb_to_scaled_rgb(unsigned long colour, long *scaled, int redshift, - int greenshift) { - long red = (colour & redmask) >> redshift; - long green = (colour & greenmask) >> greenshift; - long blue = colour & bluemask; - - long red_max = redmask >> redshift; - long green_max = greenmask >> greenshift; - long blue_max = bluemask; - - scaled[0] = to_decimal_scale(red, red_max); - scaled[1] = to_decimal_scale(green, green_max); - scaled[2] = to_decimal_scale(blue, blue_max); -} - -unsigned long scaled_rgb_to_rgb(long *const scaled, int redshift, - int greenshift) { - long red_max = redmask >> redshift; - long green_max = greenmask >> greenshift; - - long red = from_decimal_scale(scaled[0], red_max); - long green = from_decimal_scale(scaled[1], green_max); - long blue = from_decimal_scale(scaled[2], bluemask); - - return (red << redshift) | (green << greenshift) | blue; -} - -/* this function returns the next colour between two colours in hcl space for a - * gradient */ -std::unique_ptr do_hcl_gradient(int width, - unsigned long first_colour, - unsigned long last_colour) { - long first_colour_rgb[3]; - long last_colour_rgb[3]; - long temp_colour_rgb[3]; - - long first_colour_hcl[3]; - long final_colour_hcl[3]; - - long hueDiff, chromaDiff, lumaDiff; - - int redshift = (2 * colour_depth / 3 + colour_depth % 3); - int greenshift = (colour_depth / 3); - - // Make sure the width is always at least 2 - width = std::max(2, width); - - std::unique_ptr colours(new unsigned long[width]); - - if (colour_depth == 0) { set_up_gradient(); } - - rgb_to_scaled_rgb(first_colour, first_colour_rgb, redshift, greenshift); - rgb_to_scaled_rgb(last_colour, last_colour_rgb, redshift, greenshift); - scaled_rgb_to_scaled_hcl(first_colour_rgb, first_colour_hcl); - scaled_rgb_to_scaled_hcl(last_colour_rgb, final_colour_hcl); - - hueDiff = final_colour_hcl[0] - first_colour_hcl[0]; - chromaDiff = final_colour_hcl[1] - first_colour_hcl[1]; - lumaDiff = final_colour_hcl[2] - first_colour_hcl[2]; - - colours[0] = first_colour; - colours[width - 1] = last_colour; - - long divisor = width - 1; - long hueDelta = hueDiff / divisor; - long chromaDelta = chromaDiff / divisor; - long lumaDelta = lumaDiff / divisor; - - for (int i = 1; i < (width - 1); i++) { - long h = first_colour_hcl[0] + hueDelta; - - if (h < 0) { - first_colour_hcl[0] = CONST_SCALE360 + h; - } else { - first_colour_hcl[0] = h; - } - first_colour_hcl[1] += chromaDelta; - first_colour_hcl[2] += lumaDelta; - - scaled_hcl_to_scaled_rgb(first_colour_hcl, temp_colour_rgb); - colours[i] = scaled_rgb_to_rgb(temp_colour_rgb, redshift, greenshift); - } - - return colours; -} diff --git a/src/hcl_gradient.h b/src/hcl_gradient.h deleted file mode 100644 index e96122cf..00000000 --- a/src/hcl_gradient.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * - * Conky, a system monitor, based on torsmo - * - * Any original torsmo code is licensed under the BSD license - * - * All code written since the fork of torsmo is licensed under the GPL - * - * Please see COPYING for details - * - * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. - * (see AUTHORS) - * All rights reserved. - * - * 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 . - * - */ - -// Use Hue-Chroma-Luma to create gradients -#ifndef _HCL_GRADIENT_H -#define _HCL_GRADIENT_H - -#include - -// needed by hcl_gradient -extern short colour_depth; -extern long redmask, greenmask, bluemask; -extern void set_up_gradient(); - -std::unique_ptr do_hcl_gradient(int, unsigned long, - unsigned long); - -long to_decimal_scale(long value, long max_value); -long from_decimal_scale(long value, long max_value); -void scaled_rgb_to_scaled_hcl(long *const rgb, long *hcl); -void scaled_hcl_to_scaled_rgb(long *const hcl, long *rgb); - -#endif /* _HCL_GRADIENT_H */ diff --git a/src/main.cc b/src/main.cc index 38342cef..29537f20 100644 --- a/src/main.cc +++ b/src/main.cc @@ -179,12 +179,6 @@ static void print_version() { << _(" * Own window\n") #endif #endif /* BUILD_X11 */ -#ifdef BUILD_HCL_GRADIENT - << _(" * HCL Gradient\n") -#endif /* BUILD_HCL_GRADIENT */ -#ifdef BUILD_HSV_GRADIENT - << _(" * HSV Gradient\n") -#endif /* BUILD_HSV_GRADIENT */ #if defined BUILD_AUDACIOUS || defined BUILD_CMUS || defined BUILD_MPD || \ defined BUILD_MOC || defined BUILD_XMMS2 << _("\n Music detection:\n") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0d825a64..88c07bb2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -17,11 +17,6 @@ endif() set(test_srcs ${test_srcs} test-core.cc) set(test_srcs ${test_srcs} test-diskio.cc) set(test_srcs ${test_srcs} test-fs.cc) -if(BUILD_HCL_GRADIENT) - set(test_srcs ${test_srcs} test-hcl.cc) -elseif(BUILD_HSV_GRADIENT) - set(test_srcs ${test_srcs} test-hsv.cc) -endif(BUILD_HCL_GRADIENT) add_executable(test-conky test-common.cc ${test_srcs}) target_link_libraries(test-conky conky_core) diff --git a/tests/catch2/catch.hpp b/tests/catch2/catch.hpp index e1972c57..d2a12427 100644 --- a/tests/catch2/catch.hpp +++ b/tests/catch2/catch.hpp @@ -2,8 +2,8 @@ * Catch v2.13.9 * Generated: 2022-04-12 22:37:23.260201 * ---------------------------------------------------------- - * This file has been merged from multiple headers. Please don't edit it - * directly Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved. + * This file has been merged from multiple headers. Please don't edit it directly + * Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved. * * Distributed under the Boost Software License, Version 1.0. (See accompanying * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -12,54 +12,55 @@ #define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED // start catch.hpp + #define CATCH_VERSION_MAJOR 2 #define CATCH_VERSION_MINOR 13 #define CATCH_VERSION_PATCH 9 #ifdef __clang__ -#pragma clang system_header +# pragma clang system_header #elif defined __GNUC__ -#pragma GCC system_header +# pragma GCC system_header #endif // start catch_suppress_warnings.h #ifdef __clang__ -#ifdef __ICC // icpc defines the __clang__ macro -#pragma warning(push) -#pragma warning(disable : 161 1682) -#else // __ICC -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wpadded" -#pragma clang diagnostic ignored "-Wswitch-enum" -#pragma clang diagnostic ignored "-Wcovered-switch-default" -#endif +# ifdef __ICC // icpc defines the __clang__ macro +# pragma warning(push) +# pragma warning(disable: 161 1682) +# else // __ICC +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wpadded" +# pragma clang diagnostic ignored "-Wswitch-enum" +# pragma clang diagnostic ignored "-Wcovered-switch-default" +# endif #elif defined __GNUC__ -// Because REQUIREs trigger GCC's -Wparentheses, and because still -// supported version of g++ have only buggy support for _Pragmas, -// Wparentheses have to be suppressed globally. -#pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details + // Because REQUIREs trigger GCC's -Wparentheses, and because still + // supported version of g++ have only buggy support for _Pragmas, + // Wparentheses have to be suppressed globally. +# pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wpadded" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-variable" +# pragma GCC diagnostic ignored "-Wpadded" #endif // end catch_suppress_warnings.h #if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) -#define CATCH_IMPL -#define CATCH_CONFIG_ALL_PARTS +# define CATCH_IMPL +# define CATCH_CONFIG_ALL_PARTS #endif // In the impl file, we want to have access to all parts of the headers // Can also be used to sanely support PCHs #if defined(CATCH_CONFIG_ALL_PARTS) -#define CATCH_CONFIG_EXTERNAL_INTERFACES -#if defined(CATCH_CONFIG_DISABLE_MATCHERS) -#undef CATCH_CONFIG_DISABLE_MATCHERS -#endif -#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER) -#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER -#endif +# define CATCH_CONFIG_EXTERNAL_INTERFACES +# if defined(CATCH_CONFIG_DISABLE_MATCHERS) +# undef CATCH_CONFIG_DISABLE_MATCHERS +# endif +# if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER) +# define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER +# endif #endif #if !defined(CATCH_CONFIG_IMPL_ONLY) @@ -68,35 +69,34 @@ // See e.g.: // https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html #ifdef __APPLE__ -#include -#if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \ - (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1) -#define CATCH_PLATFORM_MAC -#elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1) -#define CATCH_PLATFORM_IPHONE -#endif +# include +# if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \ + (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1) +# define CATCH_PLATFORM_MAC +# elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1) +# define CATCH_PLATFORM_IPHONE +# endif #elif defined(linux) || defined(__linux) || defined(__linux__) -#define CATCH_PLATFORM_LINUX +# define CATCH_PLATFORM_LINUX -#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || \ - defined(_MSC_VER) || defined(__MINGW32__) -#define CATCH_PLATFORM_WINDOWS +#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__) +# define CATCH_PLATFORM_WINDOWS #endif // end catch_platform.h #ifdef CATCH_IMPL -#ifndef CLARA_CONFIG_MAIN -#define CLARA_CONFIG_MAIN_NOT_DEFINED -#define CLARA_CONFIG_MAIN -#endif +# ifndef CLARA_CONFIG_MAIN +# define CLARA_CONFIG_MAIN_NOT_DEFINED +# define CLARA_CONFIG_MAIN +# endif #endif // start catch_user_interfaces.h namespace Catch { -unsigned int rngSeed(); + unsigned int rngSeed(); } // end catch_user_interfaces.h @@ -125,33 +125,30 @@ unsigned int rngSeed(); #ifdef __cplusplus -#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) -#define CATCH_CPP14_OR_GREATER -#endif +# if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) +# define CATCH_CPP14_OR_GREATER +# endif -#if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) -#define CATCH_CPP17_OR_GREATER -#endif +# if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) +# define CATCH_CPP17_OR_GREATER +# endif #endif // Only GCC compiler should be used in this block, so other compilers trying to // mask themselves as GCC should be ignored. -#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && \ - !defined(__CUDACC__) && !defined(__LCC__) -#define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma("GCC diagnostic push") -#define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma("GCC diagnostic pop") +#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__) +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" ) +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic pop" ) -#define CATCH_INTERNAL_IGNORE_BUT_WARN(...) \ - (void)__builtin_constant_p(__VA_ARGS__) +# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) #endif #if defined(__clang__) -#define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \ - _Pragma("clang diagnostic push") -#define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma("clang diagnostic pop") +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" ) +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic pop" ) // As of this writing, IBM XL's implementation of __builtin_constant_p has a bug // which results in calls to destructors being emitted for each temporary, @@ -164,65 +161,62 @@ unsigned int rngSeed(); // ``` // // Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented. -#if !defined(__ibmxl__) && !defined(__CUDACC__) -#define CATCH_INTERNAL_IGNORE_BUT_WARN(...) \ - (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, \ - hicpp-vararg) */ -#endif +# if !defined(__ibmxl__) && !defined(__CUDACC__) +# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */ +# endif -#define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ - _Pragma("clang diagnostic ignored \"-Wexit-time-destructors\"") \ - _Pragma("clang diagnostic ignored \"-Wglobal-constructors\"") +# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \ + _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"") -#define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - _Pragma("clang diagnostic ignored \"-Wparentheses\"") +# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wparentheses\"" ) -#define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \ - _Pragma("clang diagnostic ignored \"-Wunused-variable\"") +# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" ) -#define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \ - _Pragma("clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"") +# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" ) -#define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \ - _Pragma("clang diagnostic ignored \"-Wunused-template\"") +# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wunused-template\"" ) -#endif // __clang__ +#endif // __clang__ //////////////////////////////////////////////////////////////////////////////// // Assume that non-Windows platforms support posix signals by default #if !defined(CATCH_PLATFORM_WINDOWS) -#define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS + #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS #endif //////////////////////////////////////////////////////////////////////////////// // We know some environments not to support full POSIX signals -#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || \ - defined(__DJGPP__) -#define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS +#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__) + #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS #endif #ifdef __OS400__ -#define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -#define CATCH_CONFIG_COLOUR_NONE +# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS +# define CATCH_CONFIG_COLOUR_NONE #endif //////////////////////////////////////////////////////////////////////////////// // Android somehow still does not support std::to_string #if defined(__ANDROID__) -#define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING -#define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE +# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING +# define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE #endif //////////////////////////////////////////////////////////////////////////////// // Not all Windows environments support SEH properly #if defined(__MINGW32__) -#define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH +# define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH #endif //////////////////////////////////////////////////////////////////////////////// // PS4 #if defined(__ORBIS__) -#define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE +# define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE #endif //////////////////////////////////////////////////////////////////////////////// @@ -230,20 +224,17 @@ unsigned int rngSeed(); #ifdef __CYGWIN__ // Required for some versions of Cygwin to declare gettimeofday -// see: -// http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin -#define _BSD_SOURCE -// some versions of cygwin (most) do not support std::to_string. Use the libstd -// check. -// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html -// line 2812-2813 -#if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) && \ - !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) +// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin +# define _BSD_SOURCE +// some versions of cygwin (most) do not support std::to_string. Use the libstd check. +// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813 +# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ + && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) -#define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING +# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING -#endif -#endif // __CYGWIN__ +# endif +#endif // __CYGWIN__ //////////////////////////////////////////////////////////////////////////////// // Visual C++ @@ -251,52 +242,49 @@ unsigned int rngSeed(); // Universal Windows platform does not support SEH // Or console colours (or console at all...) -#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) -#define CATCH_CONFIG_COLOUR_NONE -#else -#define CATCH_INTERNAL_CONFIG_WINDOWS_SEH -#endif +# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) +# define CATCH_CONFIG_COLOUR_NONE +# else +# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH +# endif -#if !defined(__clang__) // Handle Clang masquerading for msvc +# if !defined(__clang__) // Handle Clang masquerading for msvc // MSVC traditional preprocessor needs some workaround for __VA_ARGS__ // _MSVC_TRADITIONAL == 0 means new conformant preprocessor // _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor -#if !defined(_MSVC_TRADITIONAL) || \ - (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL) -#define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#endif // MSVC_TRADITIONAL +# if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL) +# define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR +# endif // MSVC_TRADITIONAL -// Only do this if we're not using clang on Windows, which uses `diagnostic -// push` & `diagnostic pop` -#define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma(warning(push)) -#define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION __pragma(warning(pop)) -#endif // __clang__ +// Only do this if we're not using clang on Windows, which uses `diagnostic push` & `diagnostic pop` +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) ) +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION __pragma( warning(pop) ) +# endif // __clang__ -#endif // _MSC_VER +#endif // _MSC_VER #if defined(_REENTRANT) || defined(_MSC_VER) -// Enable async processing, as -pthread is specified or no additional linking is -// required -#define CATCH_INTERNAL_CONFIG_USE_ASYNC -#endif // _MSC_VER +// Enable async processing, as -pthread is specified or no additional linking is required +# define CATCH_INTERNAL_CONFIG_USE_ASYNC +#endif // _MSC_VER //////////////////////////////////////////////////////////////////////////////// // Check if we are compiled with -fno-exceptions or equivalent #if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND) -#define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED +# define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED #endif //////////////////////////////////////////////////////////////////////////////// // DJGPP #ifdef __DJGPP__ -#define CATCH_INTERNAL_CONFIG_NO_WCHAR -#endif // __DJGPP__ +# define CATCH_INTERNAL_CONFIG_NO_WCHAR +#endif // __DJGPP__ //////////////////////////////////////////////////////////////////////////////// // Embarcadero C++Build #if defined(__BORLANDC__) -#define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN + #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN #endif //////////////////////////////////////////////////////////////////////////////// @@ -306,8 +294,8 @@ unsigned int rngSeed(); // handled by it. // Otherwise all supported compilers support COUNTER macro, // but user still might want to turn it off -#if (!defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L) -#define CATCH_INTERNAL_CONFIG_COUNTER +#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L ) + #define CATCH_INTERNAL_CONFIG_COUNTER #endif //////////////////////////////////////////////////////////////////////////////// @@ -316,9 +304,9 @@ unsigned int rngSeed(); // This means that it is detected as Windows, but does not provide // the same set of capabilities as real Windows does. #if defined(UNDER_RTSS) || defined(RTX64_BUILD) -#define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH -#define CATCH_INTERNAL_CONFIG_NO_ASYNC -#define CATCH_CONFIG_COLOUR_NONE + #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH + #define CATCH_INTERNAL_CONFIG_NO_ASYNC + #define CATCH_CONFIG_COLOUR_NONE #endif #if !defined(_GLIBCXX_USE_C99_MATH_TR1) @@ -327,173 +315,139 @@ unsigned int rngSeed(); // Various stdlib support checks that require __has_include #if defined(__has_include) -// Check if string_view is available and usable -#if __has_include() && defined(CATCH_CPP17_OR_GREATER) -#define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW + // Check if string_view is available and usable + #if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW + #endif + + // Check if optional is available and usable + # if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL + # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) + + // Check if byte is available and usable + # if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # include + # if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0) + # define CATCH_INTERNAL_CONFIG_CPP17_BYTE + # endif + # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) + + // Check if variant is available and usable + # if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # if defined(__clang__) && (__clang_major__ < 8) + // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852 + // fix should be in clang 8, workaround in libstdc++ 8.2 + # include + # if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) + # define CATCH_CONFIG_NO_CPP17_VARIANT + # else + # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT + # endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) + # else + # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT + # endif // defined(__clang__) && (__clang_major__ < 8) + # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) +#endif // defined(__has_include) + +#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER) +# define CATCH_CONFIG_COUNTER +#endif +#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH) +# define CATCH_CONFIG_WINDOWS_SEH +#endif +// This is set by default, because we assume that unix compilers are posix-signal-compatible by default. +#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS) +# define CATCH_CONFIG_POSIX_SIGNALS +#endif +// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions. +#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR) +# define CATCH_CONFIG_WCHAR #endif -// Check if optional is available and usable -#if __has_include() && defined(CATCH_CPP17_OR_GREATER) -#define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL -#endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) - -// Check if byte is available and usable -#if __has_include() && defined(CATCH_CPP17_OR_GREATER) -#include -#if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0) -#define CATCH_INTERNAL_CONFIG_CPP17_BYTE -#endif -#endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) - -// Check if variant is available and usable -#if __has_include() && defined(CATCH_CPP17_OR_GREATER) -#if defined(__clang__) && (__clang_major__ < 8) -// work around clang bug with libstdc++ -// https://bugs.llvm.org/show_bug.cgi?id=31852 fix should be in clang 8, -// workaround in libstdc++ 8.2 -#include -#if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) -#define CATCH_CONFIG_NO_CPP17_VARIANT -#else -#define CATCH_INTERNAL_CONFIG_CPP17_VARIANT -#endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && - // (_GLIBCXX_RELEASE < 9) -#else -#define CATCH_INTERNAL_CONFIG_CPP17_VARIANT -#endif // defined(__clang__) && (__clang_major__ < 8) -#endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) -#endif // defined(__has_include) - -#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && \ - !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER) -#define CATCH_CONFIG_COUNTER -#endif -#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && \ - !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && \ - !defined(CATCH_CONFIG_WINDOWS_SEH) && \ - !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH) -#define CATCH_CONFIG_WINDOWS_SEH -#endif -// This is set by default, because we assume that unix compilers are -// posix-signal-compatible by default. -#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && \ - !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && \ - !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && \ - !defined(CATCH_CONFIG_POSIX_SIGNALS) -#define CATCH_CONFIG_POSIX_SIGNALS -#endif -// This is set by default, because we assume that compilers with no wchar_t -// support are just rare exceptions. -#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && \ - !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR) -#define CATCH_CONFIG_WCHAR +#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING) +# define CATCH_CONFIG_CPP11_TO_STRING #endif -#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && \ - !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && \ - !defined(CATCH_CONFIG_CPP11_TO_STRING) -#define CATCH_CONFIG_CPP11_TO_STRING +#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL) +# define CATCH_CONFIG_CPP17_OPTIONAL #endif -#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && \ - !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && \ - !defined(CATCH_CONFIG_CPP17_OPTIONAL) -#define CATCH_CONFIG_CPP17_OPTIONAL +#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW) +# define CATCH_CONFIG_CPP17_STRING_VIEW #endif -#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && \ - !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && \ - !defined(CATCH_CONFIG_CPP17_STRING_VIEW) -#define CATCH_CONFIG_CPP17_STRING_VIEW +#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT) +# define CATCH_CONFIG_CPP17_VARIANT #endif -#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && \ - !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && \ - !defined(CATCH_CONFIG_CPP17_VARIANT) -#define CATCH_CONFIG_CPP17_VARIANT -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && \ - !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE) -#define CATCH_CONFIG_CPP17_BYTE +#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE) +# define CATCH_CONFIG_CPP17_BYTE #endif #if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT) -#define CATCH_INTERNAL_CONFIG_NEW_CAPTURE +# define CATCH_INTERNAL_CONFIG_NEW_CAPTURE #endif -#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && \ - !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && \ - !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && \ - !defined(CATCH_CONFIG_NEW_CAPTURE) -#define CATCH_CONFIG_NEW_CAPTURE +#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE) +# define CATCH_CONFIG_NEW_CAPTURE #endif -#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && \ - !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) -#define CATCH_CONFIG_DISABLE_EXCEPTIONS +#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) +# define CATCH_CONFIG_DISABLE_EXCEPTIONS #endif -#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && \ - !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && \ - !defined(CATCH_CONFIG_POLYFILL_ISNAN) -#define CATCH_CONFIG_POLYFILL_ISNAN +#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN) +# define CATCH_CONFIG_POLYFILL_ISNAN #endif -#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC) && \ - !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && \ - !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC) -#define CATCH_CONFIG_USE_ASYNC +#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC) && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC) +# define CATCH_CONFIG_USE_ASYNC #endif -#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && \ - !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && \ - !defined(CATCH_CONFIG_ANDROID_LOGWRITE) -#define CATCH_CONFIG_ANDROID_LOGWRITE +#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE) +# define CATCH_CONFIG_ANDROID_LOGWRITE #endif -#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && \ - !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && \ - !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER) -#define CATCH_CONFIG_GLOBAL_NEXTAFTER +#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER) +# define CATCH_CONFIG_GLOBAL_NEXTAFTER #endif // Even if we do not think the compiler has that warning, we still have // to provide a macro that can be used by the code. #if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION) -#define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION #endif #if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION) -#define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION #endif #if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) -#define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS +# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS #endif #if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS) -#define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS +# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS #endif #if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS) -#define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS +# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS #endif #if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS) -#define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS +# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS #endif // The goal of this macro is to avoid evaluation of the arguments, but // still have the compiler warn on problems inside... #if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN) -#define CATCH_INTERNAL_IGNORE_BUT_WARN(...) +# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) #endif -#if defined(__APPLE__) && defined(__apple_build_version__) && \ - (__clang_major__ < 10) -#undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS +#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10) +# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS #elif defined(__clang__) && (__clang_major__ < 5) -#undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS +# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS #endif #if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS) -#define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS +# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS #endif #if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) @@ -506,109 +460,103 @@ unsigned int rngSeed(); #define CATCH_CATCH_ANON(type) catch (type) #endif -#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && \ - !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && \ - !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) +#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) #define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR #endif // end catch_compiler_capabilities.h -#define INTERNAL_CATCH_UNIQUE_NAME_LINE2(name, line) name##line -#define INTERNAL_CATCH_UNIQUE_NAME_LINE(name, line) \ - INTERNAL_CATCH_UNIQUE_NAME_LINE2(name, line) +#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line +#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) #ifdef CATCH_CONFIG_COUNTER -#define INTERNAL_CATCH_UNIQUE_NAME(name) \ - INTERNAL_CATCH_UNIQUE_NAME_LINE(name, __COUNTER__) +# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ ) #else -#define INTERNAL_CATCH_UNIQUE_NAME(name) \ - INTERNAL_CATCH_UNIQUE_NAME_LINE(name, __LINE__) +# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ ) #endif -#include #include #include +#include -// We need a dummy global operator<< so we can bring it into Catch namespace -// later +// We need a dummy global operator<< so we can bring it into Catch namespace later struct Catch_global_namespace_dummy {}; std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy); namespace Catch { -struct CaseSensitive { - enum Choice { Yes, No }; -}; + struct CaseSensitive { enum Choice { + Yes, + No + }; }; -class NonCopyable { - NonCopyable(NonCopyable const&) = delete; - NonCopyable(NonCopyable&&) = delete; - NonCopyable& operator=(NonCopyable const&) = delete; - NonCopyable& operator=(NonCopyable&&) = delete; + class NonCopyable { + NonCopyable( NonCopyable const& ) = delete; + NonCopyable( NonCopyable && ) = delete; + NonCopyable& operator = ( NonCopyable const& ) = delete; + NonCopyable& operator = ( NonCopyable && ) = delete; - protected: - NonCopyable(); - virtual ~NonCopyable(); -}; + protected: + NonCopyable(); + virtual ~NonCopyable(); + }; -struct SourceLineInfo { - SourceLineInfo() = delete; - SourceLineInfo(char const* _file, std::size_t _line) noexcept - : file(_file), line(_line) {} + struct SourceLineInfo { - SourceLineInfo(SourceLineInfo const& other) = default; - SourceLineInfo& operator=(SourceLineInfo const&) = default; - SourceLineInfo(SourceLineInfo&&) noexcept = default; - SourceLineInfo& operator=(SourceLineInfo&&) noexcept = default; + SourceLineInfo() = delete; + SourceLineInfo( char const* _file, std::size_t _line ) noexcept + : file( _file ), + line( _line ) + {} - bool empty() const noexcept { return file[0] == '\0'; } - bool operator==(SourceLineInfo const& other) const noexcept; - bool operator<(SourceLineInfo const& other) const noexcept; + SourceLineInfo( SourceLineInfo const& other ) = default; + SourceLineInfo& operator = ( SourceLineInfo const& ) = default; + SourceLineInfo( SourceLineInfo&& ) noexcept = default; + SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default; - char const* file; - std::size_t line; -}; + bool empty() const noexcept { return file[0] == '\0'; } + bool operator == ( SourceLineInfo const& other ) const noexcept; + bool operator < ( SourceLineInfo const& other ) const noexcept; -std::ostream& operator<<(std::ostream& os, SourceLineInfo const& info); + char const* file; + std::size_t line; + }; -// Bring in operator<< from global namespace into Catch namespace -// This is necessary because the overload of operator<< above makes -// lookup stop at namespace Catch -using ::operator<<; + std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); -// Use this in variadic streaming macros to allow -// >> +StreamEndStop -// as well as -// >> stuff +StreamEndStop -struct StreamEndStop { - std::string operator+() const; -}; -template -T const& operator+(T const& value, StreamEndStop) { - return value; + // Bring in operator<< from global namespace into Catch namespace + // This is necessary because the overload of operator<< above makes + // lookup stop at namespace Catch + using ::operator<<; + + // Use this in variadic streaming macros to allow + // >> +StreamEndStop + // as well as + // >> stuff +StreamEndStop + struct StreamEndStop { + std::string operator+() const; + }; + template + T const& operator + ( T const& value, StreamEndStop ) { + return value; + } } -} // namespace Catch #define CATCH_INTERNAL_LINEINFO \ - ::Catch::SourceLineInfo(__FILE__, static_cast(__LINE__)) + ::Catch::SourceLineInfo( __FILE__, static_cast( __LINE__ ) ) // end catch_common.h namespace Catch { -struct RegistrarForTagAliases { - RegistrarForTagAliases(char const* alias, char const* tag, - SourceLineInfo const& lineInfo); -}; + struct RegistrarForTagAliases { + RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ); + }; -} // end namespace Catch +} // end namespace Catch -#define CATCH_REGISTER_TAG_ALIAS(alias, spec) \ - CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \ - CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ - namespace { \ - Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( \ - AutoRegisterTagAlias)(alias, spec, CATCH_INTERNAL_LINEINFO); \ - } \ - CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION +#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \ + CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \ + CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ + namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \ + CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION // end catch_tag_alias_autoregistrar.h // start catch_test_registry.h @@ -619,152 +567,143 @@ struct RegistrarForTagAliases { namespace Catch { -class TestSpec; + class TestSpec; -struct ITestInvoker { - virtual void invoke() const = 0; - virtual ~ITestInvoker(); -}; + struct ITestInvoker { + virtual void invoke () const = 0; + virtual ~ITestInvoker(); + }; -class TestCase; -struct IConfig; + class TestCase; + struct IConfig; -struct ITestCaseRegistry { - virtual ~ITestCaseRegistry(); - virtual std::vector const& getAllTests() const = 0; - virtual std::vector const& getAllTestsSorted( - IConfig const& config) const = 0; -}; + struct ITestCaseRegistry { + virtual ~ITestCaseRegistry(); + virtual std::vector const& getAllTests() const = 0; + virtual std::vector const& getAllTestsSorted( IConfig const& config ) const = 0; + }; -bool isThrowSafe(TestCase const& testCase, IConfig const& config); -bool matchTest(TestCase const& testCase, TestSpec const& testSpec, - IConfig const& config); -std::vector filterTests(std::vector const& testCases, - TestSpec const& testSpec, - IConfig const& config); -std::vector const& getAllTestCasesSorted(IConfig const& config); + bool isThrowSafe( TestCase const& testCase, IConfig const& config ); + bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ); + std::vector filterTests( std::vector const& testCases, TestSpec const& testSpec, IConfig const& config ); + std::vector const& getAllTestCasesSorted( IConfig const& config ); -} // namespace Catch +} // end catch_interfaces_testcase.h // start catch_stringref.h -#include #include -#include #include +#include +#include namespace Catch { -/// A non-owning string class (similar to the forthcoming std::string_view) -/// Note that, because a StringRef may be a substring of another string, -/// it may not be null terminated. -class StringRef { - public: - using size_type = std::size_t; - using const_iterator = const char*; + /// A non-owning string class (similar to the forthcoming std::string_view) + /// Note that, because a StringRef may be a substring of another string, + /// it may not be null terminated. + class StringRef { + public: + using size_type = std::size_t; + using const_iterator = const char*; - private: - static constexpr char const* const s_empty = ""; + private: + static constexpr char const* const s_empty = ""; - char const* m_start = s_empty; - size_type m_size = 0; + char const* m_start = s_empty; + size_type m_size = 0; - public: // construction - constexpr StringRef() noexcept = default; + public: // construction + constexpr StringRef() noexcept = default; - StringRef(char const* rawChars) noexcept; + StringRef( char const* rawChars ) noexcept; - constexpr StringRef(char const* rawChars, size_type size) noexcept - : m_start(rawChars), m_size(size) {} + constexpr StringRef( char const* rawChars, size_type size ) noexcept + : m_start( rawChars ), + m_size( size ) + {} - StringRef(std::string const& stdString) noexcept - : m_start(stdString.c_str()), m_size(stdString.size()) {} + StringRef( std::string const& stdString ) noexcept + : m_start( stdString.c_str() ), + m_size( stdString.size() ) + {} - explicit operator std::string() const { return std::string(m_start, m_size); } + explicit operator std::string() const { + return std::string(m_start, m_size); + } - public: // operators - auto operator==(StringRef const& other) const noexcept -> bool; - auto operator!=(StringRef const& other) const noexcept -> bool { - return !(*this == other); - } + public: // operators + auto operator == ( StringRef const& other ) const noexcept -> bool; + auto operator != (StringRef const& other) const noexcept -> bool { + return !(*this == other); + } - auto operator[](size_type index) const noexcept -> char { - assert(index < m_size); - return m_start[index]; - } + auto operator[] ( size_type index ) const noexcept -> char { + assert(index < m_size); + return m_start[index]; + } - public: // named queries - constexpr auto empty() const noexcept -> bool { return m_size == 0; } - constexpr auto size() const noexcept -> size_type { return m_size; } + public: // named queries + constexpr auto empty() const noexcept -> bool { + return m_size == 0; + } + constexpr auto size() const noexcept -> size_type { + return m_size; + } - // Returns the current start pointer. If the StringRef is not - // null-terminated, throws std::domain_exception - auto c_str() const -> char const*; + // Returns the current start pointer. If the StringRef is not + // null-terminated, throws std::domain_exception + auto c_str() const -> char const*; - public: // substrings and searches - // Returns a substring of [start, start + length). - // If start + length > size(), then the substring is [start, size()). - // If start > size(), then the substring is empty. - auto substr(size_type start, size_type length) const noexcept -> StringRef; + public: // substrings and searches + // Returns a substring of [start, start + length). + // If start + length > size(), then the substring is [start, size()). + // If start > size(), then the substring is empty. + auto substr( size_type start, size_type length ) const noexcept -> StringRef; - // Returns the current start pointer. May not be null-terminated. - auto data() const noexcept -> char const*; + // Returns the current start pointer. May not be null-terminated. + auto data() const noexcept -> char const*; - constexpr auto isNullTerminated() const noexcept -> bool { - return m_start[m_size] == '\0'; - } + constexpr auto isNullTerminated() const noexcept -> bool { + return m_start[m_size] == '\0'; + } - public: // iterators - constexpr const_iterator begin() const { return m_start; } - constexpr const_iterator end() const { return m_start + m_size; } -}; + public: // iterators + constexpr const_iterator begin() const { return m_start; } + constexpr const_iterator end() const { return m_start + m_size; } + }; -auto operator+=(std::string& lhs, StringRef const& sr) -> std::string&; -auto operator<<(std::ostream& os, StringRef const& sr) -> std::ostream&; + auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&; + auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&; -constexpr auto operator"" _sr(char const* rawChars, std::size_t size) noexcept - -> StringRef { - return StringRef(rawChars, size); -} -} // namespace Catch + constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { + return StringRef( rawChars, size ); + } +} // namespace Catch -constexpr auto operator"" _catch_sr(char const* rawChars, - std::size_t size) noexcept - -> Catch::StringRef { - return Catch::StringRef(rawChars, size); +constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { + return Catch::StringRef( rawChars, size ); } // end catch_stringref.h // start catch_preprocessor.hpp + #define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__ -#define CATCH_RECURSION_LEVEL1(...) \ - CATCH_RECURSION_LEVEL0( \ - CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL2(...) \ - CATCH_RECURSION_LEVEL1( \ - CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL3(...) \ - CATCH_RECURSION_LEVEL2( \ - CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL4(...) \ - CATCH_RECURSION_LEVEL3( \ - CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL5(...) \ - CATCH_RECURSION_LEVEL4( \ - CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__))) #ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR #define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__ // MSVC needs more evaluations -#define CATCH_RECURSION_LEVEL6(...) \ - CATCH_RECURSION_LEVEL5( \ - CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__))) -#define CATCH_RECURSE(...) \ - CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__)) +#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__))) +#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__)) #else -#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL5(__VA_ARGS__) +#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL5(__VA_ARGS__) #endif #define CATCH_REC_END(...) @@ -777,1111 +716,627 @@ constexpr auto operator"" _catch_sr(char const* rawChars, #define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2 #define CATCH_REC_GET_END(...) CATCH_REC_GET_END1 #define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT -#define CATCH_REC_NEXT1(test, next) CATCH_DEFER(CATCH_REC_NEXT0)(test, next, 0) -#define CATCH_REC_NEXT(test, next) CATCH_REC_NEXT1(CATCH_REC_GET_END test, next) +#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0) +#define CATCH_REC_NEXT(test, next) CATCH_REC_NEXT1(CATCH_REC_GET_END test, next) -#define CATCH_REC_LIST0(f, x, peek, ...) \ - , f(x) CATCH_DEFER(CATCH_REC_NEXT(peek, CATCH_REC_LIST1))(f, peek, \ - __VA_ARGS__) -#define CATCH_REC_LIST1(f, x, peek, ...) \ - , f(x) CATCH_DEFER(CATCH_REC_NEXT(peek, CATCH_REC_LIST0))(f, peek, \ - __VA_ARGS__) -#define CATCH_REC_LIST2(f, x, peek, ...) \ - f(x) CATCH_DEFER(CATCH_REC_NEXT(peek, CATCH_REC_LIST1))(f, peek, __VA_ARGS__) +#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST2(f, x, peek, ...) f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) \ - , f(userdata, x) CATCH_DEFER(CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD))( \ - f, userdata, peek, __VA_ARGS__) -#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) \ - , f(userdata, x) CATCH_DEFER(CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD))( \ - f, userdata, peek, __VA_ARGS__) -#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...) \ - f(userdata, x) CATCH_DEFER(CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD))( \ - f, userdata, peek, __VA_ARGS__) +#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...) f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) -// Applies the function macro `f` to each of the remaining parameters, inserts -// commas between the results, and passes userdata as the first parameter to -// each invocation, e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), -// f(x, b), f(x, c) -#define CATCH_REC_LIST_UD(f, userdata, ...) \ - CATCH_RECURSE( \ - CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) +// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results, +// and passes userdata as the first parameter to each invocation, +// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c) +#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) -#define CATCH_REC_LIST(f, ...) \ - CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) +#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) #define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param) -#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO##__VA_ARGS__ +#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__ #define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__ #define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF #define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__) #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR #define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__ -#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) \ - INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) +#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) #else -// MSVC is adding extra space and needs another indirection to expand -// INTERNAL_CATCH_NOINTERNAL_CATCH_DEF +// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF #define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__) #define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__ -#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) \ - (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1) +#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1) #endif #define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__ #define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name) -#define INTERNAL_CATCH_REMOVE_PARENS(...) \ - INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__) +#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__) #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) \ - decltype(get_wrapper()) -#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) \ - INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)) +#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper()) +#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)) #else -#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) \ - INTERNAL_CATCH_EXPAND_VARGS( \ - decltype(get_wrapper())) -#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) \ - INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2( \ - INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))) +#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper())) +#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))) #endif -#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...) \ - CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST, __VA_ARGS__) +#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\ + CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__) #define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0) -#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) \ - INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1) -#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) \ - INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2) -#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) \ - INTERNAL_CATCH_REMOVE_PARENS(_0), \ - INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3) -#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) \ - INTERNAL_CATCH_REMOVE_PARENS(_0), \ - INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4) -#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) \ - INTERNAL_CATCH_REMOVE_PARENS(_0), \ - INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5) -#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) \ - INTERNAL_CATCH_REMOVE_PARENS(_0), \ - INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6) -#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) \ - INTERNAL_CATCH_REMOVE_PARENS(_0), \ - INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7) -#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) \ - INTERNAL_CATCH_REMOVE_PARENS(_0), \ - INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8) -#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, \ - _8, _9) \ - INTERNAL_CATCH_REMOVE_PARENS(_0), \ - INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9) -#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, \ - _8, _9, _10) \ - INTERNAL_CATCH_REMOVE_PARENS(_0), \ - INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, \ - _10) +#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1) +#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2) +#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3) +#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4) +#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5) +#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6) +#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7) +#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8) +#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9) +#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10) -#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, \ - _10, N, ...) \ - N +#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N -#define INTERNAL_CATCH_TYPE_GEN \ - template \ - struct TypeList {}; \ - template \ - constexpr auto get_wrapper() noexcept->TypeList { \ - return {}; \ - } \ - template