espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-25 10:13:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Finish clean up of float support options

Browse Source
This commit is contained in:
jsalling
2016-12-29 23:52:03 -06:00
parent e92f2c2762
commit 4c78cde202
2 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/unity.c
View File

@ -686,6 +686,7 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
} }
/*-----------------------------------------------*/ /*-----------------------------------------------*/
#ifndef UNITY_EXCLUDE_FLOAT
/* Wrap this define in a function with variable types as float or double */ /* Wrap this define in a function with variable types as float or double */
#define UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff) \ #define UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff) \
if (isinf(expected) && isinf(actual) && (isneg(expected) == isneg(actual))) return 1; \ if (isinf(expected) && isinf(actual) && (isneg(expected) == isneg(actual))) return 1; \
@ -714,7 +715,6 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
UnityPrint(UnityStrDelta) UnityPrint(UnityStrDelta)
#endif /* UNITY_EXCLUDE_FLOAT_PRINT */ #endif /* UNITY_EXCLUDE_FLOAT_PRINT */
#ifndef UNITY_EXCLUDE_FLOAT
static int UnityFloatsWithin(UNITY_FLOAT delta, UNITY_FLOAT expected, UNITY_FLOAT actual) static int UnityFloatsWithin(UNITY_FLOAT delta, UNITY_FLOAT expected, UNITY_FLOAT actual)
{ {
UNITY_FLOAT diff; UNITY_FLOAT diff;

41
src/unity_internals.h
View File

@ -168,16 +168,15 @@
#ifdef UNITY_EXCLUDE_FLOAT #ifdef UNITY_EXCLUDE_FLOAT
/* No Floating Point Support */ /* No Floating Point Support */
#undef UNITY_INCLUDE_FLOAT #ifndef UNITY_EXCLUDE_DOUBLE
#undef UNITY_FLOAT_PRECISION #define UNITY_EXCLUDE_DOUBLE /* Remove double when excluding float support */
#undef UNITY_FLOAT_TYPE #endif
#ifndef UNITY_EXCLUDE_FLOAT_PRINT
#define UNITY_EXCLUDE_FLOAT_PRINT
#endif
#else #else
#ifndef UNITY_INCLUDE_FLOAT
#define UNITY_INCLUDE_FLOAT
#endif
/* Floating Point Support */ /* Floating Point Support */
#ifndef UNITY_FLOAT_PRECISION #ifndef UNITY_FLOAT_PRECISION
#define UNITY_FLOAT_PRECISION (0.00001f) #define UNITY_FLOAT_PRECISION (0.00001f)
@ -212,30 +211,20 @@ typedef UNITY_FLOAT_TYPE UNITY_FLOAT;
* Double Float Support * Double Float Support
*-------------------------------------------------------*/ *-------------------------------------------------------*/
/* unlike FLOAT, we DON'T include by default */ /* unlike float, we DON'T include by default */
#ifndef UNITY_EXCLUDE_DOUBLE #if defined(UNITY_EXCLUDE_DOUBLE) || !defined(UNITY_INCLUDE_DOUBLE)
#ifndef UNITY_INCLUDE_DOUBLE
#define UNITY_EXCLUDE_DOUBLE
#endif
#endif
#ifdef UNITY_EXCLUDE_DOUBLE
/* No Floating Point Support */ /* No Floating Point Support */
#undef UNITY_DOUBLE_PRECISION #ifndef UNITY_EXCLUDE_DOUBLE
#undef UNITY_DOUBLE_TYPE #define UNITY_EXCLUDE_DOUBLE
#else
#ifdef UNITY_INCLUDE_DOUBLE
#undef UNITY_INCLUDE_DOUBLE #undef UNITY_INCLUDE_DOUBLE
#endif #endif
#ifdef UNITY_EXCLUDE_FLOAT #ifndef UNITY_EXCLUDE_FLOAT
#undef UNITY_EXCLUDE_FLOAT_PRINT #ifndef UNITY_DOUBLE_TYPE
#define UNITY_EXCLUDE_FLOAT_PRINT #define UNITY_DOUBLE_TYPE double
#else #endif
#ifndef UNITY_DOUBLE_TYPE
#define UNITY_DOUBLE_TYPE double
#endif
typedef UNITY_FLOAT UNITY_DOUBLE; typedef UNITY_FLOAT UNITY_DOUBLE;
/* For parameter in UnityPrintFloat(UNITY_DOUBLE), which aliases to double or float */ /* For parameter in UnityPrintFloat(UNITY_DOUBLE), which aliases to double or float */
#endif #endif