From 0de2797dee60088f9281fc29b168947d54ec9b80 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Tue, 22 Sep 2015 12:12:54 +0200 Subject: [PATCH] Renamed assume macros for consistency --- doc/theories.rst | 16 ++++++++-------- include/criterion/theories.h | 30 +++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/doc/theories.rst b/doc/theories.rst index f95bae0..4f07d8a 100644 --- a/doc/theories.rst +++ b/doc/theories.rst @@ -78,26 +78,26 @@ Macro Description ------------------------------------------------------- ---------------------------------------------------- ``cr_assume_float_neq(Actual, Unexpected, Epsilon)`` Assumes Actual != Expected with an error of Epsilon. ------------------------------------------------------- ---------------------------------------------------- -``cr_assume_strings_eq(Actual, Expected)`` Assumes Actual and Expected are the same string. +``cr_assume_str_eq(Actual, Expected)`` Assumes Actual and Expected are the same string. ------------------------------------------------------- ---------------------------------------------------- -``cr_assume_strings_neq(Actual, Unexpected)`` Assumes Actual and Expected are not the same string. +``cr_assume_str_neq(Actual, Unexpected)`` Assumes Actual and Expected are not the same string. ------------------------------------------------------- ---------------------------------------------------- -``cr_assume_strings_lt(Actual, Expected)`` Assumes Actual is less than Expected +``cr_assume_str_lt(Actual, Expected)`` Assumes Actual is less than Expected lexicographically. ------------------------------------------------------- ---------------------------------------------------- -``cr_assume_strings_leq(Actual, Expected)`` Assumes Actual is less or equal to Expected +``cr_assume_str_leq(Actual, Expected)`` Assumes Actual is less or equal to Expected lexicographically. ------------------------------------------------------- ---------------------------------------------------- -``cr_assume_strings_gt(Actual, Expected)`` Assumes Actual is greater than Expected +``cr_assume_str_gt(Actual, Expected)`` Assumes Actual is greater than Expected lexicographically. ------------------------------------------------------- ---------------------------------------------------- -``cr_assume_strings_geq(Actual, Expected)`` Assumes Actual is greater or equal to Expected +``cr_assume_str_geq(Actual, Expected)`` Assumes Actual is greater or equal to Expected lexicographically. ------------------------------------------------------- ---------------------------------------------------- -``cr_assume_arrays_eq(Actual, Expected, Size)`` Assumes all elements of Actual (from 0 to Size - 1) +``cr_assume_arr_eq(Actual, Expected, Size)`` Assumes all elements of Actual (from 0 to Size - 1) are equals to those of Expected. ------------------------------------------------------- ---------------------------------------------------- -``cr_assume_arrays_neq(Actual, Unexpected, Size)`` Assumes one or more elements of Actual (from 0 to +``cr_assume_arr_neq(Actual, Unexpected, Size)`` Assumes one or more elements of Actual (from 0 to Size - 1) differs from their counterpart in Expected. ======================================================= ==================================================== diff --git a/include/criterion/theories.h b/include/criterion/theories.h index 29055b5..5cdf76a 100644 --- a/include/criterion/theories.h +++ b/include/criterion/theories.h @@ -111,18 +111,18 @@ struct criterion_datapoints { cr_assume((Expected) - (Actual) > (Epsilon) \ || (Actual) - (Expected) > (Epsilon)) -# define cr_assume_strings_op_(Op, Actual, Expected) \ +# define cr_assume_str_op_(Op, Actual, Expected) \ cr_assume(strcmp((Actual), (Expected)) Op 0) -# define cr_assume_strings_eq(Actual, Expected) cr_assume_strings_op_(==, Actual, Expected) -# define cr_assume_strings_neq(Actual, Expected) cr_assume_strings_op_(!=, Actual, Expected) -# define cr_assume_strings_lt(Actual, Expected) cr_assume_strings_op_(<, Actual, Expected) -# define cr_assume_strings_leq(Actual, Expected) cr_assume_strings_op_(<=, Actual, Expected) -# define cr_assume_strings_gt(Actual, Expected) cr_assume_strings_op_(>, Actual, Expected) -# define cr_assume_strings_geq(Actual, Expected) cr_assume_strings_op_(>=, Actual, Expected) +# define cr_assume_str_eq(Actual, Expected) cr_assume_str_op_(==, Actual, Expected) +# define cr_assume_str_neq(Actual, Expected) cr_assume_str_op_(!=, Actual, Expected) +# define cr_assume_str_lt(Actual, Expected) cr_assume_str_op_(<, Actual, Expected) +# define cr_assume_str_leq(Actual, Expected) cr_assume_str_op_(<=, Actual, Expected) +# define cr_assume_str_gt(Actual, Expected) cr_assume_str_op_(>, Actual, Expected) +# define cr_assume_str_geq(Actual, Expected) cr_assume_str_op_(>=, Actual, Expected) -# define cr_assume_arrays_eq(Actual, Expected, Size) cr_assume(!memcmp((A), (B), (Size))) -# define cr_assume_arrays_neq(Actual, Expected, Size) cr_assume(memcmp((A), (B), (Size))) +# define cr_assume_arr_eq(Actual, Expected, Size) cr_assume(!memcmp((A), (B), (Size))) +# define cr_assume_arr_neq(Actual, Expected, Size) cr_assume(memcmp((A), (B), (Size))) CR_API void cr_theory_main(struct criterion_datapoints *dps, size_t datapoints, void (*fnptr)(void)); @@ -142,4 +142,16 @@ CR_API void cr_theory_main(struct criterion_datapoints *dps, size_t datapoints, CR_END_C_API +# ifndef CRITERION_NO_COMPAT +# define cr_assume_strings_eq(...) CRITERION_ASSERT_DEPRECATED_B(cr_assume_strings_eq, cr_assume_str_eq) cr_assume_str_eq(__VA_ARGS__) +# define cr_assume_strings_neq(...) CRITERION_ASSERT_DEPRECATED_B(cr_assume_strings_neq, cr_assume_str_neq) cr_assume_str_neq(__VA_ARGS__) +# define cr_assume_strings_lt(...) CRITERION_ASSERT_DEPRECATED_B(cr_assume_strings_lt, cr_assume_str_lt) cr_assume_str_lt(__VA_ARGS__) +# define cr_assume_strings_leq(...) CRITERION_ASSERT_DEPRECATED_B(cr_assume_strings_leq, cr_assume_str_leq) cr_assume_str_leq(__VA_ARGS__) +# define cr_assume_strings_gt(...) CRITERION_ASSERT_DEPRECATED_B(cr_assume_strings_gt, cr_assume_str_gt) cr_assume_str_gt(__VA_ARGS__) +# define cr_assume_strings_geq(...) CRITERION_ASSERT_DEPRECATED_B(cr_assume_strings_geq, cr_assume_str_geq) cr_assume_str_geq(__VA_ARGS__) + +# define cr_assume_arrays_eq(...) CRITERION_ASSERT_DEPRECATED_B(cr_assume_arrays_eq, cr_assume_arr_eq) cr_assume_arr_eq(__VA_ARGS__) +# define cr_assume_arrays_neq(...) CRITERION_ASSERT_DEPRECATED_B(cr_assume_arrays_neq, cr_assume_arr_neq) cr_assume_arr_neq(__VA_ARGS__) +# endif + #endif /* !CRITERION_THEORIES_H_ */