|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r48855 - sandbox/committee/concepts/stdlib
From: dgregor_at_[hidden]
Date: 2008-09-18 11:19:08
Author: dgregor
Date: 2008-09-18 11:19:08 EDT (Thu, 18 Sep 2008)
New Revision: 48855
URL: http://svn.boost.org/trac/boost/changeset/48855
Log:
Address most comments about the iterators chapter
Text files modified:
sandbox/committee/concepts/stdlib/clib-iterators.tex | 216 ++++++++++++++++++++--------------------
1 files changed, 108 insertions(+), 108 deletions(-)
Modified: sandbox/committee/concepts/stdlib/clib-iterators.tex
==============================================================================
--- sandbox/committee/concepts/stdlib/clib-iterators.tex (original)
+++ sandbox/committee/concepts/stdlib/clib-iterators.tex 2008-09-18 11:19:08 EDT (Thu, 18 Sep 2008)
@@ -210,23 +210,23 @@
@\addedConcepts{template<RandomAccessIterator Iter>}@
@\addedConcepts{concept_map RandomAccessIterator<reverse_iterator<Iter> > \{ \}}@
- template <@\changedConcepts{class}{BackInsertionContainer}@ Container> class back_insert_iterator;
- template <@\changedConcepts{class}{BackInsertionContainer}@ Container>
- back_insert_iterator<Container> back_inserter(Container& x);
- @\addedConcepts{template<BackInsertionContainer Container>}@
- @\addedConcepts{concept_map Iterator<back_insert_iterator<Container> > \{ \}}@
-
- template <@\changedConcepts{class}{FrontInsertionContainer}@ Container> class front_insert_iterator;
- template <@\changedConcepts{class}{FrontInsertionContainer}@ Container>
- front_insert_iterator<Container> front_inserter(Container& x);
- @\addedConcepts{template<FrontInsertionContainer Container>}@
- @\addedConcepts{concept_map Iterator<front_insert_iterator<Container> > \{ \}}@
-
- template <@\changedConcepts{class}{InsertionContainer}@ Container> class insert_iterator;
- template <@\changedConcepts{class}{InsertionContainer}@ Container>
- insert_iterator<Container> inserter(Container& x, Container::iterator i);
- @\addedConcepts{template<InsertionContainer Container>}@
- @\addedConcepts{concept_map Iterator<insert_iterator<Container> > \{ \}}@
+ template <@\changedConcepts{class}{BackInsertionContainer}@ Cont@\removedConcepts{ainer}@> class back_insert_iterator;
+ template <@\changedConcepts{class}{BackInsertionContainer}@ Cont@\removedConcepts{ainer}@>
+ back_insert_iterator<Cont@\removedConcepts{ainer}@> back_inserter(Cont@\removedConcepts{ainer}@& x);
+ @\addedConcepts{template<BackInsertionContainer Cont>}@
+ @\addedConcepts{concept_map Iterator<back_insert_iterator<Cont> > \{ \}}@
+
+ template <@\changedConcepts{class}{FrontInsertionContainer}@ Cont@\removedConcepts{ainer}@> class front_insert_iterator;
+ template <@\changedConcepts{class}{FrontInsertionContainer}@ Cont@\removedConcepts{ainer}@>
+ front_insert_iterator<Cont@\removedConcepts{ainer}@> front_inserter(Cont@\removedConcepts{ainer}@& x);
+ @\addedConcepts{template<FrontInsertionContainer Cont>}@
+ @\addedConcepts{concept_map Iterator<front_insert_iterator<Cont> > \{ \}}@
+
+ template <@\changedConcepts{class}{InsertionContainer}@ Cont@\removedConcepts{ainer}@> class insert_iterator;
+ template <@\changedConcepts{class}{InsertionContainer}@ Cont@\removedConcepts{ainer}@>
+ insert_iterator<Cont@\removedConcepts{ainer}@> inserter(Cont@\removedConcepts{ainer}@& x, Cont@\removedConcepts{ainer}@::iterator i);
+ @\addedConcepts{template<InsertionContainer Cont>}@
+ @\addedConcepts{concept_map Iterator<insert_iterator<Cont> > \{ \}}@
template <@\changedConcepts{class}{InputIterator}@ Iter@\removedConcepts{ator}@> class move_iterator;
template <@\changedConcepts{class}{InputIterator}@ Iter@\removedConcepts{ator}@1, @\changedConcepts{class}{InputIterator}@ Iter@\removedConcepts{ator}@2>
@@ -1033,35 +1033,35 @@
\index{back_insert_iterator@\tcode{back_insert_iterator}}%
\begin{codeblock}
namespace std {
- template <@\changedConcepts{class}{BackInsertionContainer}@ Container>
+ template <@\changedConcepts{class}{BackInsertionContainer}@ Cont@\removedConcepts{ainer}@>
class back_insert_iterator @\removedConcepts{:}@
@\removedConcepts{public iterator<output_iterator_tag,void,void,void,void>}@ {
protected:
- Container* container;
+ Cont@\removedConcepts{ainer}@* container;
public:
- typedef Container container_type;
+ typedef Cont@\removedConcepts{ainer}@ container_type;
@\addedConcepts{typedef void value_type;}@
@\addedConcepts{typedef void difference_type;}@
- @\addedConcepts{typedef back_insert_iterator<Container>\& reference;}@
+ @\addedConcepts{typedef back_insert_iterator<Cont>\& reference;}@
@\addedConcepts{typedef void pointer;}@
- explicit back_insert_iterator(Container& x);
- back_insert_iterator<Container>&
- operator=(@\changedConcepts{typename}{const}@ Container::@\changedConcepts{const_reference}{value_type\&}@ value);
- back_insert_iterator<Container>&
- operator=(@\removedConcepts{typename }@Container::value_type&& value);
-
- back_insert_iterator<Container>& operator*();
- back_insert_iterator<Container>& operator++();
- back_insert_iterator<Container> operator++(int);
+ explicit back_insert_iterator(Cont@\removedConcepts{ainer}@& x);
+ back_insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(@\changedConcepts{typename}{const}@ Cont@\removedConcepts{ainer}@::@\changedConcepts{const_reference}{value_type\&}@ value);
+ back_insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(@\removedConcepts{typename }@Cont@\removedConcepts{ainer}@::value_type&& value);
+
+ back_insert_iterator<Cont@\removedConcepts{ainer}@>& operator*();
+ back_insert_iterator<Cont@\removedConcepts{ainer}@>& operator++();
+ back_insert_iterator<Cont@\removedConcepts{ainer}@> operator++(int);
};
- template <@\changedConcepts{class}{BackInsertionContainer}@ Container>
- back_insert_iterator<Container> back_inserter(Container& x);
+ template <@\changedConcepts{class}{BackInsertionContainer}@ Cont@\removedConcepts{ainer}@>
+ back_insert_iterator<Cont@\removedConcepts{ainer}@> back_inserter(Cont@\removedConcepts{ainer}@& x);
- @\addedConcepts{template<BackInsertionContainer Container>}@
- @\addedConcepts{concept_map Iterator<back_insert_iterator<Container> > \{ \}}@
+ @\addedConcepts{template<BackInsertionContainer Cont>}@
+ @\addedConcepts{concept_map Iterator<back_insert_iterator<Cont> > \{ \}}@
}
\end{codeblock}
@@ -1071,7 +1071,7 @@
\index{back_insert_iterator@\tcode{back_insert_iterator}!\tcode{back_insert_iterator}}%
\begin{itemdecl}
-explicit back_insert_iterator(Container& x);
+explicit back_insert_iterator(Cont@\removedConcepts{ainer}@& x);
\end{itemdecl}
\begin{itemdescr}
@@ -1086,8 +1086,8 @@
\index{operator=@\tcode{operator=}!\tcode{back_insert_iterator}}%
\begin{itemdecl}
-back_insert_iterator<Container>&
- operator=(@\changedConcepts{typename}{const}@ Container::@\changedConcepts{const_reference}{value_type\&}@ value);
+back_insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(@\changedConcepts{typename}{const}@ Cont@\removedConcepts{ainer}@::@\changedConcepts{const_reference}{value_type\&}@ value);
\end{itemdecl}
\begin{itemdescr}
@@ -1102,8 +1102,8 @@
\index{operator=@\tcode{operator=}!\tcode{back_insert_iterator}}%
\begin{itemdecl}
-back_insert_iterator<Container>&
- operator=(@\removedConcepts{typename }@Container::value_type&& value);
+back_insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(@\removedConcepts{typename }@Cont@\removedConcepts{ainer}@::value_type&& value);
\end{itemdecl}
\begin{itemdescr}
@@ -1120,7 +1120,7 @@
\index{operator*@\tcode{operator*}!\tcode{back_insert_iterator}}%
\begin{itemdecl}
-back_insert_iterator<Container>& operator*();
+back_insert_iterator<Cont@\removedConcepts{ainer}@>& operator*();
\end{itemdecl}
\begin{itemdescr}
@@ -1133,8 +1133,8 @@
\index{operator++@\tcode{operator++}!\tcode{back_insert_iterator}}%
\begin{itemdecl}
-back_insert_iterator<Container>& operator++();
-back_insert_iterator<Container> operator++(int);
+back_insert_iterator<Cont@\removedConcepts{ainer}@>& operator++();
+back_insert_iterator<Cont@\removedConcepts{ainer}@> operator++(int);
\end{itemdecl}
\begin{itemdescr}
@@ -1147,20 +1147,20 @@
\index{back_inserter@\tcode{back_inserter}}%
\begin{itemdecl}
-template <@\changedConcepts{class}{BackInsertionContainer}@ Container>
- back_insert_iterator<Container> back_inserter(Container& x);
+template <@\changedConcepts{class}{BackInsertionContainer}@ Cont@\removedConcepts{ainer}@>
+ back_insert_iterator<Cont@\removedConcepts{ainer}@> back_inserter(Cont@\removedConcepts{ainer}@& x);
\end{itemdecl}
\begin{itemdescr}
\pnum
\returns\
-\tcode{back_insert_iterator<Container>(x)}.
+\tcode{back_insert_iterator<Cont@\removedConcepts{ainer}@>(x)}.
\end{itemdescr}
\rSec4[back.insert.iter.maps]{Concept maps}
\begin{itemdecl}
-@\addedConcepts{template<BackInsertionContainer Container>}@
- @\addedConcepts{concept_map Iterator<back_insert_iterator<Container> > \{ \}}@
+@\addedConcepts{template<BackInsertionContainer Cont>}@
+ @\addedConcepts{concept_map Iterator<back_insert_iterator<Cont> > \{ \}}@
\end{itemdecl}
\begin{itemdescr}
@@ -1173,35 +1173,35 @@
\index{front_insert_iterator@\tcode{front_insert_iterator}}%
\begin{codeblock}
namespace std {
- template <@\changedConcepts{class}{FrontInsertionContainer}@ Container>
+ template <@\changedConcepts{class}{FrontInsertionContainer}@ Cont@\removedConcepts{ainer}@>
class front_insert_iterator @\removedConcepts{:}@
@\removedConcepts{public iterator<output_iterator_tag,void,void,void,void>}@ {
protected:
- Container* container;
+ Cont@\removedConcepts{ainer}@* container;
public:
- typedef Container container_type;
+ typedef Cont@\removedConcepts{ainer}@ container_type;
@\addedConcepts{typedef void value_type;}@
@\addedConcepts{typedef void difference_type;}@
- @\addedConcepts{typedef front_insert_iterator<Container>\& reference;}@
+ @\addedConcepts{typedef front_insert_iterator<Cont>\& reference;}@
@\addedConcepts{typedef void pointer;}@
- explicit front_insert_iterator(Container& x);
- front_insert_iterator<Container>&
- operator=(@\changedConcepts{typename}{const}@ Container::@\changedConcepts{const_reference}{value_type\&}@ value);
- front_insert_iterator<Container>&
- operator=(@\removedConcepts{typename}@ Container::value_type&& value);
-
- front_insert_iterator<Container>& operator*();
- front_insert_iterator<Container>& operator++();
- front_insert_iterator<Container> operator++(int);
+ explicit front_insert_iterator(Cont@\removedConcepts{ainer}@& x);
+ front_insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(@\changedConcepts{typename}{const}@ Cont@\removedConcepts{ainer}@::@\changedConcepts{const_reference}{value_type\&}@ value);
+ front_insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(@\removedConcepts{typename}@ Cont@\removedConcepts{ainer}@::value_type&& value);
+
+ front_insert_iterator<Cont@\removedConcepts{ainer}@>& operator*();
+ front_insert_iterator<Cont@\removedConcepts{ainer}@>& operator++();
+ front_insert_iterator<Cont@\removedConcepts{ainer}@> operator++(int);
};
- template <@\changedConcepts{class}{FrontInsertionContainer}@ Container>
- front_insert_iterator<Container> front_inserter(Container& x);
+ template <@\changedConcepts{class}{FrontInsertionContainer}@ Cont@\removedConcepts{ainer}@>
+ front_insert_iterator<Cont@\removedConcepts{ainer}@> front_inserter(Cont@\removedConcepts{ainer}@& x);
- @\addedConcepts{template<FrontInsertionContainer Container>}@
- @\addedConcepts{concept_map Iterator<front_insert_iterator<Container> > \{ \}}@
+ @\addedConcepts{template<FrontInsertionContainer Cont>}@
+ @\addedConcepts{concept_map Iterator<front_insert_iterator<Cont> > \{ \}}@
}
\end{codeblock}
@@ -1211,7 +1211,7 @@
\index{front_insert_iterator@\tcode{front_insert_iterator}!\tcode{front_insert_iterator}}%
\begin{itemdecl}
-explicit front_insert_iterator(Container& x);
+explicit front_insert_iterator(Cont@\removedConcepts{ainer}@& x);
\end{itemdecl}
\begin{itemdescr}
@@ -1226,8 +1226,8 @@
\index{operator=@\tcode{operator=}!\tcode{front_insert_iterator}}%
\begin{itemdecl}
-front_insert_iterator<Container>&
- operator=(@\changedConcepts{typename}{const}@ Container::@\changedConcepts{const_reference}{value_type\&}@ value);
+front_insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(@\changedConcepts{typename}{const}@ Cont@\removedConcepts{ainer}@::@\changedConcepts{const_reference}{value_type\&}@ value);
\end{itemdecl}
\begin{itemdescr}
@@ -1242,8 +1242,8 @@
\index{operator=@\tcode{operator=}!\tcode{front_insert_iterator}}%
\begin{itemdecl}
-front_insert_iterator<Container>&
- operator=(@\removedConcepts{typename }@Container::value_type&& value);
+front_insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(@\removedConcepts{typename }@Cont@\removedConcepts{ainer}@::value_type&& value);
\end{itemdecl}
\begin{itemdescr}
@@ -1260,7 +1260,7 @@
\index{operator*@\tcode{operator*}!\tcode{front_insert_iterator}}%
\begin{itemdecl}
-front_insert_iterator<Container>& operator*();
+front_insert_iterator<Cont@\removedConcepts{ainer}@>& operator*();
\end{itemdecl}
\begin{itemdescr}
@@ -1273,8 +1273,8 @@
\index{operator++@\tcode{operator++}!\tcode{front_insert_iterator}}%
\begin{itemdecl}
-front_insert_iterator<Container>& operator++();
-front_insert_iterator<Container> operator++(int);
+front_insert_iterator<Cont@\removedConcepts{ainer}@>& operator++();
+front_insert_iterator<Cont@\removedConcepts{ainer}@> operator++(int);
\end{itemdecl}
\begin{itemdescr}
@@ -1287,20 +1287,20 @@
\index{front_inserter@\tcode{front_inserter}}%
\begin{itemdecl}
-template <@\changedConcepts{class}{FrontInsertionContainer}@ Container>
- front_insert_iterator<Container> front_inserter(Container& x);
+template <@\changedConcepts{class}{FrontInsertionContainer}@ Cont@\removedConcepts{ainer}@>
+ front_insert_iterator<Cont@\removedConcepts{ainer}@> front_inserter(Cont@\removedConcepts{ainer}@& x);
\end{itemdecl}
\begin{itemdescr}
\pnum
\returns\
-\tcode{front_insert_iterator<Container>(x)}.
+\tcode{front_insert_iterator<Cont@\removedConcepts{ainer}@>(x)}.
\end{itemdescr}
\rSec4[front.insert.iter.maps]{Concept maps}
\begin{itemdecl}
-@\addedConcepts{template<FrontInsertionContainer Container>}@
- @\addedConcepts{concept_map Iterator<front_insert_iterator<Container> > \{ \}}@
+@\addedConcepts{template<FrontInsertionContainer Cont>}@
+ @\addedConcepts{concept_map Iterator<front_insert_iterator<Cont> > \{ \}}@
\end{itemdecl}
\begin{itemdescr}
@@ -1313,36 +1313,36 @@
\index{insert_iterator@\tcode{insert_iterator}}%
\begin{codeblock}
namespace std {
- template <@\changedConcepts{class}{InsertionContainer}@ Container>
+ template <@\changedConcepts{class}{InsertionContainer}@ Cont@\removedConcepts{ainer}@>
class insert_iterator @\removedConcepts{:}@
@\removedConcepts{public iterator<output_iterator_tag,void,void,void,void>}@ {
protected:
- Container* container;
- @\removedConcepts{typename }@Container::iterator iter;
+ Cont@\removedConcepts{ainer}@* container;
+ @\removedConcepts{typename }@Cont@\removedConcepts{ainer}@::iterator iter;
public:
- typedef Container container_type;
+ typedef Cont@\removedConcepts{ainer}@ container_type;
@\addedConcepts{typedef void value_type;}@
@\addedConcepts{typedef void difference_type;}@
- @\addedConcepts{typedef insert_iterator<Container>\& reference;}@
+ @\addedConcepts{typedef insert_iterator<Cont>\& reference;}@
@\addedConcepts{typedef void pointer;}@
- insert_iterator(Container& x, @\removedConcepts{typename }@Container::iterator i);
- insert_iterator<Container>&
- operator=(@\changedConcepts{typename}{const}@ Container::@\changedConcepts{const_reference}{value_type\&}@ value);
- insert_iterator<Container>&
- operator=(@\removedConcepts{typename }@Container::value_type&& value);
-
- insert_iterator<Container>& operator*();
- insert_iterator<Container>& operator++();
- insert_iterator<Container>& operator++(int);
+ insert_iterator(Cont@\removedConcepts{ainer}@& x, @\removedConcepts{typename }@Cont@\removedConcepts{ainer}@::iterator i);
+ insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(@\changedConcepts{typename}{const}@ Cont@\removedConcepts{ainer}@::@\changedConcepts{const_reference}{value_type\&}@ value);
+ insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(@\removedConcepts{typename }@Cont@\removedConcepts{ainer}@::value_type&& value);
+
+ insert_iterator<Cont@\removedConcepts{ainer}@>& operator*();
+ insert_iterator<Cont@\removedConcepts{ainer}@>& operator++();
+ insert_iterator<Cont@\removedConcepts{ainer}@>& operator++(int);
};
- template <@\changedConcepts{class}{InsertionContainer}@ Container>
- insert_iterator<Container> inserter(Container& x, Container::iterator i);
+ template <@\changedConcepts{class}{InsertionContainer}@ Cont@\removedConcepts{ainer}@>
+ insert_iterator<Cont@\removedConcepts{ainer}@> inserter(Cont@\removedConcepts{ainer}@& x, Cont@\removedConcepts{ainer}@::iterator i);
- @\addedConcepts{template<InsertionContainer Container>}@
- @\addedConcepts{concept_map Iterator<insert_iterator<Container> > \{ \}}@
+ @\addedConcepts{template<InsertionContainer Cont>}@
+ @\addedConcepts{concept_map Iterator<insert_iterator<Cont> > \{ \}}@
}
\end{codeblock}
@@ -1352,7 +1352,7 @@
\index{insert_iterator@\tcode{insert_iterator}!\tcode{insert_iterator}}%
\begin{itemdecl}
-insert_iterator(Container& x, @\removedConcepts{typename}@ Container::iterator i);
+insert_iterator(Cont@\removedConcepts{ainer}@& x, @\removedConcepts{typename}@ Cont@\removedConcepts{ainer}@::iterator i);
\end{itemdecl}
\begin{itemdescr}
@@ -1369,8 +1369,8 @@
\index{operator=@\tcode{operator=}!\tcode{insert_iterator}}%
\begin{itemdecl}
-insert_iterator<Container>&
- operator=(@\changedConcepts{typename}{const}@ Container::@\changedConcepts{const_reference}{value_type\&}@ value);
+insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(@\changedConcepts{typename}{const}@ Cont@\removedConcepts{ainer}@::@\changedConcepts{const_reference}{value_type\&}@ value);
\end{itemdecl}
\begin{itemdescr}
@@ -1388,8 +1388,8 @@
\index{operator=@\tcode{operator=}!\tcode{insert_iterator}}%
\begin{itemdecl}
-insert_iterator<Container>&
- operator=(Container::value_type&& value);
+insert_iterator<Cont@\removedConcepts{ainer}@>&
+ operator=(Cont@\removedConcepts{ainer}@::value_type&& value);
\end{itemdecl}
\begin{itemdescr}
@@ -1409,7 +1409,7 @@
\index{operator*@\tcode{operator*}!\tcode{insert_iterator}}%
\begin{itemdecl}
-insert_iterator<Container>& operator*();
+insert_iterator<Cont@\removedConcepts{ainer}@>& operator*();
\end{itemdecl}
\begin{itemdescr}
@@ -1422,8 +1422,8 @@
\index{operator++@\tcode{operator++}!\tcode{insert_iterator}}%
\begin{itemdecl}
-insert_iterator<Container>& operator++();
-insert_iterator<Container>& operator++(int);
+insert_iterator<Cont@\removedConcepts{ainer}@>& operator++();
+insert_iterator<Cont@\removedConcepts{ainer}@>& operator++(int);
\end{itemdecl}
\begin{itemdescr}
@@ -1436,20 +1436,20 @@
\index{inserter@\tcode{inserter}}%
\begin{itemdecl}
-template <@\changedConcepts{class}{InsertionContainer}@ Container>
- insert_iterator<Container> inserter(Container& x, @\removedConcepts{typename }@Container::iterator i);
+template <@\changedConcepts{class}{InsertionContainer}@ Cont@\removedConcepts{ainer}@>
+ insert_iterator<Cont@\removedConcepts{ainer}@> inserter(Cont@\removedConcepts{ainer}@& x, @\removedConcepts{typename }@Cont@\removedConcepts{ainer}@::iterator i);
\end{itemdecl}
\begin{itemdescr}
\pnum
\returns\
-\tcode{insert_iterator<Container>(x, i)}.
+\tcode{insert_iterator<Cont@\removedConcepts{ainer}@>(x, i)}.
\end{itemdescr}
\rSec4[insert.iter.maps]{Concept maps}
\begin{itemdecl}
-@\addedConcepts{template<InsertionContainer Container>}@
- @\addedConcepts{concept_map Iterator<insert_iterator<Container> > \{ \}}@
+@\addedConcepts{template<InsertionContainer Cont>}@
+ @\addedConcepts{concept_map Iterator<insert_iterator<Cont> > \{ \}}@
\end{itemdecl}
\begin{itemdescr}
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