townforge/contract
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed ..._failed to ..._fail

Browse Source
This commit is contained in:
Lorenzo Caminiti 2015-12-16 21:30:22 -08:00
parent ea5c6acd95
commit d1e1765cdb
65 changed files with 243 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/contract.hpp
View File

@ -16,8 +16,6 @@
#include <boost/contract/call_if.hpp>
#include <boost/contract/config.hpp>
// TODO: Consider renaming all/most *.i to *.hpp.
// TODO: Should C++11 move preserve class invariants at exit and/or on throw? Maybe not because after move no other public member can be called (but dtor can... so dtor should not check inv at that time...). If so, users could use an internal moved_ data member to guard class invariant checking and set that after the move operation... How can I program C++11 move operations with this lib? Should I used boost::contract::function instead of public_function? (But probably not because that does not subcontract and does not check inv at entry...)
// TODO: What shall I do with unions? Can/shall I contract them? Double check which members C++11 unions can have (ctor, dtor, etc?).

4
include/boost/contract/aux_/condition/check_base.hpp
View File

@ -65,7 +65,7 @@ protected:
// Subcontracted pre must throw on failure (instead of
// calling failure handler) so to be checked in logic-or.
if(throw_on_failure) throw;
fail(&boost::contract::precondition_failed);
fail(&boost::contract::precondition_failure);
}
return true;
}
@ -74,7 +74,7 @@ protected:
if(failed()) return;
// TODO: Document that when old copies throw, using .old() calls post failure handler (more correct), while using = OLDOF makes enclosing user function throw (less correct). Plus of course using .old() makes old copies after inv and pre are checked, while using = OLDOF makes old copies before inv and pre checking (this is less correct in theory, but it should not really matter in most practical cases unless the old copy are programmed assuming inv and pre are satisfied).
try { if(old_) old_(); }
catch(...) { fail(&boost::contract::postcondition_failed); }
catch(...) { fail(&boost::contract::postcondition_failure); }
}
void fail(void (*h)(boost::contract::from)) {

4
include/boost/contract/aux_/condition/check_pre_post.hpp
View File

@ -40,7 +40,7 @@ protected:
if(BOOST_CONTRACT_ERROR_postcondition_result_parameter_required) {
BOOST_CONTRACT_ERROR_postcondition_result_parameter_required(r);
}
} catch(...) { fail(&boost::contract::postcondition_failed); }
} catch(...) { fail(&boost::contract::postcondition_failure); }
}
private:
@ -65,7 +65,7 @@ protected:
if(BOOST_CONTRACT_ERROR_postcondition_result_parameter_not_allowed){
BOOST_CONTRACT_ERROR_postcondition_result_parameter_not_allowed();
}
} catch(...) { fail(&boost::contract::postcondition_failed); }
} catch(...) { fail(&boost::contract::postcondition_failure); }
}
private:

6
include/boost/contract/aux_/condition/check_pre_post_inv.hpp
View File

@ -98,8 +98,8 @@ private:
check_const_inv<C>();
}
} catch(...) {
if(on_entry) this->fail(&boost::contract::entry_invariant_failed);
else this->fail(&boost::contract::exit_invariant_failed);
if(on_entry) this->fail(&boost::contract::entry_invariant_failure);
else this->fail(&boost::contract::exit_invariant_failure);
}
}
@ -175,7 +175,7 @@ private:
}
private:
struct signal_equal {}; // Exception to stop for_each as soon as found.
class signal_equal {}; // Exception to stop for_each as soon as found.
struct compare_func_addr {
template<typename B>

14
include/boost/contract/aux_/condition/check_subcontracted_pre_post_inv.hpp
View File

@ -44,8 +44,8 @@ namespace boost { namespace contract { namespace aux {
namespace check_subcontracted_pre_post_inv_ {
// Exception signals (must not inherit).
struct signal_no_error {};
struct signal_not_checked {};
class signal_no_error {};
class signal_not_checked {};
}
// O, R, F, and A-i can be none types (but C cannot).
@ -152,7 +152,7 @@ protected:
exec_or(
boost::contract::virtual_::check_pre,
&check_subcontracted_pre_post_inv::check_pre,
&boost::contract::precondition_failed
&boost::contract::precondition_failure
);
}
@ -219,7 +219,7 @@ private:
throw boost::contract::bad_virtual_result_cast(
v_->result_type_name_, typeid(r_type).name());
} catch(...) {
this->fail(&boost::contract::postcondition_failed);
this->fail(&boost::contract::postcondition_failure);
}
}
}
@ -231,7 +231,7 @@ private:
throw boost::contract::bad_virtual_result_cast(
v_->result_type_name_, typeid(r_type).name());
} catch(...) {
this->fail(&boost::contract::postcondition_failed);
this->fail(&boost::contract::postcondition_failure);
}
}
}
@ -249,7 +249,7 @@ private:
this->check_post(*r);
}
void exec_and(
void exec_and( // Execute action in short-circuit logic-and with bases.
boost::contract::virtual_::action_enum a,
void (check_subcontracted_pre_post_inv::* f)() = 0
) {
@ -266,7 +266,7 @@ private:
}
}
void exec_or(
void exec_or( // Execute action in short-circuit logic-or with bases.
boost::contract::virtual_::action_enum a,
bool (check_subcontracted_pre_post_inv::* f)(bool) = 0,
void (*h)(boost::contract::from) = 0

7
include/boost/contract/aux_/none.hpp
View File

@ -4,11 +4,10 @@
namespace boost { namespace contract { namespace aux {
struct none { // Tag for "no type".
// Empty so trivially constructible, copyable, cannot used by mistake, etc.
};
// Tag for "no type".
class none {}; // Empty so trivial ctor, copy, etc. but cannot use by mistake.
// Transform `void` to `none` type.
// Transform `void` to `none` type (for convenience, instead of using MPL).
template<typename T> struct none_if_void { typedef T type; };
template<> struct none_if_void<void> { typedef none type; };

4
include/boost/contract/aux_/type_traits/introspection.hpp
View File

@ -95,10 +95,10 @@
namespace boost { namespace contract { namespace aux { namespace introspection {
typedef struct {} yes;
typedef class {} yes;
typedef yes no[2];
template<typename F, F> struct check_function;
template<typename F, F> class check_function;
} } } } // namespace

16
include/boost/contract/call_if.hpp
View File

@ -28,24 +28,26 @@
namespace boost { namespace contract {
template<bool Cond, typename Then, typename R = boost::contract::aux::none>
struct call_if_statement {}; // Empty so cannot be used (but copyable).
class call_if_statement {}; // Empty so cannot be used (but copyable).
// Dispatch true condition (then) between non-void and void calls.
// IMPORTANT: result_of<Then()> can be evaluated only when condition is already
// checked to be true (as Then() is required to be valid only in that case) so
// this extra level of dispatching is necessary to avoid compiler errors.
template<typename Then>
struct call_if_statement<true, Then, boost::contract::aux::none> :
call_if_statement<true, Then, // Copyable (as its base).
class call_if_statement<true, Then, boost::contract::aux::none> :
public call_if_statement<true, Then, // Copyable (as its base).
BOOST_CONTRACT_CALL_IF_ENABLE_IF_UNARY_RESULT_OF_(Then)>
{
public:
explicit call_if_statement(Then f) : call_if_statement<true, Then,
BOOST_CONTRACT_CALL_IF_ENABLE_IF_UNARY_RESULT_OF_(Then)>(f) {}
};
// True condition (then) for non-void call.
template<typename Then, typename R>
struct call_if_statement<true, Then, R> { // Copyable (as *).
class call_if_statement<true, Then, R> { // Copyable (as *).
public:
explicit call_if_statement(Then f) : r_(boost::make_shared<R>(f())) {}
operator R() const { return *r_; }
@ -69,7 +71,8 @@ private:
// True condition (then) for void call.
template<typename Then>
struct call_if_statement<true, Then, void> { // Copyable (no data).
class call_if_statement<true, Then, void> { // Copyable (no data).
public:
explicit call_if_statement(Then f) { f(); }
// Cannot provide `operator R()` here, because R is void.
@ -90,7 +93,8 @@ struct call_if_statement<true, Then, void> { // Copyable (no data).
// False condition (else) for both non-void and void calls.
template<typename Then> // Copyable (no data).
struct call_if_statement<false, Then, boost::contract::aux::none> {
class call_if_statement<false, Then, boost::contract::aux::none> {
public:
explicit call_if_statement(Then const&) {}
// Do not provide `operator result_type()` here, require else_ instead.

7
include/boost/contract/constructor.hpp
View File

@ -16,17 +16,16 @@ set_old_postcondition<> constructor(C* obj) {
new boost::contract::aux::constructor<C>(obj));
}
// TODO: Decl all classes (but TMP) using class and not struct (for easier/consistent fwd decl...).
// Uses C tparam to avoid multiple inheritance from same type.
template<class C>
struct constructor_precondition { // Copyable (no data).
class constructor_precondition { // Copyable (no data).
public:
constructor_precondition() {} // For user ctor overloads with no pre.
template<typename F>
explicit constructor_precondition(F const& f) {
try { f(); }
catch(...) { precondition_failed(from_constructor); }
catch(...) { precondition_failure(from_constructor); }
}
// Default copy operations (so user's derived classes can also be copyable).

61
include/boost/contract/core/config.hpp
View File

@ -8,18 +8,6 @@
// TODO: Add a config macro PRECONDITIONS_DISABLE_NOTHING to avoid disabling contract assertions within assertions checking for preconditions (to avoid passing unchecked arguments to function body...). This is what N1962 does... but this macro should be #undef by default.
#ifndef BOOST_CONTRACT_CONFIG_NO_PRECONDITIONS
# define BOOST_CONTRACT_CONFIG_NO_PRECONDITIONS 0
#endif
#ifndef BOOST_CONTRACT_CONFIG_NO_POSTCONDITIONS
# define BOOST_CONTRACT_CONFIG_NO_POSTCONDITIONS 0
#endif
#ifndef BOOST_CONTRACT_CONFIG_NO_INVARIANTS
# define BOOST_CONTRACT_CONFIG_NO_INVARIANTS 0
#endif
#ifndef BOOST_CONTRACT_CONFIG_BASE_TYPES
# define BOOST_CONTRACT_CONFIG_BASE_TYPES base_types
#endif
@ -34,7 +22,7 @@
# define BOOST_CONTRACT_CONFIG_STATIC_INVARIANT static_invariant
#endif
// BOOST_CONTRACT_CONFIG_PERMISSING (#undef by default).
// BOOST_CONTRACT_CONFIG_PERMISSIVE (#undef by default).
// Type of exception to throw is `guard c = ...` is missing. This is a
// programming error so by default this library calls abort. If this macro is
@ -50,8 +38,53 @@
// However, this macro can be defined to throw an exception, call a function,
// a no-op, or any other user code in case users truly need to handle missing
// contract guard logic errors without terminating the program, for example:
// #define BOOST_CONFIG_ON_MISSING_GUARD { throw my_logic_error(); }
// #define BOOST_CONTRACT_CONFIG_ON_MISSING_GUARD { throw my_logic_error(); }
// BOOST_CONTRACT_CONFIG_ON_MISSING_GUARD
// BOOST_CONTRACT_CONFIG_NO_PRECONDITIONS
// BOOST_CONTRACT_CONFIG_NO_POSTCONDITIONS
// BOOST_CONTRACT_CONFIG_NO_ENTRY_INVARIANTS
// BOOST_CONTRACT_CONFIG_NO_EXIT_INVARIANTS
// BOOST_CONTRACT_CONFIG_NO_INVARIANTS
#ifdef BOOST_CONTRACT_CONFIG_NO_PRECONDITIONS
# define BOOST_CONTRACT_NO_PRECONDITIONS 1
#else
# define BOOST_CONTRACT_NO_PRECONDITIONS 0
#endif
#ifdef BOOST_CONTRACT_CONFIG_NO_POSTCONDITIONS
# define BOOST_CONTRACT_NO_POSTCONDITIONS 1
#else
# define BOOST_CONTRACT_NO_POSTCONDITIONS 0
#endif
#if defined(BOOST_CONTRACT_CONFIG_NO_ENTRY_INVARIANTS) || \
defined (BOOST_CONTRACT_CONFIG_NO_INVARIANTS)
# define BOOST_CONTRACT_NO_ENTRY_INVARIANTS 1
#else
# define BOOST_CONTRACT_NO_ENTRY_INVARIANTS 0
#endif
#if defined(BOOST_CONTRACT_CONFIG_NO_EXIT_INVARIANTS) || \
defined (BOOST_CONTRACT_CONFIG_NO_INVARIANTS)
# define BOOST_CONTRACT_NO_EXIT_INVARIANTS 1
#else
# define BOOST_CONTRACT_NO_EXIT_INVARIANTS 0
#endif
#if BOOST_CONTRACT_NO_ENTRY_INVARIANTS && BOOST_CONTRACT_NO_EXIT_INVARIANTS
# define BOOST_CONTRACT_NO_INVARIANTS 1
#else
# define BOOST_CONTRACT_NO_INVARIANTS 1
#endif
#if BOOST_CONTRACT_NO_PRECONDITONS && BOOST_CONTRACT_NO_POSTCONDITIONS && \
BOOST_CONTRACT_NO_INVARIANTS
# define BOOST_CONTRACT_NO_CONTRACTS 1
#else
# define BOOST_CONTRACT_NO_CONTRACTS 0
#endif
#endif // #include guard

189
include/boost/contract/core/exception.hpp
View File

@ -14,6 +14,27 @@
#include <iostream>
/** @endcond */
/* PRIVATE */
#define BOOST_CONTRACT_EXCEPTION_HANDLER_SCOPED_LOCK_(_mutex) \
/*boost::mutex::scoped_lock lock(_mutex);*/ \
#define BOOST_CONTRACT_EXCEPTION_HANDLER_SET_(_mutex, handler, f) \
BOOST_CONTRACT_EXCEPTION_HANDLER_SCOPED_LOCK_(_mutex); \
assertion_failure_handler result = handler; \
handler = f; \
return result;
#define BOOST_CONTRACT_EXCEPTION_HANDLER_GET_(_mutex, handler) \
BOOST_CONTRACT_EXCEPTION_HANDLER_SCOPED_LOCK_(_mutex); \
return handler;
#define BOOST_CONTRACT_EXCEPTION_HANDLER_(_mutex, handler, where) \
BOOST_CONTRACT_EXCEPTION_HANDLER_SCOPED_LOCK_(_mutex); \
handler(where);
/* CODE */
namespace boost { namespace contract {
// Placeholder base class to group all this lib exceptions.
@ -56,7 +77,7 @@ public:
virtual ~assertion_failure() {}
// Return `assertion "XYZ" failed: file "ABC", line 123`.
// Return `assertion "..." failed: file "...", line ...`.
virtual char const* what() const BOOST_NOEXCEPT { return what_.c_str(); }
char const* const file() const { return file_; }
@ -88,136 +109,124 @@ enum from {
from_function
};
// TODO: Even if it might be confused with assertion_failure (which is an exception and not a function), all these function names are more readable as ..._failure instead of ..._failed (so they should be renamed that way).
// Use Boost.Function to handle also lambdas, binds, etc,
typedef boost::function<void (from)> assertion_failed_handler;
typedef boost::function<void (from)> assertion_failure_handler;
namespace exception_ {
enum failed_key { pre_key, post_key, entry_inv_key, exit_inv_key };
enum failure_key { pre_key, post_key, entry_inv_key, exit_inv_key };
template<failed_key Key>
template<failure_key Key>
void default_handler(from) {
std::string s = "";
std::string k = "";
switch(Key) {
case pre_key: s = "precondition "; break;
case post_key: s = "postcondition "; break;
case entry_inv_key: s = "entry invariant "; break;
case exit_inv_key: s = "exit invariant "; break;
case pre_key: k = "precondition "; break;
case post_key: k = "postcondition "; break;
case entry_inv_key: k = "entry invariant "; break;
case exit_inv_key: k = "exit invariant "; break;
// No default (so compiler warning/error on missing enum case).
}
try {
throw;
} catch(boost::contract::assertion_failure const& error) {
// what = "assertion '...' failed: ...".
std::cerr << s << error.what() << std::endl;
std::cerr << k << error.what() << std::endl;
} catch(...) {
std::cerr << s << "checking threw following exception:" << std::endl
std::cerr << k << "checking threw following exception:" << std::endl
<< boost::current_exception_diagnostic_information();
}
std::terminate(); // Default handlers log and call terminate.
}
// TODO: These (and some of the related def code) should be moved in a .cpp.
//boost::mutex pre_failed_mutex;
assertion_failed_handler pre_failed_handler =
//boost::mutex pre_failure_mutex;
assertion_failure_handler pre_failure_handler =
&default_handler<pre_key>;
//boost::mutex post_failed_mutex;
assertion_failed_handler post_failed_handler =
//boost::mutex post_failure_mutex;
assertion_failure_handler post_failure_handler =
&default_handler<post_key>;
//boost::mutex entry_inv_failed_mutex;
assertion_failed_handler entry_inv_failed_handler =
//boost::mutex entry_inv_failure_mutex;
assertion_failure_handler entry_inv_failure_handler =
&default_handler<entry_inv_key>;
//boost::mutex exit_inv_failed_mutex;
assertion_failed_handler exit_inv_failed_handler =
//boost::mutex exit_inv_failure_mutex;
assertion_failure_handler exit_inv_failure_handler =
&default_handler<exit_inv_key>;
}
#define BOOST_CONTRACT_EXCEPTION_SET_HANDLER_(_mutex, handler, f) \
/*boost::mutex::scoped_lock lock(exception_::_mutex);*/ \
assertion_failed_handler result = exception_::handler; \
exception_::handler = f; \
return result;
#define BOOST_CONTRACT_EXCEPTION_GET_HANDLER_(_mutex, handler) \
/*boost::mutex::scoped_lock lock(exception_::_mutex)*/; \
return exception_::handler;
#define BOOST_CONTRACT_EXCEPTION_CALL_HANDLER_(_mutex, handler, where) \
/*boost::mutex::scoped_lock lock(exception_::_mutex);*/ \
exception_::handler(where);
assertion_failed_handler set_precondition_failed(
assertion_failed_handler const& f) BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_SET_HANDLER_(pre_failed_mutex, pre_failed_handler,
f)
assertion_failure_handler set_precondition_failure(
assertion_failure_handler const& f) BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_HANDLER_SET_(exception_::pre_failure_mutex,
exception_::pre_failure_handler, f);
}
assertion_failed_handler get_precondition_failed() BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_GET_HANDLER_(pre_failed_mutex, pre_failed_handler)
}
void precondition_failed(from where) /* can throw */ {
BOOST_CONTRACT_EXCEPTION_CALL_HANDLER_(pre_failed_mutex, pre_failed_handler,
where)
}
assertion_failed_handler set_postcondition_failed(
assertion_failed_handler const& f) BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_SET_HANDLER_(post_failed_mutex,
post_failed_handler, f)
}
assertion_failed_handler get_postcondition_failed() BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_GET_HANDLER_(post_failed_mutex,
post_failed_handler)
}
void postcondition_failed(from where) /* can throw */ {
BOOST_CONTRACT_EXCEPTION_CALL_HANDLER_(post_failed_mutex,
post_failed_handler, where)
}
assertion_failed_handler set_entry_invariant_failed(
assertion_failed_handler const& f) BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_SET_HANDLER_(entry_inv_failed_mutex,
entry_inv_failed_handler, f)
}
assertion_failed_handler get_entry_invariant_failed()
assertion_failure_handler get_precondition_failure()
BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_GET_HANDLER_(entry_inv_failed_mutex,
entry_inv_failed_handler)
BOOST_CONTRACT_EXCEPTION_HANDLER_GET_(exception_::pre_failure_mutex,
exception_::pre_failure_handler);
}
void entry_invariant_failed(from where) /* can throw */ {
BOOST_CONTRACT_EXCEPTION_CALL_HANDLER_(entry_inv_failed_mutex,
entry_inv_failed_handler, where)
void precondition_failure(from where) /* can throw */ {
BOOST_CONTRACT_EXCEPTION_HANDLER_(exception_::pre_failure_mutex,
exception_::pre_failure_handler, where)
}
assertion_failed_handler set_exit_invariant_failed(
assertion_failed_handler const& f) BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_SET_HANDLER_(exit_inv_failed_mutex,
exit_inv_failed_handler, f)
assertion_failure_handler set_postcondition_failure(
assertion_failure_handler const& f) BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_HANDLER_SET_(exception_::post_failure_mutex,
exception_::post_failure_handler, f);
}
assertion_failed_handler get_exit_invariant_failed() BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_GET_HANDLER_(exit_inv_failed_mutex,
exit_inv_failed_handler)
assertion_failure_handler get_postcondition_failure()
BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_HANDLER_GET_(exception_::post_failure_mutex,
exception_::post_failure_handler);
}
void exit_invariant_failed(from where) /* can throw */ {
BOOST_CONTRACT_EXCEPTION_CALL_HANDLER_(exit_inv_failed_mutex,
exit_inv_failed_handler, where)
void postcondition_failure(from where) /* can throw */ {
BOOST_CONTRACT_EXCEPTION_HANDLER_(exception_::post_failure_mutex,
exception_::post_failure_handler, where);
}
void set_invariant_failed(
assertion_failed_handler const& f) BOOST_NOEXCEPT_OR_NOTHROW {
set_entry_invariant_failed(f);
set_exit_invariant_failed(f);
assertion_failure_handler set_entry_invariant_failure(
assertion_failure_handler const& f) BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_HANDLER_SET_(exception_::entry_inv_failure_mutex,
exception_::entry_inv_failure_handler, f);
}
assertion_failure_handler get_entry_invariant_failure()
BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_HANDLER_GET_(exception_::entry_inv_failure_mutex,
exception_::entry_inv_failure_handler);
}
void entry_invariant_failure(from where) /* can throw */ {
BOOST_CONTRACT_EXCEPTION_HANDLER_(exception_::entry_inv_failure_mutex,
exception_::entry_inv_failure_handler, where);
}
assertion_failure_handler set_exit_invariant_failure(
assertion_failure_handler const& f) BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_HANDLER_SET_(exception_::exit_inv_failure_mutex,
exception_::exit_inv_failure_handler, f);
}
assertion_failure_handler get_exit_invariant_failure()
BOOST_NOEXCEPT_OR_NOTHROW {
BOOST_CONTRACT_EXCEPTION_HANDLER_GET_(exception_::exit_inv_failure_mutex,
exception_::exit_inv_failure_handler);
}
void exit_invariant_failure(from where) /* can throw */ {
BOOST_CONTRACT_EXCEPTION_HANDLER_(exception_::exit_inv_failure_mutex,
exception_::exit_inv_failure_handler, where);
}
void set_invariant_failure(
assertion_failure_handler const& f) BOOST_NOEXCEPT_OR_NOTHROW {
set_entry_invariant_failure(f);
set_exit_invariant_failure(f);
}
} } // namespace

6
include/boost/contract/public_function.hpp
View File

@ -47,7 +47,7 @@
typename boost::remove_reference<typename boost::function_types:: \
result_type<F>::type>::type, \
typename boost::contract::public_function_:: \
remove_optional<R>::type \
remove_optional_ref<R>::type \
>::value, \
"mismatching result type for specified function" \
);
@ -65,10 +65,10 @@ namespace boost { namespace contract {
namespace public_function_ {
template<typename R>
struct remove_optional { typedef R type; };
struct remove_optional_ref { typedef R type; };
template<typename R>
struct remove_optional<boost::optional<R> > {
struct remove_optional_ref<boost::optional<R> > {
typedef typename boost::remove_reference<R>::type type;
};
}

2
test/constructor/decl_entry_static_inv_all.cpp
View File

@ -49,7 +49,7 @@ int main() {
}
struct err {};
boost::contract::set_entry_invariant_failed(
boost::contract::set_entry_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_entry_static_inv = false;

2
test/constructor/decl_entry_static_inv_ends.cpp
View File

@ -47,7 +47,7 @@ int main() {
}
struct err {};
boost::contract::set_entry_invariant_failed(
boost::contract::set_entry_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_entry_static_inv = false;

2
test/constructor/decl_entry_static_inv_mid.cpp
View File

@ -45,7 +45,7 @@ int main() {
}
struct err {};
boost::contract::set_entry_invariant_failed(
boost::contract::set_entry_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_entry_static_inv = false;

2
test/constructor/decl_exit_inv_all.cpp
View File

@ -48,7 +48,7 @@ int main() {
}
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_inv = false;

2
test/constructor/decl_exit_inv_ends.cpp
View File

@ -47,7 +47,7 @@ int main() {
}
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_inv = false;

2
test/constructor/decl_exit_inv_mid.cpp
View File

@ -46,7 +46,7 @@ int main() {
}
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_inv = false;

2
test/constructor/decl_exit_static_inv_all.cpp
View File

@ -49,7 +49,7 @@ int main() {
}
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_static_inv = false;

2
test/constructor/decl_exit_static_inv_ends.cpp
View File

@ -47,7 +47,7 @@ int main() {
}
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_static_inv = false;

2
test/constructor/decl_exit_static_inv_mid.cpp
View File

@ -45,7 +45,7 @@ int main() {
}
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_static_inv = false;

2
test/constructor/decl_post_all.cpp
View File

@ -48,7 +48,7 @@ int main() {
}
struct err {};
boost::contract::set_postcondition_failed(
boost::contract::set_postcondition_failure(
[] (boost::contract::from) { throw err(); });
a_post = false;

2
test/constructor/decl_post_ends.cpp
View File

@ -47,7 +47,7 @@ int main() {
}
struct err {};
boost::contract::set_postcondition_failed(
boost::contract::set_postcondition_failure(
[] (boost::contract::from) { throw err(); });
a_post = false;

2
test/constructor/decl_post_mid.cpp
View File

@ -46,7 +46,7 @@ int main() {
}
struct err {};
boost::contract::set_postcondition_failed(
boost::contract::set_postcondition_failure(
[] (boost::contract::from) { throw err(); });
a_post = false;

2
test/constructor/decl_pre_all.cpp
View File

@ -48,7 +48,7 @@ int main() {
}
struct err {};
boost::contract::set_precondition_failed(
boost::contract::set_precondition_failure(
[] (boost::contract::from) { throw err(); });
a_pre = false;

2
test/constructor/decl_pre_ends.cpp
View File

@ -47,7 +47,7 @@ int main() {
}
struct err {};
boost::contract::set_precondition_failed(
boost::contract::set_precondition_failure(
[] (boost::contract::from) { throw err(); });
a_pre = false;

2
test/constructor/decl_pre_mid.cpp
View File

@ -46,7 +46,7 @@ int main() {
}
struct err {};
boost::contract::set_precondition_failed(
boost::contract::set_precondition_failure(
[] (boost::contract::from) { throw err(); });
a_pre = false;

2
test/constructor/old_throw.cpp
View File

@ -89,7 +89,7 @@ struct a
int main() {
std::ostringstream ok;
boost::contract::set_postcondition_failed(
boost::contract::set_postcondition_failure(
[] (boost::contract::from) { throw; });
try {

4
test/destructor/decl_entry_inv_all.cpp
View File

@ -44,7 +44,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed([&ok] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // for testing (as dtors should never throw anyways).
});
@ -145,7 +145,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
} catch(...) { BOOST_TEST(false); }
boost::contract::set_entry_invariant_failed([] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([] (boost::contract::from) {
// Testing multiple failures so dtors must not throw multiple
// exceptions, just ignore failure and continue test program...
});

4
test/destructor/decl_entry_inv_ends.cpp
View File

@ -43,7 +43,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed([&ok] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // for testing (as dtors should never throw anyways).
});
@ -140,7 +140,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
} catch(...) { BOOST_TEST(false); }
boost::contract::set_entry_invariant_failed([] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([] (boost::contract::from) {
// Testing multiple failures so dtors must not throw multiple
// exceptions, just ignore failure and continue test program...
});

4
test/destructor/decl_entry_inv_mid.cpp
View File

@ -42,7 +42,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed([&ok] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // for testing (as dtors should never throw anyways).
});
@ -142,7 +142,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
} catch(...) { BOOST_TEST(false); }
boost::contract::set_entry_invariant_failed([] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([] (boost::contract::from) {
// Testing multiple failures so dtors must not throw multiple
// exceptions, just ignore failure and continue test program...
});

4
test/destructor/decl_entry_static_inv_all.cpp
View File

@ -45,7 +45,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed([&ok] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // for testing (as dtors should never throw anyways).
});
@ -146,7 +146,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
} catch(...) { BOOST_TEST(false); }
boost::contract::set_entry_invariant_failed([] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([] (boost::contract::from) {
// Testing multiple failures so dtors must not throw multiple
// exceptions, just ignore failure and continue test program...
});

4
test/destructor/decl_entry_static_inv_ends.cpp
View File

@ -43,7 +43,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed([&ok] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // for testing (as dtors should never throw anyways).
});
@ -139,7 +139,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
} catch(...) { BOOST_TEST(false); }
boost::contract::set_entry_invariant_failed([] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([] (boost::contract::from) {
// Testing multiple failures so dtors must not throw multiple
// exceptions, just ignore failure and continue test program...
});

4
test/destructor/decl_entry_static_inv_mid.cpp
View File

@ -41,7 +41,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed([&ok] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // for testing (as dtors should never throw anyways).
});
@ -138,7 +138,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
} catch(...) { BOOST_TEST(false); }
boost::contract::set_entry_invariant_failed([] (boost::contract::from) {
boost::contract::set_entry_invariant_failure([] (boost::contract::from) {
// Testing multiple failures so dtors must not throw multiple
// exceptions, just ignore failure and continue test program...
});

4
test/destructor/decl_exit_static_inv_all.cpp
View File

@ -45,7 +45,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_exit_invariant_failed([&ok] (boost::contract::from) {
boost::contract::set_exit_invariant_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // for testing (as dtors should never throw anyways).
});
@ -158,7 +158,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
} catch(...) { BOOST_TEST(false); }
boost::contract::set_exit_invariant_failed([] (boost::contract::from) {
boost::contract::set_exit_invariant_failure([] (boost::contract::from) {
// Testing multiple failures so dtors must not throw multiple
// exceptions, just ignore failure and continue test program...
});

4
test/destructor/decl_exit_static_inv_ends.cpp
View File

@ -43,7 +43,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_exit_invariant_failed([&ok] (boost::contract::from) {
boost::contract::set_exit_invariant_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // for testing (as dtors should never throw anyways).
});
@ -147,7 +147,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
} catch(...) { BOOST_TEST(false); }
boost::contract::set_exit_invariant_failed([] (boost::contract::from) {
boost::contract::set_exit_invariant_failure([] (boost::contract::from) {
// Testing multiple failures so dtors must not throw multiple
// exceptions, just ignore failure and continue test program...
});

4
test/destructor/decl_exit_static_inv_mid.cpp
View File

@ -41,7 +41,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_exit_invariant_failed([&ok] (boost::contract::from) {
boost::contract::set_exit_invariant_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // for testing (as dtors should never throw anyways).
});
@ -142,7 +142,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
} catch(...) { BOOST_TEST(false); }
boost::contract::set_exit_invariant_failed([] (boost::contract::from) {
boost::contract::set_exit_invariant_failure([] (boost::contract::from) {
// Testing multiple failures so dtors must not throw multiple
// exceptions, just ignore failure and continue test program...
});

2
test/destructor/decl_post_all.cpp
View File

@ -44,7 +44,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_postcondition_failed([&ok] (boost::contract::from) {
boost::contract::set_postcondition_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // for testing (as dtors should never throw anyways).
});

2
test/destructor/decl_post_ends.cpp
View File

@ -43,7 +43,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_postcondition_failed([&ok] (boost::contract::from) {
boost::contract::set_postcondition_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // ... for testing (as dtors should never throw anyways).
});

2
test/destructor/decl_post_mid.cpp
View File

@ -42,7 +42,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_postcondition_failed([&ok] (boost::contract::from) {
boost::contract::set_postcondition_failure([&ok] (boost::contract::from) {
BOOST_TEST(out.eq(ok.str())); // Must check before dtor throws...
throw err(); // ... for testing (as dtors should never throw anyways).
});

2
test/destructor/old_throw.cpp
View File

@ -72,7 +72,7 @@ struct a
int main() {
std::ostringstream ok;
boost::contract::set_postcondition_failed(
boost::contract::set_postcondition_failure(
[] (boost::contract::from) { throw; });
try {

2
test/function/decl_post_all.cpp
View File

@ -22,7 +22,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_postcondition_failed(
boost::contract::set_postcondition_failure(
[] (boost::contract::from) { throw err(); });
f_post = false;

2
test/function/decl_pre_all.cpp
View File

@ -22,7 +22,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_precondition_failed(
boost::contract::set_precondition_failure(
[] (boost::contract::from) { throw err(); });
f_pre = false;

2
test/function/old_throw.cpp
View File

@ -26,7 +26,7 @@ void f() {
int main() {
std::ostringstream ok;
boost::contract::set_postcondition_failed(
boost::contract::set_postcondition_failure(
[] (boost::contract::from) { throw; });
try {

2
test/public_function/decl_entry_inv_all.cpp
View File

@ -52,7 +52,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed(
boost::contract::set_entry_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_entry_inv = false;

2
test/public_function/decl_entry_inv_ends.cpp
View File

@ -50,7 +50,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed(
boost::contract::set_entry_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_entry_inv = false;

2
test/public_function/decl_entry_inv_mid.cpp
View File

@ -48,7 +48,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed(
boost::contract::set_entry_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_entry_inv = false;

2
test/public_function/decl_entry_static_inv_all.cpp
View File

@ -52,7 +52,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed(
boost::contract::set_entry_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_entry_static_inv = false;

2
test/public_function/decl_entry_static_inv_ends.cpp
View File

@ -50,7 +50,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed(
boost::contract::set_entry_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_entry_static_inv = false;

2
test/public_function/decl_entry_static_inv_mid.cpp
View File

@ -48,7 +48,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_entry_invariant_failed(
boost::contract::set_entry_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_entry_static_inv = false;

2
test/public_function/decl_exit_inv_all.cpp
View File

@ -52,7 +52,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_inv = false;

2
test/public_function/decl_exit_inv_ends.cpp
View File

@ -50,7 +50,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_inv = false;

2
test/public_function/decl_exit_inv_mid.cpp
View File

@ -48,7 +48,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_inv = false;

2
test/public_function/decl_exit_inv_none.cpp
View File

@ -37,7 +37,7 @@ int main() {
;
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a aa;

2
test/public_function/decl_exit_static_inv_all.cpp
View File

@ -52,7 +52,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_static_inv = false;

2
test/public_function/decl_exit_static_inv_ends.cpp
View File

@ -50,7 +50,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_static_inv = false;

2
test/public_function/decl_exit_static_inv_mid.cpp
View File

@ -48,7 +48,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a_exit_static_inv = false;

2
test/public_function/decl_exit_static_inv_none.cpp
View File

@ -36,7 +36,7 @@ int main() {
;
struct err {};
boost::contract::set_exit_invariant_failed(
boost::contract::set_exit_invariant_failure(
[] (boost::contract::from) { throw err(); });
a aa;

2
test/public_function/decl_post_all.cpp
View File

@ -51,7 +51,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_postcondition_failed(
boost::contract::set_postcondition_failure(
[] (boost::contract::from) { throw err(); });
a_post = false;

2
test/public_function/decl_post_ends.cpp
View File

@ -50,7 +50,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_postcondition_failed(
boost::contract::set_postcondition_failure(
[] (boost::contract::from) { throw err(); });
a_post = false;

2
test/public_function/decl_post_mid.cpp
View File

@ -49,7 +49,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_postcondition_failed(
boost::contract::set_postcondition_failure(
[] (boost::contract::from) { throw err(); });
a_post = false;

2
test/public_function/decl_pre_all.cpp
View File

@ -163,7 +163,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_precondition_failed(
boost::contract::set_precondition_failure(
[] (boost::contract::from) { throw err(); });
a_pre = false;

2
test/public_function/decl_pre_ends.cpp
View File

@ -125,7 +125,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_precondition_failed(
boost::contract::set_precondition_failure(
[] (boost::contract::from) { throw err(); });
ok.str(""); ok

2
test/public_function/decl_pre_mid.cpp
View File

@ -87,7 +87,7 @@ int main() {
BOOST_TEST(out.eq(ok.str()));
struct err {};
boost::contract::set_precondition_failed(
boost::contract::set_precondition_failure(
[] (boost::contract::from) { throw err(); });
ok.str(""); ok

2
test/public_function/old_throw.cpp
View File

@ -94,7 +94,7 @@ struct a
int main() {
std::ostringstream ok;
boost::contract::set_postcondition_failed(
boost::contract::set_postcondition_failure(
[] (boost::contract::from) { throw; });
a aa;