Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r74625 - in sandbox/contract/libs/contract/doc/html2: . contract__
From: lorcaminiti_at_[hidden]
Date: 2011-10-01 13:15:41

Next message: vicente.botet_at_[hidden]: "[Boost-commit] svn:boost r74626 - trunk/boost/chrono/stopwatches/memories"
Previous message: vicente.botet_at_[hidden]: "[Boost-commit] svn:boost r74624 - in trunk/libs/chrono/test: . stopwatch"

Author: lcaminiti
Date: 2011-10-01 13:15:40 EDT (Sat, 01 Oct 2011)
New Revision: 74625
URL: http://svn.boost.org/trac/boost/changeset/74625

Log:
Upd docs.
Text files modified:
   sandbox/contract/libs/contract/doc/html2/contract__/examples.html | 330 +++++++++++++++++++++++++--------------
   sandbox/contract/libs/contract/doc/html2/contract__/grammar.html | 35 ++-
   sandbox/contract/libs/contract/doc/html2/contract__/release_notes.html | 28 --
   sandbox/contract/libs/contract/doc/html2/index.html | 2
   4 files changed, 240 insertions(+), 155 deletions(-)

Modified: sandbox/contract/libs/contract/doc/html2/contract__/examples.html
==============================================================================
--- sandbox/contract/libs/contract/doc/html2/contract__/examples.html (original)
+++ sandbox/contract/libs/contract/doc/html2/contract__/examples.html 2011-10-01 13:15:40 EDT (Sat, 01 Oct 2011)
@@ -28,11 +28,11 @@
</h2></div></div></div>
<div class="toc"><dl>
<dt><a href="examples.html#contract__.examples.n1962_vector">[N1962] Vector: Comparison
- with C++ proposal syntax</a></dt>
+ with C++ proposed syntax</a></dt>
<dt><a href="examples.html#contract__.examples.__n1962___circle__subcontracting">[N1962]
 Circle: Subcontracting</a></dt>
-<dt><a href="examples.html#contract__.examples.__n1962___factorial__recursion_and_importance_ordering">[N1962]
- Factorial: Recursion and importance ordering</a></dt>
+<dt><a href="examples.html#contract__.examples.__n1962___factorial__recursion_and_assertion_computational_complexity">[N1962]
+ Factorial: Recursion and assertion computational complexity</a></dt>
<dt><a href="examples.html#contract__.examples.__n1962___equal__operators">[N1962]
 Equal: Operators</a></dt>
<dt><a href="examples.html#contract__.examples.__n1962___sum__separated_body_definition">[N1962]
@@ -92,13 +92,15 @@
<dt><a href="examples.html#contract__.examples.__stroustrup97___string__throw_when_contract_is_broken">[Stroustrup97]
 String: Throw when contract is broken</a></dt>
<dt><a href="examples.html#contract__.examples.cline90_vector">[Cline90] Vector:
- Comparison with A++ proposal syntax</a></dt>
+ Comparison with A++ proposed syntax</a></dt>
<dt><a href="examples.html#contract__.examples.__cline90___stack__function_try_blocks_and_exception_specifications">[Cline90]
 Stack: Function-try-blocks and exception specifications</a></dt>
<dt><a href="examples.html#contract__.examples.__cline90___vector_stack__subcontracting_from_abstract_data_type">[Cline90]
 Vector-Stack: Subcontracting from Abstract Data Type</a></dt>
<dt><a href="examples.html#contract__.examples.__cline90___calendar__a_very_simple_calendar">[Cline90]
 Calendar: A very simple calendar</a></dt>
+<dt><a href="examples.html#contract__.examples.increment__assertion_requirements_also_for_old_of">Increment:
+ Assertion requirements also for old-of</a></dt>
</dl></div>

 This section lists quite a few examples programmed using this library and taken
@@ -139,7 +141,7 @@
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem">
 Comparison with syntax from C++ Contract and Concept Programming proposals
- (see <a class="link" href="examples.html#contract__.examples.n1962_vector" title="[N1962] Vector: Comparison with C++ proposal syntax">here</a>) and
+ (see <a class="link" href="examples.html#contract__.examples.n1962_vector" title="[N1962] Vector: Comparison with C++ proposed syntax">here</a>) and
 with a user-defined concept (see <a class="link" href="examples.html#contract__.examples.n2081_add" title="[N2081] Add: Generic addition algorithm">here</a>).
 </li>
<li class="listitem">
@@ -151,13 +153,13 @@
 and for loop variants (see <a class="link" href="examples.html#contract__.examples.meyer97_gcd" title="[Meyer97] GCD: Loop variant and comparison with Eiffel syntax">here</a>).
 </li>
<li class="listitem">
- Comparison with A++ syntax (see <a class="link" href="examples.html#contract__.examples.cline90_vector" title="[Cline90] Vector: Comparison with A++ proposal syntax">here</a>).
+ Comparison with A++ syntax (see <a class="link" href="examples.html#contract__.examples.cline90_vector" title="[Cline90] Vector: Comparison with A++ proposed syntax">here</a>).
 </li>
</ul></div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
-<a name="contract__.examples.n1962_vector"></a><a class="link" href="examples.html#contract__.examples.n1962_vector" title="[N1962] Vector: Comparison with C++ proposal syntax">[N1962] Vector: Comparison
- with C++ proposal syntax</a>
+<a name="contract__.examples.n1962_vector"></a><a class="link" href="examples.html#contract__.examples.n1962_vector" title="[N1962] Vector: Comparison with C++ proposed syntax">[N1962] Vector: Comparison
+ with C++ proposed syntax</a>
</h3></div></div></div>
<div class="informaltable"><table class="table">
<colgroup>
@@ -183,8 +185,8 @@


<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">#include <contract.hpp>
-#include <contract/trivial.hpp> // Contracts add not type requirements.
#include <boost/utility.hpp> // For boost::prior().
+#include <boost/type_traits/can_call_equal.hpp>
#include <boost/concept_check.hpp>
#include <iterator>
#include <vector>
@@ -232,7 +234,8 @@
 public explicit (vector) ( (size_type) count )
 postcondition(
 size() == count,
- contract::trivial::range(begin(), end()) == T()
+ all_equals(begin(), end(), T()),
+ requires boost::can_call_equal<T>::value
 )
 initialize( vect_(count) )
 ) {}
@@ -241,7 +244,8 @@
 public (vector) ( (size_type) count, (const T&) val )
 postcondition(
 size() == count,
- contract::trivial::range(begin(), end()) == val
+ all_equals(begin(), end(), val),
+ requires boost::can_call_equal<T>::value
 )
 initialize( vect_(count, val) )
 ) {}
@@ -250,7 +254,8 @@
 public (vector) ( (size_type) count, (const T&) val, (const Alloc&) al )
 postcondition(
 size() == count,
- contract::trivial::range(begin(), end()) == val,
+ all_equals(begin(), end(), val),
+ requires boost::can_call_equal<T>::value,
 al == get_allocator()
 )
 initialize( vect_(count, val, al) )
@@ -276,8 +281,7 @@
 CONTRACT_CONSTRUCTOR_TPL(
 public (vector) ( (const vector&) right )
 postcondition(
- using contract::trivial::range,
- range(begin(), end()) == range(right.begin(), right.end())
+ right == *this, requires boost::can_call_equal<T>::value
 )
 initialize( vect_(right.vect_) )
 ) {}
@@ -285,10 +289,9 @@
 CONTRACT_FUNCTION_TPL( // Operator symbol and (arbitrary) name `copy`.
 public (vector&) operator(=)(copy) ( (const vector&) right )
 postcondition(
- using contract::trivial::range,
 auto result = return,
- range(begin(), end()) == range(right.begin(), right.end()),
- range(result.begin(), result.end()) == range(begin(), end())
+ result == *this, requires boost::can_call_equal<T>::value,
+ result == right, requires boost::can_call_equal<T>::value
 )
 ) {
 return vect_ = right.vect_;
@@ -375,7 +378,8 @@
 auto old_size = CONTRACT_OLDOF size(), // Old value (before body).
 size() == newsize,
 if(newsize > old_size) ( // Version 1: Within an `if`.
- contract::trivial::range(begin() + old_size, end()) == T()
+ all_equals(begin() + old_size, end(), T()),
+ requires boost::can_call_equal<T>::value
 ) // Omitted optional `else( ... )`.
 )
 ) {
@@ -387,9 +391,11 @@
 postcondition(
 (size_type) old_size = CONTRACT_OLDOF size(), // Specify old type.
 size() == newsize,
- newsize > old_size // Version 2: With ternary operator.
- ? contract::trivial::range(begin() + old_size, end()) == val
- : true
+ newsize > old_size ? // Version 2: With ternary operator.
+ all_equals(begin() + old_size, end(), val)
+ :
+ true
+ , requires boost::can_call_equal<T>::value
 )
 ) {
 vect_.resize(newsize, val);
@@ -482,10 +488,9 @@
 public void (push_back) ( (const T&) val )
 precondition( size() < max_size() )
 postcondition(
- using contract::trivial::operator==,
 auto old_size = CONTRACT_OLDOF size(),
 auto old_capacity = CONTRACT_OLDOF capacity(),
- back() == val, // Trivial == if not EqualityComparable<T>.
+ back() == val, requires boost::can_call_equal<T>::value,
 size() == old_size + 1,
 capacity() >= old_capacity
 )
@@ -507,10 +512,7 @@
 CONTRACT_FUNCTION_TPL(
 public template( class InIt ) requires( boost::InputIterator<InIt> )
 void (assign) ( (InIt) first, (InIt) last )
- precondition(
- using contract::trivial::range,
- range(first, last).contained(range(begin(), end())) == false
- )
+ // Precondition: Range [begin(), end()) contains [first, last).
 postcondition( std::distance(first, last) == int(size()) )
 ) {
 vect_.assign(first, last);
@@ -519,7 +521,10 @@
 CONTRACT_FUNCTION_TPL(
 public void (assign) ( (size_type) count, (const T&) val )
 precondition( count <= max_size() )
- postcondition( contract::trivial::range(begin(), end()) == val )
+ postcondition(
+ all_equals(begin(), end(), val),
+ requires boost::can_call_equal<T>::value
+ )
 ) {
 vect_.assign(count, val);
 }
@@ -528,17 +533,12 @@
 public (iterator) (insert) ( (iterator) pos, (const T&) val )
 precondition( size() < max_size() )
 postcondition(
- using contract::trivial::operator==,
 auto result = return,
 auto old_size = CONTRACT_OLDOF size(),
- auto old_capacity = CONTRACT_OLDOF capacity(),
- val == *result, // Trivial == if not EqualityComparable<T>.
- size() == old_size + 1,
- if(capacity() > old_capacity) (
- contract::trivial::range(begin(), end()).invalid()
- ) else (
- contract::trivial::range(pos, end()).invalid()
- )
+ val == *result, requires boost::can_call_equal<T>::value,
+ size() == old_size + 1
+ // if(capacity() > oldof capacity()): [begin(), end()) is invalid
+ // else: [pos, end()) is invalid
 )
 ) {
 return vect_.insert(pos, val);
@@ -548,7 +548,6 @@
 public void (insert) ( (iterator) pos, (size_type) count, (const T&) val )
 precondition( size() + count < max_size() )
 postcondition(
- using contract::trivial::range,
 using boost::prior,
 auto old_size = CONTRACT_OLDOF size(),
 auto old_capacity = CONTRACT_OLDOF capacity(),
@@ -556,12 +555,10 @@
 size() == old_size + count,
 capacity() >= old_capacity,
 if(capacity() == old_capacity) (
- range(prior(old_pos),
- prior(old_pos) + count) == val,
- range(const_iterator(pos), end()).invalid()
- ) else (
- range(begin(), end()).invalid()
- )
+ all_equals(prior(old_pos), prior(old_pos) + count, val),
+ requires boost::can_call_equal<T>::value
+ // Range [pos, end()) is invalid.
+ ) // Else, range [begin(), end()) is invalid.
 )
 ) {
 vect_.insert(pos, count, val);
@@ -571,8 +568,7 @@
 public template( class InIt )
 void (insert) ( (iterator) pos, (InIt) first, (InIt) last )
 precondition(
- using contract::trivial::range,
- range(first, last).contained(range(begin(), end())) == false,
+ // Range [first, last) is not contained in [begin(), end()).
 size() + std::distance(first, last) < max_size()
 )
 postcondition(
@@ -595,8 +591,8 @@
 auto result = return,
 auto old_size = CONTRACT_OLDOF size(),
 size() == old_size = 1,
- if(empty()) ( result == end() ),
- contract::trivial::range(pos, end()).invalid()
+ if(empty()) ( result == end() )
+ // Range [post, end()) is invalid.
 )
 ) {
 return vect_.erase();
@@ -609,8 +605,8 @@
 auto result = return,
 auto old_size = CONTRACT_OLDOF size(),
 size() == old_size - std::distance(first, last),
- if(empty()) ( result == end() ),
- contract::trivial::range(first, last).invalid()
+ if(empty()) ( result == end() )
+ // Range [first, last) is invalid.
 )
 ) {
 return vect_.erase(first, last);
@@ -626,18 +622,30 @@
 CONTRACT_FUNCTION_TPL(
 public void (swap) ( (vector&) right )
 postcondition(
- using contract::trivial::range,
 auto old_self = CONTRACT_OLDOF *this,
 auto old_right = CONTRACT_OLDOF right,
- range(right.begin(), right.end()) ==
- range(old_self.begin(), old_self.end()),
- range(begin(), end()) == range(old_right.begin(), old_right.end())
+ right == old_self, requires boost::can_call_equal<T>::value,
+ old_right == * this, requires boost::can_call_equal<T>::value
 )
 ) {
 vect_.swap(right);
 }

+ friend bool operator== ( vector const& left, vector const& right )
+ {
+ return left.vect_ == right.vect_;
+ }
+
private:
+ CONTRACT_FUNCTION_TPL( // Contract helper.
+ private template( class Iter ) requires( boost::EqualityComparable<T> )
+ static bool (all_equals) (
+ (Iter) first, (Iter) last, (const T&) val )
+ ) {
+ for(Iter i = first; i != last; ++i) if(*i != val) return false;
+ return true;
+ }
+
 std::vector<T, Alloc> vect_;
};
</pre>
@@ -1170,21 +1178,22 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
-<a name="contract__.examples.__n1962___factorial__recursion_and_importance_ordering"></a><a class="link" href="examples.html#contract__.examples.__n1962___factorial__recursion_and_importance_ordering" title="[N1962] Factorial: Recursion and importance ordering">[N1962]
- Factorial: Recursion and importance ordering</a>
+<a name="contract__.examples.__n1962___factorial__recursion_and_assertion_computational_complexity"></a><a class="link" href="examples.html#contract__.examples.__n1962___factorial__recursion_and_assertion_computational_complexity" title="[N1962] Factorial: Recursion and assertion computational complexity">[N1962]
+ Factorial: Recursion and assertion computational complexity</a>
</h3></div></div></div>



<pre class="programlisting">#include <contract.hpp>

-// Assertion importance used to model computational complexity.
+// Assertion requirements used to model assertion computational complexity.
#define O_1 0 // O(1) constant (default).
#define O_N 1 // O(n) linear.
#define O_NN 2 // O(n * n) quadratic.
#define O_NX 3 // O(n^x) polynomial.
#define O_FACTN 4 // O(n!) factorial.
#define O_EXPN 5 // O(e^n) exponential.
+#define COMPLEXITY_MAX O_1

CONTRACT_FUNCTION(
int (factorial) ( int n )
@@ -1201,9 +1210,9 @@
 // Contracts disable assertions within assertion checking so
 // this postcondition can recursively call the function without
 // causing infinite recursion. Moreover, this check adds
- // significant run-time overhead so assertion importance is used to
- // allow to selectively disable it.
- result == n * factorial(n - 1), importance O_FACTN
+ // significant run-time overhead so assertion requirements are used
+ // to allow to selectively disable it.
+ result == n * factorial(n - 1), requires O_FACTN <= COMPLEXITY_MAX
 )
 )
) {
@@ -1391,7 +1400,7 @@


<pre class="programlisting">#include <contract.hpp>
-#include <contract/trivial.hpp>
+#include <boost/type_traits/can_call_equal.hpp>
#include <boost/concept_check.hpp>

template< typename T >
@@ -1409,9 +1418,8 @@
template( typename T ) requires( Addable<T> )
(T) (add) ( (T) x, (T) y )
 postcondition(
- using contract::trivial::operator==,
 auto result = return,
- result == x + y // Trivial == if T not EqualityComparable.
+ result == x + y, requires boost::can_call_equal<T>::value
 )
) {
 return x + y;
@@ -1429,7 +1437,7 @@


<pre class="programlisting">#include <contract.hpp>
-#include <contract/trivial.hpp>
+#include <boost/type_traits/can_call_equal.hpp>
#include <boost/mpl/bool.hpp>
#include <vector>
#include <list>
@@ -1442,7 +1450,7 @@
 std::input_iterator_tag )
{
 CONTRACT_LOOP( while(n--) ) {
- CONTRACT_LOOP_VARIANT_TPL( n )
+ CONTRACT_LOOP_VARIANT_TPL( const( n ) n )
 ++i;
 }
}
@@ -1453,7 +1461,7 @@
{
 if(n >= 0) {
 CONTRACT_LOOP( while(n--) ) {
- CONTRACT_LOOP_VARIANT_TPL( n )
+ CONTRACT_LOOP_VARIANT_TPL( const( n ) n )
 ++i;
 }
 } else {
@@ -1461,7 +1469,7 @@
 Distance n_max = n;
#endif
 CONTRACT_LOOP( while(n++) ) {
- CONTRACT_LOOP_VARIANT_TPL( n_max - n )
+ CONTRACT_LOOP_VARIANT_TPL( const( n_max, n ) n_max - n )
 --i;
 }
 }
@@ -1485,7 +1493,7 @@
template( typename InputIterator, typename Distance )
void (myadvance) ( (InputIterator&) i, (Distance) n )
 precondition(
- contract::trivial::range(i, n + 1).nonsingular(), // Range [i, i + n].
+ // Range [i, i + n] is non-singular.
 if(is_input_iterator<typename std::iterator_traits<InputIterator>::
 iterator_category>::value) (
 n > 0 // if input iterator, n positive
@@ -1512,7 +1520,6 @@


<pre class="programlisting">#include <contract.hpp>
-#include <contract/trivial.hpp>
#include <boost/concept_check.hpp>

CONTRACT_FUNCTION(
@@ -1524,7 +1531,7 @@
 )
(Iter) (myfind) ( (Iter) first, (Iter) last,
 (typename boost::InputIterator<Iter>::value_type const&) value )
- precondition( contract::trivial::range(first, last).valid() )
+ // Precondition: Range [first, last) is valid.
 postcondition(
 auto result = return,
 if(result != last) (
@@ -1533,9 +1540,8 @@
 )
) {
 CONTRACT_LOOP( while(first != last && *first != value) ) {
- /** @todo I get a GCC internal error (on Cygwin) if I use const-expr here... why? Can I work around it? */
- CONTRACT_LOOP_VARIANT_TPL( const( first, last )
- std::distance(first, last) )
+ CONTRACT_LOOP_VARIANT_TPL(
+ const( first, last ) std::distance(first, last) )
 ++first;
 }
 return first;
@@ -1553,12 +1559,13 @@


<pre class="programlisting">#include <contract.hpp>
-#include <contract/trivial.hpp>
+#include <boost/type_traits/can_call_equal.hpp>
#include <boost/concept_check.hpp>

-// Use importance ordering to specify assertion computational complexity.
-#define O_1 0 // O(1) constant (default)
-#define O_BODY 1 // same computation complexity of the body
+// Use assertion requirements to model assertion computational complexity.
+#define O_1 0 // constant computational complexity O(1)
+#define O_BODY 10 // same computation complexity of the body
+#define COMPLEXITY_MAX O_1 // only check assertions with complexity within O(1)

CONTRACT_FUNCTION( // Invoke unary functors.
template( typename Result, typename Arg0, typename UnaryOp )
@@ -1568,10 +1575,12 @@
 )
(Result) (apply) ( (UnaryOp) op, (Arg0) arg0, (Result&) result )
 postcondition(
- using contract::trivial::operator==, // Trivial == is Result hasn't ==.
 auto return_value = return,
- result == op(arg0), importance O_BODY,
- return_value == result
+ result == op(arg0),
+ requires O_BODY <= COMPLEXITY_MAX &&
+ boost::can_call_equal<Result>::value,
+ return_value == result,
+ requires boost::can_call_equal<Result>::value
 )
) {
 return result = op(arg0);
@@ -1585,10 +1594,12 @@
 )
(Result) (apply) ( (BinaryOp) op, (Arg0) arg0, (Arg1) arg1, (Result&) result )
 postcondition(
- using contract::trivial::operator==, // Avoid == requirement on Result.
 auto return_value = return,
- result == op(arg0, arg1), importance O_BODY,
- return_value == result
+ result == op(arg0, arg1),
+ requires O_BODY <= COMPLEXITY_MAX &&
+ boost::can_call_equal<Result>::value,
+ return_value == result,
+ requires boost::can_call_equal<Result>::value
 )
) {
 return result = op(arg0, arg1);
@@ -1606,7 +1617,7 @@


<pre class="programlisting">#include <contract.hpp>
-#include <contract/trivial.hpp>
+#include <boost/type_traits/can_call_equal.hpp>
#include <boost/concept_check.hpp>

CONTRACT_FUNCTION(
@@ -1617,15 +1628,15 @@
 typename boost::InputIterator<Iter>::value_type> ))
 )
(Func) (my_for_each) ( (Iter) first, (Iter) last, (Func) func )
- precondition( contract::trivial::range(first, last).valid() )
+ // Precondition: Range [first, last) is valid.
 postcondition(
- using contract::trivial::operator==,
 auto result = return,
- result == func // Trivial == if not EqualityComparable<Func>.
+ result == func, requires boost::can_call_equal<Func>::value
 )
) {
 CONTRACT_LOOP( while(first < last) ) { // OK: Iter is InputIterator.
- CONTRACT_LOOP_VARIANT_TPL( std::distance(first, last) )
+ CONTRACT_LOOP_VARIANT_TPL(
+ const( first, last ) std::distance(first, last) )
 func(*first); // OK: func is UnaryFunction.
 ++first; // OK: Iter is InputIterator.
 }
@@ -1643,9 +1654,11 @@



-<pre class="programlisting">#define CONTRACT_CONFIG_FUNCTION_ARITY_MAX 6 // Up 5 function parameters.
+<pre class="programlisting">// Support up to 5 function parameters (must #define before any #include).
+#define CONTRACT_CONFIG_FUNCTION_ARITY_MAX 6
+
#include <contract.hpp>
-#include <contract/trivial.hpp>
+#include <boost/type_traits/can_call_equal.hpp>
#include <boost/concept_check.hpp>
#include <algorithm>

@@ -1663,11 +1676,10 @@
 )
(OutIter) (mytransform) ( (InIter1) first1, (InIter1) last1, (InIter2) first2,
 (OutIter) result, (BinOp) op )
- precondition( contract::trivial::range(first1, last1).valid() )
+ // Precondition: Range [first1, last1) is valid.
 postcondition(
- using contract::trivial::operator==,
 auto return_value = return,
- return_value == result // Trivial == if InIter1::value_type has no ==.
+ return_value == result, requires boost::can_call_equal<OutIter>::value
 )
) {
 return std::transform(first1, last1, first2, result, op);
@@ -1685,7 +1697,6 @@


<pre class="programlisting">#include <contract.hpp>
-#include <contract/trivial.hpp>
#include <boost/concept_check.hpp>

CONTRACT_FUNCTION(
@@ -1699,12 +1710,13 @@
(typename boost::InputIterator<Iter>::difference_type) (mycount) (
 (Iter) first, (Iter) last,
 (typename boost::InputIterator<Iter>::value_type const&) value )
- precondition( contract::trivial::range(first, last).valid() )
+ // Precondition: Range [first, last) is valid.
 postcondition( auto result = return, result >= 0 )
) {
 typename boost::InputIterator<Iter>::difference_type result = 0;
 CONTRACT_LOOP( while(first != last) ) { // OK: Iter is equality comparable.
- CONTRACT_LOOP_VARIANT_TPL( std::distance(first, last) )
+ CONTRACT_LOOP_VARIANT_TPL(
+ const( first, last ) std::distance(first, last) )
 if(*first == value) // OK: Value is equality comparable.
 ++result;
 ++first; // OK: Iterator is input iterator.
@@ -1797,7 +1809,7 @@


<pre class="programlisting">#include <contract.hpp>
-#include <contract/trivial.hpp>
+#include <boost/type_traits/can_call_equal.hpp>
#include <boost/concept_check.hpp>

CONTRACT_FUNCTION(
@@ -1808,11 +1820,11 @@
 boost::InputIterator<Iter>::value_type>
 )
(typename boost::InputIterator<Iter>::value_type) (deref) ( (Iter) i )
- precondition( contract::trivial::singular(i) == false )
+ // Precondition: Iterator i is non-singular.
 postcondition(
- using contract::trivial::operator==,
 auto result = return,
- result == *i // Trivial == if Iter::value_type not EqualityComparable.
+ result == *i, requires boost::can_call_equal<typename
+ boost::InputIterator<Iter>::value_type>::value
 )
) {
 return *i;
@@ -1830,16 +1842,16 @@


<pre class="programlisting">#include <contract.hpp>
-#include <contract/trivial.hpp>
+#include <boost/type_traits/can_call_equal.hpp>
#include <boost/concept_check.hpp>

CONTRACT_FUNCTION(
template( typename T ) requires( boost::LessThanComparable<T> )
(T const&) (min) ( (T const&) x, (T const&) y )
 postcondition(
- using contract::trivial::operator==,
 auto result = return,
- x < y ? result == x : result == y // Trivial == if T has no ==.
+ x < y ? result == x : result == y,
+ requires boost::can_call_equal<T>::value
 )
) {
 return x < y ? x : y; // OK: T is less than comparable `<`.
@@ -2295,8 +2307,8 @@
 CONTRACT_CONSTRUCTOR_TPL(
 public (stack3) ( (const int&) n, (const T&) none, default T() )
 postcondition(
- (n < 0) == (error() == SIZE_ERROR), // error if impossible
- (n >= 0) == !error(), // no error if possible
+ bool(n < 0) == (error() == SIZE_ERROR), // error if impossible
+ bool(n >= 0) == !error(), // no error if possible
 if(bool(!error())) ( capacity() == n ) // created if no error
 )
 initialize( none_(none), representation_(0), error_(NO_ERROR) )
@@ -2837,7 +2849,7 @@
 the_package.weight_kg < 5.0 // within max wight
 )
 postcondition(
- (the_package.delivered_hour - the_package.accepted_hour) <=
+ double(the_package.delivered_hour - the_package.accepted_hour) <=
 3.0, // within max delivery time
 the_package.location == destination // delivered at destination
 )
@@ -2884,7 +2896,8 @@
 )
 postcondition(
 // Stronger postcondition on delivery time (i.e., faster delivery).
- (the_package.delivered_hour - the_package.accepted_hour) <= 2.0
+ double(the_package.delivered_hour - the_package.accepted_hour) <=
+ 2.0
 // Inherits "delivered at destination" postcondition.
 )
 ) ;
@@ -3046,9 +3059,10 @@
<pre class="programlisting">#include <contract.hpp>
#include <vector>

-// Importance ordering used to model assertion computational complexity.
+// Assertion requirements used to model assertion computational complexity.
#define O_1 0 // O(1) constant (default)
#define O_N 1 // O(n) linear
+#define COMPLEXITY_MAX O_1

CONTRACT_CLASS(
template( typename T )
@@ -3141,8 +3155,9 @@
 auto old_count = CONTRACT_OLDOF count(),
 auto old_items = CONTRACT_OLDOF items(),
 count() == old_count - 1, // count decreased
- // Expensive assertion to check so marked using importance.
- all_equal(items(), old_items, 1 /* shifted */), importance O_N
+ // Expensive assertion to check so marked with its complexity.
+ all_equal(items(), old_items, 1 /* shifted */),
+ requires O_N <= COMPLEXITY_MAX
 )
 ) {
 items_.erase(items_.begin());
@@ -3157,8 +3172,8 @@
 count() == old_count + 1, // count increased
 items().at(count() - 1) == item, // second last item
 if(count() >= 2) (
- // Expensive assertion to check so marked using importance.
- all_equal(items(), old_items), importance O_N
+ // Expensive assertion to check so marked with its complexity
+ all_equal(items(), old_items), requires O_N <= COMPLEXITY_MAX
 )
 )
 ) {
@@ -3381,15 +3396,17 @@
#include <list>
#include <algorithm>

-// Importance ordering used to model assertion computational complexity.
+// Assertion requirements used to model assertion computational complexity.
#define O_1 0 // O(1) constant (default)
#define O_N 1 // O(n) linear
+#define COMPLEXITY_MAX O_1

CONTRACT_CLASS( // Subject for observer design pattern.
class (subject)
) {
 CONTRACT_CLASS_INVARIANT(
- all_observers_valid(observers()), importance O_N // observes valid
+ all_observers_valid(observers()), // observes valid
+ requires O_N <= COMPLEXITY_MAX
 )

public:
@@ -3425,7 +3442,8 @@
 auto old_observers = CONTRACT_OLDOF observers(),
 attached(obs), // attached
 other_observers_unchanged(old_observers, observers(), obs),
- importance O_N // others not changed (frame rule)
+ // others not changed (frame rule)
+ requires O_N <= COMPLEXITY_MAX
 )
 ) {
 observers_.push_back(obs);
@@ -3456,7 +3474,7 @@
 i = observers_.begin(); i != observers_.end(); ++i) {
 // Class invariant ensures no null pointers in observers but
 // class invariants not checked for non-public members so check.
- CONTRACT_BLOCK_INVARIANT( 0 != *i ) // pointer not null
+ CONTRACT_BLOCK_INVARIANT( const( i ) 0 != *i ) // pointer not null
 (*i)->update();
 }
 }
@@ -4003,8 +4021,8 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
-<a name="contract__.examples.cline90_vector"></a><a class="link" href="examples.html#contract__.examples.cline90_vector" title="[Cline90] Vector: Comparison with A++ proposal syntax">[Cline90] Vector:
- Comparison with A++ proposal syntax</a>
+<a name="contract__.examples.cline90_vector"></a><a class="link" href="examples.html#contract__.examples.cline90_vector" title="[Cline90] Vector: Comparison with A++ proposed syntax">[Cline90] Vector:
+ Comparison with A++ proposed syntax</a>
</h3></div></div></div>
<div class="informaltable"><table class="table">
<colgroup>
@@ -4173,6 +4191,7 @@

<pre class="programlisting">#include <contract.hpp>
#include <exception>
+#include <new>

CONTRACT_CLASS(
template( typename T )
@@ -4475,6 +4494,81 @@

 
</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="contract__.examples.increment__assertion_requirements_also_for_old_of"></a><a class="link" href="examples.html#contract__.examples.increment__assertion_requirements_also_for_old_of" title="Increment: Assertion requirements also for old-of">Increment:
+ Assertion requirements also for old-of</a>
+</h3></div></div></div>
+
+
+
+<pre class="programlisting">#include <contract.hpp>
+#include <boost/type_traits/can_call_equal.hpp>
+#include <boost/type_traits/can_call_greater.hpp>
+#include <boost/concept_check.hpp>
+#include <boost/utility.hpp>
+#include <iostream>
+
+template< typename T >
+class PreIncrementable {
+ T& x;
+ void return_type ( T& );
+public:
+ BOOST_CONCEPT_USAGE(PreIncrementable) {
+ return_type(++x);
+ }
+};
+
+CONTRACT_FUNCTION(
+template( typename T ) requires( PreIncrementable<T> )
+(T&) (inc) ( (T&) value )
+ postcondition(
+ auto result = return,
+ // skip this old-of copy if `has_oldof<T>::value` is false
+ auto old_value = CONTRACT_OLDOF value,
+ // skip this assertion if `has_oldof<T>::value` is false
+ value > old_value, // also skip if T has no operator>
+ requires contract::has_oldof<T>::value && // need old-of
+ boost::can_call_greater<T>::value, // need >
+ result == value, // skip this assertion if T has no operator==
+ requires boost::can_call_equal<T>::value // need ==
+ )
+) {
+ return ++value;
+}
+
+struct counter : boost::noncopyable { // cannot copy (for some reason...)
+ counter ( ) : number_(0) {}
+
+ counter& operator++ ( ) { ++number_; return *this; }
+
+ friend bool operator> ( counter const& left, counter const& right )
+ { return left.number_ > right.number_; }
+
+ void print ( ) { std::cout << number_ << std::endl; }
+
+private:
+ int number_;
+};
+
+// specialization disables old-of for non-copyable `counter` (no type trait can
+// be implemented in C++ to automatically and portably detect copy constructor)
+namespace contract {
+ template<> struct has_oldof<counter> : boost::mpl::false_ {};
+}
+
+int main() {
+ int i = 0;
+ std::cout << inc(i) << std::endl; // check entire contract for `int` type
+
+ counter c;
+ inc(c).print(); // cannot copy `counter` so skip assertions with old-of
+ return 0;
+}
+</pre>
+
+ 
+</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>

Modified: sandbox/contract/libs/contract/doc/html2/contract__/grammar.html
==============================================================================
--- sandbox/contract/libs/contract/doc/html2/contract__/grammar.html (original)
+++ sandbox/contract/libs/contract/doc/html2/contract__/grammar.html 2011-10-01 13:15:40 EDT (Sat, 01 Oct 2011)
@@ -491,7 +491,7 @@

 For functions other than constructors or constructors without member initializers,
 function-try-blocks are programmed outside the macros and around the body
- definition as usual: [<a name="id956506" href="#ftn.id956506" class="footnote">1</a>]
+ definition as usual: [<a name="id958125" href="#ftn.id958125" class="footnote">1</a>]
 
<pre class="programlisting">CONTRACT_CONSTRUCTOR( // Constructor without member initializers.
(vector) ( void )
@@ -621,30 +621,37 @@
</h3></div></div></div>
<pre class="programlisting">assertion:
 expr-assertion | select-assertion |
- using using-directive | namespace namespace-alias
+ using using-directive |
+ namespace namespace-alias |
+ typedef existing-type new-type-name
</pre>

 Some basic name visibility manipulations are allowed at the local scope where
 the assertions are being declared in case they are ever needed to simplify
 the assertion expressions. Therefore, using-directives and namespace-aliases
- are allowed where assertions are declaraed (this will affect all assertion
- in the specific declaration scope). Note that these name visibility manipulations
- have no effect on the program run-time state and therefore they do not compromise
- the assertion constant-correctness requirement.
+ are allowed where assertions are declared (this will affect all assertions
+ within the specified declaration scope). Note that these name visibility
+ manipulations have no effect on the program run-time state and therefore
+ they do not compromise the assertion constant-correctness requirement.
 
<pre class="programlisting">expr-assertion:
 bool-expr | static_assert(static-bool-expr, string-literal)
- [, importance natural-literal]
+ [, requires static-bool-expr]

select-assertion:
- if(bool-expr) ( expr-assertion, ... )
- [else ( expr-assertion, ... )]
+ if(bool-expr) ( assertion, ... )
+ [else ( assertion, ... )]
</pre>

- Note that select-assertions cannot be nested into one another. Furthermore,
- it is not possible to specify importance ordering for the entire select-assertion
- if-then-else expression. Eventual importance ordering must be specified for
- the single assertions within the select-assertion if-then-else expression.
+ Note that it is not possible to specify assertion requirements (using <code class="computeroutput">requires</code>) for the entire select-assertion
+ if-then-else expression. Eventual assertion requirements must be specified
+ for the single assertion expressions within the select-assertion if-then-else
+ statement and they will never disable the checking of the select-assertion
+ if-condition (use the ternary operator <code class="computeroutput">?
+ :</code> instead of a select-assertion if
+ you need to program a conditional assertion with a condition that is also
+ disabled by the assertion requirements <code class="literal">condition
+ ? assertion-expr : true, requires static-bool</code>).
 
<pre class="programlisting">bool-epxr:
 runtime-bool-expr | const( [type] inscope-var, ... ) const-bool-expr
@@ -1121,7 +1128,7 @@
</div>
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a id="ftn.id956506" href="#id956506" class="para">1</a>] 
+<div class="footnote">[<a id="ftn.id958125" href="#id958125" class="para">1</a>] 
 Rationale. This ensures zero run-time
 overhead for these functions when all contracts are disable at compile-time.
 </div>

Modified: sandbox/contract/libs/contract/doc/html2/contract__/release_notes.html
==============================================================================
--- sandbox/contract/libs/contract/doc/html2/contract__/release_notes.html (original)
+++ sandbox/contract/libs/contract/doc/html2/contract__/release_notes.html 2011-10-01 13:15:40 EDT (Sat, 01 Oct 2011)
@@ -33,38 +33,22 @@

 Remaining open items:
 
-<div class="orderedlist"><ol class="orderedlist" type="1">
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem">
- Allows const( [(type_)] var, ... ) with optional (type_) for const assertions,
- select-assertion if-conditions, and loop variants.
- </li>
-<li class="listitem">
- There were several GCC internal compiler errors when using const-assertions
- in N2081 examples... Why? Can I work around these errors?
- </li>
-<li class="listitem">
- Add support for exception spec. Can I support C++0x-like <code class="computeroutput">notrhow</code>? Can I can support function-try-blocks?
- http://msdn.microsoft.com/en-us/library/e9etx778%28v=vs.71%29.aspx http://www.gotw.ca/gotw/066.htm
+ Replace all PP_NOT with PP_COMPL when no bool conversion is needed.
 </li>
<li class="listitem">
 Include all necessary headers for all files.
 </li>
<li class="listitem">
- Replace all PP_NOT with PP_COMPL when no bool conversion is needed.
- </li>
-<li class="listitem">
- Also allow typedefs within assertions-- anything else?
+ Can the syntax handle <code class="computeroutput">(float[2][3]) (transpose) ( float
+ m[2][3] ) ...</code>
+ and similar uses of <code class="computeroutput">[]</code>?
 </li>
<li class="listitem">
 Implement named parameters.
 </li>
-<li class="listitem">
- Verify that member initializers are part of constructor definition and
- if so move <code class="computeroutput">initialize( ... )</code> to be the very last element in the syntax
- (after pre and post). Instead, I think exception specs are part of the
- declaration -- verify that -- so it's OK if they appear before pre/post.
- </li>
-</ol></div>
+</ul></div>
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: sandbox/contract/libs/contract/doc/html2/index.html
==============================================================================
--- sandbox/contract/libs/contract/doc/html2/index.html (original)
+++ sandbox/contract/libs/contract/doc/html2/index.html 2011-10-01 13:15:40 EDT (Sat, 01 Oct 2011)
@@ -55,7 +55,7 @@
</h2></div></div></div></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left">Last revised: September 21, 2011 at 16:09:23 GMT</td>
+<td align="left">Last revised: September 30, 2011 at 13:23:48 GMT</td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>

Next message: vicente.botet_at_[hidden]: "[Boost-commit] svn:boost r74626 - trunk/boost/chrono/stopwatches/memories"
Previous message: vicente.botet_at_[hidden]: "[Boost-commit] svn:boost r74624 - in trunk/libs/chrono/test: . stopwatch"

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk