From fae9aa5d1f18a1b7913c9ca0bb0d14b1eed04209 Mon Sep 17 00:00:00 2001 From: Caio Freitas de Oliveira Date: Tue, 4 Oct 2022 20:34:37 -0300 Subject: [PATCH 01/16] use LCh color space (Rec.2020 for luma) --- src/CMakeLists.txt | 8 +- src/conky.cc | 14 +- src/hcl_gradient.cc | 240 +++++++++++++++++++++++++ src/{hsv_gradient.h => hcl_gradient.h} | 16 +- src/hsv_gradient.cc | 221 ----------------------- src/main.cc | 6 +- tests/CMakeLists.txt | 6 +- tests/{test-hsv.cc => test-hcl.cc} | 12 +- 8 files changed, 272 insertions(+), 251 deletions(-) create mode 100644 src/hcl_gradient.cc rename src/{hsv_gradient.h => hcl_gradient.h} (80%) delete mode 100644 src/hsv_gradient.cc rename tests/{test-hsv.cc => test-hcl.cc} (89%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c6b5eb8db..9087e9a63 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -304,10 +304,10 @@ if(BUILD_INTEL_BACKLIGHT) set(optional_sources ${optional_sources} ${intel_backlight}) endif(BUILD_INTEL_BACKLIGHT) -if(BUILD_HSV_GRADIENT) - set(hsv_gradient hsv_gradient.cc hsv_gradient.h) - set(optional_sources ${optional_sources} ${hsv_gradient}) -endif(BUILD_HSV_GRADIENT) +if(BUILD_HCL_GRADIENT) + set(hcl_gradient hcl_gradient.cc hcl_gradient.h) + set(optional_sources ${optional_sources} ${hcl_gradient}) +endif(BUILD_HCL_GRADIENT) if(BUILD_TESTS) # Create a library strictly for testing diff --git a/src/conky.cc b/src/conky.cc index 07551a184..442b203ed 100644 --- a/src/conky.cc +++ b/src/conky.cc @@ -133,9 +133,9 @@ #include "openbsd.h" #endif /* __OpenBSD__ */ -#ifdef BUILD_HSV_GRADIENT -#include "hsv_gradient.h" -#endif /* BUILD_HSV_GRADIENT */ +#ifdef BUILD_HCL_GRADIENT +#include "hcl_gradient.h" +#endif /* BUILD_HCL_GRADIENT */ #ifdef BUILD_OLD_CONFIG #include "convertconf.h" @@ -1294,13 +1294,13 @@ 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_HSV_GRADIENT - tmpcolour = do_hsv_gradient(w - 1, current->last_colour, +#ifdef BUILD_HCL_GRADIENT + tmpcolour = do_hcl_gradient(w - 1, current->last_colour, current->first_colour); -#else /* BUILD_HSV_GRADIENT */ +#else /* BUILD_HCL_GRADIENT */ tmpcolour = do_gradient(w - 1, current->last_colour, current->first_colour); -#endif /* BUILD_HSV_GRADIENT */ +#endif /* BUILD_HCL_GRADIENT */ } colour_idx = 0; for (i = w - 2; i > -1; i--) { diff --git a/src/hcl_gradient.cc b/src/hcl_gradient.cc new file mode 100644 index 000000000..22e986a7f --- /dev/null +++ b/src/hcl_gradient.cc @@ -0,0 +1,240 @@ +/* + * + * 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 - 1) / max_value; + } + return -((std::abs(value) * CONST_SCALE + max_value - 1) / 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_HALF) / CONST_SCALE; + } + return -((std::abs(value) * max_value + CONST_SCALE_HALF) / 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 = (2627 * rgb[0] + 6780 * rgb[1] + 593 * rgb[2]) / 10000; //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 * 360; + hcl[2] = luma * 360; +} + +void scaled_hcl_to_scaled_rgb(long *const hcl, long *rgb) { + long hue = hcl[0] % CONST_SCALE360; + long chroma = hcl[1] / 360; + long luma = hcl[2] / 360; + + 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 - (2627 * chroma + 6780 * x) / 10000; + rgb[0] = rgb[1] = rgb[2] = m; + rgb[0] += chroma; + rgb[1] += x; + } else if (hue < CONST_SCALE120) { + m = luma - (2627 * x + 6780 * chroma) / 10000; + rgb[0] = rgb[1] = rgb[2] = m; + rgb[0] += x; + rgb[1] += chroma; + } else if (hue < CONST_SCALE180) { + m = luma - (6780 * chroma + 593 * x) / 10000; + rgb[0] = rgb[1] = rgb[2] = m; + rgb[1] += chroma; + rgb[2] += x; + } else if (hue < CONST_SCALE240) { + m = luma - (6780 * x + 593 * chroma) / 10000; + rgb[0] = rgb[1] = rgb[2] = m; + rgb[1] += x; + rgb[2] += chroma; + } else if (hue < CONST_SCALE300) { + m = luma - (2627 * x + 593 * chroma) / 10000; + rgb[0] = rgb[1] = rgb[2] = m; + rgb[2] += chroma; + rgb[0] += x; + } else { + m = luma - (2627 * chroma + 593 * x) / 10000; + 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/hsv_gradient.h b/src/hcl_gradient.h similarity index 80% rename from src/hsv_gradient.h rename to src/hcl_gradient.h index 9c624538d..e96122cf4 100644 --- a/src/hsv_gradient.h +++ b/src/hcl_gradient.h @@ -26,22 +26,24 @@ * along with this program. If not, see . * */ -#ifndef _HSV_GRADIENT_H -#define _HSV_GRADIENT_H + +// Use Hue-Chroma-Luma to create gradients +#ifndef _HCL_GRADIENT_H +#define _HCL_GRADIENT_H #include -// needed by hsv_gradient +// needed by hcl_gradient extern short colour_depth; extern long redmask, greenmask, bluemask; extern void set_up_gradient(); -std::unique_ptr do_hsv_gradient(int, unsigned long, +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_hsv(long *const rgb, long *hsv); -void scaled_hsv_to_scaled_rgb(long *const hsv, long *rgb); +void scaled_rgb_to_scaled_hcl(long *const rgb, long *hcl); +void scaled_hcl_to_scaled_rgb(long *const hcl, long *rgb); -#endif /* _COLOURS_H */ +#endif /* _HCL_GRADIENT_H */ diff --git a/src/hsv_gradient.cc b/src/hsv_gradient.cc deleted file mode 100644 index 0962e0c33..000000000 --- a/src/hsv_gradient.cc +++ /dev/null @@ -1,221 +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 "hsv_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 - 1) / max_value; - } - return -((std::abs(value) * CONST_SCALE + max_value - 1) / 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_HALF) / CONST_SCALE; - } - return -((std::abs(value) * max_value + CONST_SCALE_HALF) / CONST_SCALE); -} - -void scaled_rgb_to_scaled_hsv(long *const rgb, long *hsv) { - long val = - rgb[0] > rgb[1] ? std::max(rgb[0], rgb[2]) : std::max(rgb[1], rgb[2]); - long cmin = - rgb[0] < rgb[1] ? std::min(rgb[0], rgb[2]) : std::min(rgb[1], rgb[2]); - long delta = val - cmin; - - long hue; - - if (delta == 0) { - hue = 0; - } else { - long d; - long offset; - - if (rgb[0] == val) { - d = rgb[1] - rgb[2]; - offset = 0; - } else if (rgb[1] == val) { - d = rgb[2] - rgb[0]; - offset = CONST_SCALE2; - } else { - d = rgb[0] - rgb[1]; - offset = CONST_SCALE4; - } - long h = (CONST_SCALE * d + delta / 2) / delta + offset; - hue = 60L * ((CONST_SCALE6 + h) % CONST_SCALE6); - } - - long sat; - if (val == 0) { - sat = 0; - } else { - sat = (CONST_SCALE * delta + val / 2) / val; - } - - hsv[0] = hue; - hsv[1] = sat; - hsv[2] = val; -} - -void scaled_hsv_to_scaled_rgb(long *const hsv, long *rgb) { - long c = (hsv[2] * hsv[1] + CONST_SCALE_HALF) / CONST_SCALE; - - long hue = hsv[0] % CONST_SCALE360; - long x = (c * (CONST_SCALE - - std::abs(((hue + 30L) / 60L) % CONST_SCALE2 - CONST_SCALE)) + - CONST_SCALE_HALF) / - CONST_SCALE; - long m = hsv[2] - c; - - rgb[0] = m; - rgb[1] = m; - rgb[2] = m; - - if (hue < CONST_SCALE60) { - rgb[0] += c; - rgb[1] += x; - } else if (hue < CONST_SCALE120) { - rgb[0] += x; - rgb[1] += c; - } else if (hue < CONST_SCALE180) { - rgb[1] += c; - rgb[2] += x; - } else if (hue < CONST_SCALE240) { - rgb[1] += x; - rgb[2] += c; - } else if (hue < CONST_SCALE300) { - rgb[2] += c; - rgb[0] += x; - } else { - rgb[2] += x; - rgb[0] += c; - } -} - -/* this function returns the next colour between two colours in hsv space for a - * gradient */ -std::unique_ptr do_hsv_gradient(int width, - unsigned long first_colour, - unsigned long last_colour) { - long rgb1[3], rgb2[3], rgb3[3]; - long hsv1[3], hsv2[3]; - long hueDiff, satDiff, valDiff; - - 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(); } - - rgb1[0] = to_decimal_scale((first_colour & redmask) >> redshift, - redmask >> redshift); - rgb1[1] = to_decimal_scale((first_colour & greenmask) >> greenshift, - greenmask >> greenshift); - rgb1[2] = to_decimal_scale(first_colour & bluemask, bluemask); - rgb2[0] = to_decimal_scale((last_colour & redmask) >> redshift, - redmask >> redshift); - rgb2[1] = to_decimal_scale((last_colour & greenmask) >> greenshift, - greenmask >> greenshift); - rgb2[2] = to_decimal_scale(last_colour & bluemask, bluemask); - - scaled_rgb_to_scaled_hsv(rgb1, hsv1); - scaled_rgb_to_scaled_hsv(rgb2, hsv2); - - hueDiff = hsv2[0] - hsv1[0]; - // use shortest hue path - if (hueDiff > CONST_SCALE180) { - hueDiff = hueDiff - CONST_SCALE360; - } else if (hueDiff < -CONST_SCALE180) { - hueDiff = hueDiff + CONST_SCALE360; - } - satDiff = hsv2[1] - hsv1[1]; - valDiff = hsv2[2] - hsv1[2]; - - colours[0] = first_colour; - colours[width - 1] = last_colour; - - for (int i = 1; i < (width - 1); i++) { - long k; - - long divisor = width - i; - k = (hueDiff + divisor / 2) / divisor; - hueDiff -= k; - long h = hsv1[0] + k; - if (h < 0) { - hsv1[0] = CONST_SCALE360 + h; - } else { - hsv1[0] = h; - } - - k = (satDiff + divisor / 2) / divisor; - satDiff -= k; - hsv1[1] += k; - - k = (valDiff + divisor / 2) / divisor; - valDiff -= k; - hsv1[2] += k; - - scaled_hsv_to_scaled_rgb(hsv1, rgb3); - - long red3 = from_decimal_scale(rgb3[0], bluemask); - long green3 = from_decimal_scale(rgb3[1], bluemask); - long blue3 = from_decimal_scale(rgb3[2], bluemask); - - colours[i] = (red3 << redshift) | (green3 << greenshift) | blue3; - } - - return colours; -} diff --git a/src/main.cc b/src/main.cc index 65d375aae..5f4ccc4f1 100644 --- a/src/main.cc +++ b/src/main.cc @@ -182,9 +182,9 @@ static void print_version() { << _(" * Own window\n") #endif #endif /* BUILD_X11 */ -#ifdef BUILD_HSV_GRADIENT - << _(" * HSV Gradient\n") -#endif /* BUILD_HSV_GRADIENT */ +#ifdef BUILD_HCL_GRADIENT + << _(" * HCL Gradient\n") +#endif /* BUILD_HCL_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 2db5f75af..de7f1e1fc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -17,9 +17,9 @@ 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_HSV_GRADIENT) - set(test_srcs ${test_srcs} test-hsv.cc) -endif(BUILD_HSV_GRADIENT) +if(BUILD_HCL_GRADIENT) + set(test_srcs ${test_srcs} test-hcl.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/test-hsv.cc b/tests/test-hcl.cc similarity index 89% rename from tests/test-hsv.cc rename to tests/test-hcl.cc index b46052a97..3f7b0f3bf 100644 --- a/tests/test-hsv.cc +++ b/tests/test-hcl.cc @@ -29,11 +29,11 @@ #include "catch2/catch.hpp" #include -#include +#include #include int testColor(long *rgb, int scale) { - long hsv[3]; + long hcl[3]; long rgb1[3]; long rgb2[3]; long rgb3[3]; @@ -42,8 +42,8 @@ int testColor(long *rgb, int scale) { rgb1[1] = to_decimal_scale(rgb[1], scale); rgb1[2] = to_decimal_scale(rgb[2], scale); - scaled_rgb_to_scaled_hsv(rgb1, hsv); - scaled_hsv_to_scaled_rgb(hsv, rgb2); + scaled_rgb_to_scaled_hcl(rgb1, hcl); + scaled_hcl_to_scaled_rgb(hcl, rgb2); rgb3[0] = from_decimal_scale(rgb2[0], scale); rgb3[1] = from_decimal_scale(rgb2[1], scale); @@ -52,8 +52,8 @@ int testColor(long *rgb, int scale) { return (rgb[0] != rgb3[0] || rgb[1] != rgb3[1] || rgb[2] != rgb3[2]); } -TEST_CASE("hsv gradient tests") { - SECTION("rgb -> hsv -> rgb should returns original value") { +TEST_CASE("hcl gradient tests") { + SECTION("rgb -> hcl -> rgb should returns original value") { int failedCount = 0; long rgb1[3]; From 829e2d25fd14b72954d4f1416f19ba82f6ddb1d1 Mon Sep 17 00:00:00 2001 From: Caio Freitas de Oliveira Date: Tue, 4 Oct 2022 21:08:38 -0300 Subject: [PATCH 02/16] explicit L --- src/hcl_gradient.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/hcl_gradient.cc b/src/hcl_gradient.cc index 22e986a7f..6a26cd30d 100644 --- a/src/hcl_gradient.cc +++ b/src/hcl_gradient.cc @@ -78,7 +78,7 @@ 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 = (2627 * rgb[0] + 6780 * rgb[1] + 593 * rgb[2]) / 10000; //Use Rec.2020 color space + long luma = (2627L * rgb[0] + 6780L * rgb[1] + 593L * rgb[2]) / 10000L; //Use Rec.2020 color space long hue; if (chroma == 0) { @@ -102,14 +102,14 @@ void scaled_rgb_to_scaled_hcl(long *const rgb, long *hcl) { } hcl[0] = hue; - hcl[1] = chroma * 360; - hcl[2] = luma * 360; + 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] / 360; - long luma = hcl[2] / 360; + 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; @@ -117,32 +117,32 @@ void scaled_hcl_to_scaled_rgb(long *const hcl, long *rgb) { // use Rec.2020 color space if (hue < CONST_SCALE60) { - m = luma - (2627 * chroma + 6780 * x) / 10000; + 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 - (2627 * x + 6780 * chroma) / 10000; + 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 - (6780 * chroma + 593 * x) / 10000; + 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 - (6780 * x + 593 * chroma) / 10000; + 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 - (2627 * x + 593 * chroma) / 10000; + m = luma - (2627L * x + 593L * chroma) / 10000L; rgb[0] = rgb[1] = rgb[2] = m; rgb[2] += chroma; rgb[0] += x; } else { - m = luma - (2627 * chroma + 593 * x) / 10000; + m = luma - (2627L * chroma + 593L * x) / 10000L; rgb[0] = rgb[1] = rgb[2] = m; rgb[2] += x; rgb[0] += chroma; From 6f42a8e05525f01a348163670a81b708299c65bb Mon Sep 17 00:00:00 2001 From: Caio Freitas de Oliveira Date: Tue, 4 Oct 2022 21:14:02 -0300 Subject: [PATCH 03/16] use clang-format --- src/cmus.cc | 16 +- src/common.cc | 3 +- src/core.cc | 34 +- src/hcl_gradient.cc | 28 +- src/linux.cc | 6 +- src/nvidia.cc | 3 +- src/specials.cc | 4 +- tests/catch2/catch.hpp | 27716 ++++++++++++++++++++------------------- 8 files changed, 14297 insertions(+), 13513 deletions(-) diff --git a/src/cmus.cc b/src/cmus.cc index 640c43044..1b78d2095 100644 --- a/src/cmus.cc +++ b/src/cmus.cc @@ -99,12 +99,12 @@ void cmus_cb::work() { } else if (strncmp(line, "position ", 9) == 0) { cmus.curtime = line + 9; - cmus.timeleft = - strtol(cmus.totaltime.c_str(), nullptr, 10) - - strtol(cmus.curtime.c_str(), nullptr, 10); + cmus.timeleft = strtol(cmus.totaltime.c_str(), nullptr, 10) - + strtol(cmus.curtime.c_str(), nullptr, 10); if (cmus.curtime.size() > 0) { - cmus.progress = static_cast(strtol(cmus.curtime.c_str(), nullptr, 10)) / - strtol(cmus.totaltime.c_str(), nullptr, 10); + cmus.progress = + static_cast(strtol(cmus.curtime.c_str(), nullptr, 10)) / + strtol(cmus.totaltime.c_str(), nullptr, 10); } else { cmus.progress = 0; } @@ -189,7 +189,8 @@ void print_cmus_totaltime(struct text_object *obj, char *p, lround(music_player_interval.get(*state) / active_update_interval()), 1l); const cmus_result &cmus = conky::register_cb(period)->get_result_copy(); - format_seconds_short(p, p_max_size, strtol(cmus.totaltime.c_str(), nullptr, 10)); + format_seconds_short(p, p_max_size, + strtol(cmus.totaltime.c_str(), nullptr, 10)); } void print_cmus_timeleft(struct text_object *obj, char *p, @@ -209,7 +210,8 @@ void print_cmus_curtime(struct text_object *obj, char *p, lround(music_player_interval.get(*state) / active_update_interval()), 1l); const cmus_result &cmus = conky::register_cb(period)->get_result_copy(); - format_seconds_short(p, p_max_size, strtol(cmus.curtime.c_str(), nullptr, 10)); + format_seconds_short(p, p_max_size, + strtol(cmus.curtime.c_str(), nullptr, 10)); } #undef CMUS_PRINT_GENERATOR diff --git a/src/common.cc b/src/common.cc index 8a8b3c31a..c6cf39e69 100644 --- a/src/common.cc +++ b/src/common.cc @@ -525,7 +525,8 @@ void print_cached(struct text_object *obj, char *p, unsigned int p_max_size) { p_max_size); } -void print_free_bufcache(struct text_object *obj, char *p, unsigned int p_max_size) { +void print_free_bufcache(struct text_object *obj, char *p, + unsigned int p_max_size) { human_readable(apply_base_multiplier(obj->data.s, info.free_bufcache), p, p_max_size); } diff --git a/src/core.cc b/src/core.cc index 60b8777d0..2689614f8 100644 --- a/src/core.cc +++ b/src/core.cc @@ -434,7 +434,8 @@ struct text_object *construct_text_object(char *s, const char *arg, long line, END OBJ(freq, nullptr) get_cpu_count(); if ((arg == nullptr) || strlen(arg) >= 3 || strtol(&arg[0], nullptr, 10) == 0 || - static_cast(strtol(&arg[0], nullptr, 10)) > info.cpu_count) { + static_cast(strtol(&arg[0], nullptr, 10)) > + info.cpu_count) { obj->data.i = 1; /* NORM_ERR("freq: Invalid CPU number or you don't have that many CPUs! " "Displaying the clock for CPU 1."); */ @@ -445,7 +446,8 @@ struct text_object *construct_text_object(char *s, const char *arg, long line, END OBJ(freq_g, nullptr) get_cpu_count(); if ((arg == nullptr) || strlen(arg) >= 3 || strtol(&arg[0], nullptr, 10) == 0 || - static_cast(strtol(&arg[0], nullptr, 10)) > info.cpu_count) { + static_cast(strtol(&arg[0], nullptr, 10)) > + info.cpu_count) { obj->data.i = 1; /* NORM_ERR("freq_g: Invalid CPU number or you don't have that many " "CPUs! Displaying the clock for CPU 1."); */ @@ -457,7 +459,8 @@ struct text_object *construct_text_object(char *s, const char *arg, long line, END OBJ(cpugovernor, nullptr) get_cpu_count(); if ((arg == nullptr) || strlen(arg) >= 3 || strtol(&arg[0], nullptr, 10) == 0 || - static_cast(strtol(&arg[0], nullptr, 10)) > info.cpu_count) { + static_cast(strtol(&arg[0], nullptr, 10)) > + info.cpu_count) { obj->data.i = 1; /* NORM_ERR("cpugovernor: Invalid CPU number or you don't have that " "many CPUs! Displaying the scaling governor for CPU 1."); */ @@ -484,7 +487,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line, #if defined(__linux__) END OBJ(voltage_mv, 0) get_cpu_count(); if (!arg || strlen(arg) >= 3 || strtol(&arg[0], nullptr, 10) == 0 || - (unsigned int)strtol(&arg[0], nullptr, 10) > info.cpu_count) { + (unsigned int)strtol(&arg[0], nullptr, 10) > info.cpu_count) { obj->data.i = 1; /* NORM_ERR("voltage_mv: Invalid CPU number or you don't have that many " "CPUs! Displaying voltage for CPU 1."); */ @@ -494,7 +497,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line, obj->callbacks.print = &print_voltage_mv; END OBJ(voltage_v, 0) get_cpu_count(); if (!arg || strlen(arg) >= 3 || strtol(&arg[0], nullptr, 10) == 0 || - (unsigned int)strtol(&arg[0], nullptr, 10) > info.cpu_count) { + (unsigned int)strtol(&arg[0], nullptr, 10) > info.cpu_count) { obj->data.i = 1; /* NORM_ERR("voltage_v: Invalid CPU number or you don't have that many " "CPUs! Displaying voltage for CPU 1."); */ @@ -1017,20 +1020,24 @@ struct text_object *construct_text_object(char *s, const char *arg, long line, END OBJ(fs_used, &update_fs_stats) init_fs(obj, arg); obj->callbacks.print = &print_fs_used; #ifdef BUILD_GUI - END OBJ(hr, nullptr) obj->data.l = arg != nullptr ? strtol(arg, nullptr, 10) : 1; + END OBJ(hr, nullptr) obj->data.l = + arg != nullptr ? strtol(arg, nullptr, 10) : 1; obj->callbacks.print = &new_hr; #endif /* BUILD_GUI */ END OBJ(nameserver, &update_dns_data) parse_nameserver_arg(obj, arg); obj->callbacks.print = &print_nameserver; obj->callbacks.free = &free_dns_data; - END OBJ(offset, nullptr) obj->data.l = arg != nullptr ? strtol(arg, nullptr, 10) : 1; + END OBJ(offset, nullptr) obj->data.l = + arg != nullptr ? strtol(arg, nullptr, 10) : 1; obj->callbacks.print = &new_offset; - END OBJ(voffset, nullptr) obj->data.l = arg != nullptr ? strtol(arg, nullptr, 10) : 1; + END OBJ(voffset, nullptr) obj->data.l = + arg != nullptr ? strtol(arg, nullptr, 10) : 1; obj->callbacks.print = &new_voffset; END OBJ(save_coordinates, nullptr) obj->data.l = arg != nullptr ? strtol(arg, nullptr, 10) : 0; obj->callbacks.print = &new_save_coordinates; - END OBJ_ARG(goto, nullptr, "goto needs arguments") obj->data.l = strtol(arg, nullptr, 10); + END OBJ_ARG(goto, nullptr, "goto needs arguments") obj->data.l = + strtol(arg, nullptr, 10); obj->callbacks.print = &new_goto; #ifdef BUILD_GUI END OBJ(tab, nullptr) scan_tab(obj, arg); @@ -1493,7 +1500,8 @@ struct text_object *construct_text_object(char *s, const char *arg, long line, parse_net_stat_arg(obj, arg, free_at_crash); obj->callbacks.print = &print_totalup; END OBJ(updates, nullptr) obj->callbacks.print = &print_updates; - END OBJ_IF(if_updatenr, nullptr) obj->data.i = arg != nullptr ? strtol(arg, nullptr, 10) : 0; + END OBJ_IF(if_updatenr, nullptr) obj->data.i = + arg != nullptr ? strtol(arg, nullptr, 10) : 0; if (obj->data.i == 0) { CRIT_ERR(obj, free_at_crash, "if_updatenr needs a number above 0 as argument"); @@ -1501,9 +1509,11 @@ struct text_object *construct_text_object(char *s, const char *arg, long line, set_updatereset(obj->data.i > get_updatereset() ? obj->data.i : get_updatereset()); obj->callbacks.iftest = &updatenr_iftest; - END OBJ(alignr, nullptr) obj->data.l = arg != nullptr ? strtol(arg, nullptr, 10) : 1; + END OBJ(alignr, nullptr) obj->data.l = + arg != nullptr ? strtol(arg, nullptr, 10) : 1; obj->callbacks.print = &new_alignr; - END OBJ(alignc, nullptr) obj->data.l = arg != nullptr ? strtol(arg, nullptr, 10) : 0; + END OBJ(alignc, nullptr) obj->data.l = + arg != nullptr ? strtol(arg, nullptr, 10) : 0; obj->callbacks.print = &new_alignc; END OBJ(upspeed, &update_net_stats) parse_net_stat_arg(obj, arg, free_at_crash); diff --git a/src/hcl_gradient.cc b/src/hcl_gradient.cc index 6a26cd30d..4620418fd 100644 --- a/src/hcl_gradient.cc +++ b/src/hcl_gradient.cc @@ -75,10 +75,13 @@ long cap_scaled_color(long 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 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 luma = (2627L * rgb[0] + 6780L * rgb[1] + 593L * rgb[2]) / + 10000L; // Use Rec.2020 color space long hue; if (chroma == 0) { @@ -112,7 +115,8 @@ void scaled_hcl_to_scaled_rgb(long *const hcl, long *rgb) { long luma = hcl[2] / 360L; long h = hue / 60L; - long x = (chroma * (CONST_SCALE - std::abs(h % CONST_SCALE2 - CONST_SCALE))) / CONST_SCALE; + long x = (chroma * (CONST_SCALE - std::abs(h % CONST_SCALE2 - CONST_SCALE))) / + CONST_SCALE; long m; // use Rec.2020 color space @@ -153,7 +157,8 @@ void scaled_hcl_to_scaled_rgb(long *const hcl, long *rgb) { rgb[2] = cap_scaled_color(rgb[2]); } -void rgb_to_scaled_rgb(unsigned long colour, long *scaled, int redshift, int greenshift) { +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; @@ -167,7 +172,8 @@ void rgb_to_scaled_rgb(unsigned long colour, long *scaled, int redshift, int gre scaled[2] = to_decimal_scale(blue, blue_max); } -unsigned long scaled_rgb_to_rgb(long *const scaled, int redshift, int greenshift) { +unsigned long scaled_rgb_to_rgb(long *const scaled, int redshift, + int greenshift) { long red_max = redmask >> redshift; long green_max = greenmask >> greenshift; @@ -200,9 +206,7 @@ std::unique_ptr do_hcl_gradient(int width, std::unique_ptr colours(new unsigned long[width]); - if (colour_depth == 0) { - set_up_gradient(); - } + 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); @@ -217,9 +221,9 @@ std::unique_ptr do_hcl_gradient(int width, colours[width - 1] = last_colour; long divisor = width - 1; - long hueDelta = hueDiff/divisor; - long chromaDelta = chromaDiff/divisor; - long lumaDelta = lumaDiff/divisor; + 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; diff --git a/src/linux.cc b/src/linux.cc index 19109d57a..90d09a5d5 100644 --- a/src/linux.cc +++ b/src/linux.cc @@ -192,7 +192,7 @@ int update_meminfo(void) { info.memmax = info.memdirty = info.swap = info.swapfree = info.swapmax = info.memwithbuffers = info.buffers = info.cached = info.memfree = info.memeasyfree = info.legacymem = info.shmem = info.memavail = - info.free_bufcache = 0; + info.free_bufcache = 0; if (!(meminfo_fp = open_file("/proc/meminfo", &reported))) { return 0; } @@ -1583,9 +1583,9 @@ char get_freq(char *p_client_buffer, size_t client_buffer_size, #define CPUFREQ_GOVERNOR "cpufreq/scaling_governor" -/* print the CPU scaling governor */ +/* print the CPU scaling governor */ void print_cpugovernor(struct text_object *obj, char *p, - unsigned int p_max_size) { + unsigned int p_max_size) { FILE *fp; char buf[64]; unsigned int cpu = obj->data.i; diff --git a/src/nvidia.cc b/src/nvidia.cc index 7ddd92868..3d8fb68ee 100644 --- a/src/nvidia.cc +++ b/src/nvidia.cc @@ -1032,8 +1032,7 @@ void print_nvidia_value(struct text_object *obj, char *p, if (value != -1) { if (nvs->is_percentage) { percent_print(p, p_max_size, value); - } - else { + } else { snprintf(p, p_max_size, "%d", value); } } else if (str != nullptr) { diff --git a/src/specials.cc b/src/specials.cc index 93e423c0c..047403480 100644 --- a/src/specials.cc +++ b/src/specials.cc @@ -419,7 +419,7 @@ void new_gauge(struct text_object *obj, char *p, unsigned int p_max_size, if (out_to_stdout.get(*state)) { new_gauge_in_shell(obj, p, p_max_size, usage); } -#else /* BUILD_GUI */ +#else /* BUILD_GUI */ new_gauge_in_shell(obj, p, p_max_size, usage); #endif /* BUILD_GUI */ } @@ -728,7 +728,7 @@ void new_bar(struct text_object *obj, char *p, unsigned int p_max_size, if (out_to_stdout.get(*state)) { new_bar_in_shell(obj, p, p_max_size, usage); } -#else /* BUILD_GUI */ +#else /* BUILD_GUI */ new_bar_in_shell(obj, p, p_max_size, usage); #endif /* BUILD_GUI */ } diff --git a/tests/catch2/catch.hpp b/tests/catch2/catch.hpp index d2a12427b..e1972c576 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,55 +12,54 @@ #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 - -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wunused-variable" -# pragma GCC diagnostic ignored "-Wpadded" +// 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" #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) @@ -69,34 +68,35 @@ // 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,30 +125,33 @@ namespace Catch { #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, @@ -161,62 +164,65 @@ namespace Catch { // ``` // // 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 //////////////////////////////////////////////////////////////////////////////// @@ -224,17 +230,20 @@ namespace Catch { #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)) - -# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING +// 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 -# endif -#endif // __CYGWIN__ +#endif +#endif // __CYGWIN__ //////////////////////////////////////////////////////////////////////////////// // Visual C++ @@ -242,49 +251,52 @@ namespace Catch { // 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 //////////////////////////////////////////////////////////////////////////////// @@ -294,8 +306,8 @@ namespace Catch { // 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 //////////////////////////////////////////////////////////////////////////////// @@ -304,9 +316,9 @@ namespace Catch { // 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) @@ -315,139 +327,173 @@ namespace Catch { // 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 - #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 +// 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 +#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 +// 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 +// 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 -#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_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_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL) -# define CATCH_CONFIG_CPP17_OPTIONAL +#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_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_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_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT) -# define CATCH_CONFIG_CPP17_VARIANT +#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) @@ -460,103 +506,109 @@ namespace Catch { #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 - }; }; - - class NonCopyable { - NonCopyable( NonCopyable const& ) = delete; - NonCopyable( NonCopyable && ) = delete; - NonCopyable& operator = ( NonCopyable const& ) = delete; - NonCopyable& operator = ( NonCopyable && ) = delete; +struct CaseSensitive { + enum Choice { Yes, No }; +}; - protected: - NonCopyable(); - virtual ~NonCopyable(); - }; +class NonCopyable { + NonCopyable(NonCopyable const&) = delete; + NonCopyable(NonCopyable&&) = delete; + NonCopyable& operator=(NonCopyable const&) = delete; + NonCopyable& operator=(NonCopyable&&) = delete; - struct SourceLineInfo { + protected: + NonCopyable(); + virtual ~NonCopyable(); +}; - SourceLineInfo() = delete; - SourceLineInfo( char const* _file, std::size_t _line ) noexcept - : file( _file ), - line( _line ) - {} +struct SourceLineInfo { + SourceLineInfo() = delete; + SourceLineInfo(char const* _file, std::size_t _line) noexcept + : file(_file), line(_line) {} - SourceLineInfo( SourceLineInfo const& other ) = default; - SourceLineInfo& operator = ( SourceLineInfo const& ) = default; - SourceLineInfo( SourceLineInfo&& ) noexcept = default; - SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default; + SourceLineInfo(SourceLineInfo const& other) = default; + SourceLineInfo& operator=(SourceLineInfo const&) = default; + SourceLineInfo(SourceLineInfo&&) noexcept = default; + SourceLineInfo& operator=(SourceLineInfo&&) noexcept = default; - bool empty() const noexcept { return file[0] == '\0'; } - bool operator == ( SourceLineInfo const& other ) const noexcept; - bool operator < ( SourceLineInfo const& other ) const noexcept; + bool empty() const noexcept { return file[0] == '\0'; } + bool operator==(SourceLineInfo const& other) const noexcept; + bool operator<(SourceLineInfo const& other) const noexcept; - char const* file; - std::size_t line; - }; + char const* file; + std::size_t line; +}; - std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); +std::ostream& operator<<(std::ostream& os, SourceLineInfo const& info); - // 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<<; +// 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; - } +// 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 @@ -567,143 +619,152 @@ namespace Catch { 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(...) @@ -716,627 +777,1111 @@ constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) n #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_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__ ) - -// 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_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_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)) + +#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_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 class...> struct TemplateTypeList{};\ - template class...Cs>\ - constexpr auto get_wrapper() noexcept -> TemplateTypeList { return {}; }\ - template\ - struct append;\ - template\ - struct rewrap;\ - template class, typename...>\ - struct create;\ - template class, typename>\ - struct convert;\ - \ - template \ - struct append { using type = T; };\ - template< template class L1, typename...E1, template class L2, typename...E2, typename...Rest>\ - struct append, L2, Rest...> { using type = typename append, Rest...>::type; };\ - template< template class L1, typename...E1, typename...Rest>\ - struct append, TypeList, Rest...> { using type = L1; };\ - \ - template< template class Container, template class List, typename...elems>\ - struct rewrap, List> { using type = TypeList>; };\ - template< template class Container, template class List, class...Elems, typename...Elements>\ - struct rewrap, List, Elements...> { using type = typename append>, typename rewrap, Elements...>::type>::type; };\ - \ - template