mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-02-11 10:03:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix SPROUT_ASSERT

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-03-20 02:21:25 +09:00
parent 2cb0f08555
commit 57bcbc6cdb
1 changed files with 80 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
sprout/assert.hpp
View file

@ -36,35 +36,54 @@
#elif defined(SPROUT_ENABLE_ASSERT_HANDLER) #elif defined(SPROUT_ENABLE_ASSERT_HANDLER)
namespace sprout_adl { namespace sprout {
SPROUT_CONSTEXPR sprout::not_found_via_adl assertion_failed(...); //
// assertion_info
//
class assertion_info {
private:
char const* expr_;
char const* function_;
char const* file_;
long line_;
public:
SPROUT_CONSTEXPR assertion_info(char const* expr, char const* function, char const* file, long line)
: expr_(expr), function_(function), file_(file), line_(line)
{}
SPROUT_CONSTEXPR char const* expr() const SPROUT_NOEXCEPT {
return expr_;
}
SPROUT_CONSTEXPR char const* function() const SPROUT_NOEXCEPT {
return function_;
}
SPROUT_CONSTEXPR char const* file() const SPROUT_NOEXCEPT {
return file_;
}
SPROUT_CONSTEXPR long line() const SPROUT_NOEXCEPT {
return line_;
}
};
//
// assertion_failed
// * user defined
//
void
assertion_failed(sprout::assertion_info const&);
} // namespace sprout_adl } // namespace sprout_adl
namespace sprout_assertion_detail {
using sprout_adl::assertion_failed;
//template<typename Dummy>
inline SPROUT_CONSTEXPR bool
call_assertion_failed(bool cond, char const* formatted, char const* expr, char const* function, char const* file, long line) {
return cond ? true
: (assertion_failed(expr, function, file, line), false)
;
}
} // namespace sprout
namespace sprout { namespace sprout {
// //
// // assertion_failed
// // * user defined
// //
// void
// assertion_failed(char const* expr, char const* function, char const* file, long line);
namespace detail { namespace detail {
inline bool
assertion_failed(bool cond, char const* formatted, char const* expr, char const* function, char const* file, long line) {
return cond ? true
: ((void)sprout::assertion_failed(sprout::assertion_info(expr, function, file, line)), false)
;
}
inline SPROUT_CONSTEXPR bool inline SPROUT_CONSTEXPR bool
assertion_check(bool cond, char const* formatted, char const* expr, char const* function, char const* file, long line) { assertion_check(bool cond, char const* formatted, char const* expr, char const* function, char const* file, long line) {
return cond ? true return cond ? true
: sprout_assertion_detail::call_assertion_failed(cond, formatted, expr, function, file, line) : sprout::detail::assertion_failed(cond, formatted, expr, function, file, line)
; ;
} }
} // namespace detail } // namespace detail
@ -111,22 +130,57 @@ namespace sprout {
#elif defined(SPROUT_ENABLE_ASSERT_HANDLER) #elif defined(SPROUT_ENABLE_ASSERT_HANDLER)
namespace sprout { namespace sprout {
//
// assertion_info_msg
//
class assertion_info_msg {
private:
char const* expr_;
char const* msg_;
char const* function_;
char const* file_;
long line_;
public:
SPROUT_CONSTEXPR assertion_info_msg(char const* expr, char const* msg, char const* function, char const* file, long line)
: expr_(expr), msg_(msg), function_(function), file_(file), line_(line)
{}
SPROUT_CONSTEXPR char const* expr() const SPROUT_NOEXCEPT {
return expr_;
}
SPROUT_CONSTEXPR char const* msg() const SPROUT_NOEXCEPT {
return msg_;
}
SPROUT_CONSTEXPR char const* function() const SPROUT_NOEXCEPT {
return function_;
}
SPROUT_CONSTEXPR char const* file() const SPROUT_NOEXCEPT {
return file_;
}
SPROUT_CONSTEXPR long line() const SPROUT_NOEXCEPT {
return line_;
}
};
// //
// assertion_failed_msg // assertion_failed_msg
// * user defined // * user defined
// //
void void
assertion_failed_msg(char const* expr, char const* msg, char const* function, char const* file, long line); assertion_failed_msg(sprout::assertion_info_msg const&);
} // namespace sprout_adl
namespace sprout {
namespace detail { namespace detail {
inline bool inline bool
assertion_failed_msg(char const* formatted, char const* expr, char const* msg, char const* function, char const* file, long line) { assertion_failed_msg(bool cond, char const* formatted, char const* expr, char const* msg, char const* function, char const* file, long line) {
return sprout::assertion_failed_msg(expr, msg, function, file, line), false; return cond ? true
: ((void)sprout::assertion_failed_msg(sprout::assertion_info_msg(expr, msg, function, file, line)), false)
;
} }
inline SPROUT_CONSTEXPR bool inline SPROUT_CONSTEXPR bool
assertion_check_msg(bool cond, char const* formatted, char const* expr, char const* msg, char const* function, char const* file, long line) { assertion_check_msg(bool cond, char const* formatted, char const* expr, char const* msg, char const* function, char const* file, long line) {
return cond ? true return cond ? true
: sprout::detail::assertion_failed_msg(formatted, expr, msg, function, file, line) : sprout::detail::assertion_failed_msg(cond, formatted, expr, msg, function, file, line)
; ;
} }
} // namespace detail } // namespace detail