r277:7abfb55f1ecc
Mon, 22 Sep 2008 10:56:01
[Not Reviewed]
0 comments (0 inline)
0
2
0
17
56
| ... | ... |
@@ -29,4 +29,5 @@ |
| 29 | 29 |
|
| 30 |
inline void assert_fail_log(const char *file, int line, const char *function, |
|
| 31 |
const char *message, const char *assertion) |
|
| 30 |
inline void assert_fail_abort(const char *file, int line, |
|
| 31 |
const char *function, const char* message, |
|
| 32 |
const char *assertion) |
|
| 32 | 33 |
{
|
| ... | ... |
@@ -39,9 +40,2 @@ |
| 39 | 40 |
std::cerr << std::endl; |
| 40 |
} |
|
| 41 |
|
|
| 42 |
inline void assert_fail_abort(const char *file, int line, |
|
| 43 |
const char *function, const char* message, |
|
| 44 |
const char *assertion) |
|
| 45 |
{
|
|
| 46 |
assert_fail_log(file, line, function, message, assertion); |
|
| 47 | 41 |
std::abort(); |
| ... | ... |
@@ -65,7 +59,5 @@ |
| 65 | 59 |
#undef LEMON_ASSERT |
| 66 |
#undef LEMON_FIXME |
|
| 67 | 60 |
#undef LEMON_DEBUG |
| 68 | 61 |
|
| 69 |
#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) + \ |
|
| 70 |
(defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \ |
|
| 62 |
#if (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \ |
|
| 71 | 63 |
(defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) > 1 |
| ... | ... |
@@ -74,4 +66,3 @@ |
| 74 | 66 |
|
| 75 |
#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) + \ |
|
| 76 |
(defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \ |
|
| 67 |
#if ((defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \ |
|
| 77 | 68 |
(defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 || \ |
| ... | ... |
@@ -84,6 +75,3 @@ |
| 84 | 75 |
|
| 85 |
#if defined LEMON_ASSERT_LOG |
|
| 86 |
# undef LEMON_ASSERT_HANDLER |
|
| 87 |
# define LEMON_ASSERT_HANDLER ::lemon::assert_fail_log |
|
| 88 |
#elif defined LEMON_ASSERT_ABORT |
|
| 76 |
#if defined LEMON_ASSERT_ABORT |
|
| 89 | 77 |
# undef LEMON_ASSERT_HANDLER |
| ... | ... |
@@ -122,8 +110,8 @@ |
| 122 | 110 |
/// |
| 123 |
/// Macro for assertion with customizable message. \param exp An |
|
| 124 |
/// expression that must be convertible to \c bool. If it is \c |
|
| 125 |
/// false, then an assertion is raised. The concrete behaviour depends |
|
| 126 |
/// on the settings of the assertion system. \param msg A <tt>const |
|
| 127 |
/// char*</tt> parameter, which can be used to provide information |
|
| 128 |
/// about the circumstances of the failed assertion. |
|
| 111 |
/// Macro for assertion with customizable message. |
|
| 112 |
/// \param exp An expression that must be convertible to \c bool. If it is \c |
|
| 113 |
/// false, then an assertion is raised. The concrete behaviour depends on the |
|
| 114 |
/// settings of the assertion system. |
|
| 115 |
/// \param msg A <tt>const char*</tt> parameter, which can be used to provide |
|
| 116 |
/// information about the circumstances of the failed assertion. |
|
| 129 | 117 |
/// |
| ... | ... |
@@ -141,13 +129,8 @@ |
| 141 | 129 |
/// |
| 142 |
/// The LEMON assertion system has a wide range of customization |
|
| 143 |
/// properties. As a default behaviour the failed assertion prints a |
|
| 144 |
/// short log message to |
|
| 130 |
/// As a default behaviour the failed assertion prints a short log message to |
|
| 131 |
/// the standard error and aborts the execution. |
|
| 145 | 132 |
/// |
| 146 |
/// The following modes can be used in the assertion system: |
|
| 147 |
/// |
|
| 148 |
/// - \c LEMON_ASSERT_LOG The failed assertion prints a short log |
|
| 149 |
/// message to the standard error and continues the execution. |
|
| 150 |
/// - \c LEMON_ASSERT_ABORT This mode is similar to the \c |
|
| 151 |
/// LEMON_ASSERT_LOG, but it aborts the program. It is the default |
|
| 152 |
/// |
|
| 133 |
/// However, the following modes can be used in the assertion system: |
|
| 134 |
/// - \c LEMON_ASSERT_ABORT The failed assertion prints a short log message to |
|
| 135 |
/// the standard error and aborts the program. It is the default behaviour. |
|
| 153 | 136 |
/// - \c LEMON_ASSERT_CUSTOM The user can define own assertion handler |
| ... | ... |
@@ -179,18 +162,2 @@ |
| 179 | 162 |
/// |
| 180 |
/// \brief Macro for mark not yet implemented features. |
|
| 181 |
/// |
|
| 182 |
/// Macro for mark not yet implemented features and outstanding bugs. |
|
| 183 |
/// It is close to be the shortcut of the following code: |
|
| 184 |
/// \code |
|
| 185 |
/// LEMON_ASSERT(false, msg); |
|
| 186 |
/// \endcode |
|
| 187 |
/// |
|
| 188 |
/// \see LEMON_ASSERT |
|
| 189 |
# define LEMON_FIXME(msg) \ |
|
| 190 |
(LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \ |
|
| 191 |
::lemon::_assert_bits::cstringify(msg), \ |
|
| 192 |
static_cast<const char*>(0))) |
|
| 193 |
|
|
| 194 |
/// \ingroup exceptions |
|
| 195 |
/// |
|
| 196 | 163 |
/// \brief Macro for internal assertions |
| ... | ... |
@@ -226,3 +193,2 @@ |
| 226 | 193 |
# define LEMON_ASSERT(exp, msg) (static_cast<void>(0)) |
| 227 |
# define LEMON_FIXME(msg) (static_cast<void>(0)) |
|
| 228 | 194 |
# define LEMON_DEBUG(exp, msg) (static_cast<void>(0)) |
| ... | ... |
@@ -235,7 +201,2 @@ |
| 235 | 201 |
#exp), 0))) |
| 236 |
# define LEMON_FIXME(msg) \ |
|
| 237 |
(LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \ |
|
| 238 |
::lemon::_assert_bits::cstringify(msg), \ |
|
| 239 |
static_cast<const char*>(0))) |
|
| 240 |
|
|
| 241 | 202 |
# if LEMON_ENABLE_DEBUG |
| ... | ... |
@@ -49,6 +49,2 @@ |
| 49 | 49 |
|
| 50 |
void fixme_disable() {
|
|
| 51 |
LEMON_FIXME("fixme_disable() is fixme!");
|
|
| 52 |
} |
|
| 53 |
|
|
| 54 | 50 |
void check_assertion_disable() {
|
| ... | ... |
@@ -56,3 +52,2 @@ |
| 56 | 52 |
assertion_text_disable(); |
| 57 |
fixme_disable(); |
|
| 58 | 53 |
} |
| ... | ... |
@@ -80,6 +75,2 @@ |
| 80 | 75 |
|
| 81 |
void fixme_custom() {
|
|
| 82 |
LEMON_FIXME("fixme_custom() is fixme!");
|
|
| 83 |
} |
|
| 84 |
|
|
| 85 | 76 |
void check_assertion_custom() {
|
| ... | ... |
@@ -87,4 +78,3 @@ |
| 87 | 78 |
assertion_text_custom(); |
| 88 |
fixme_custom(); |
|
| 89 |
check(cnt == 2, "The custom assert handler does not work"); |
|
| 79 |
check(cnt == 1, "The custom assert handler does not work"); |
|
| 90 | 80 |
} |
0 comments (0 inline)