changed algorithm for iterator_facade::iterator_category

and for filter_iterator


[SVN r21686]

doc/facade-and-adaptor.html

@@ -814,24 +814,19 @@ if (R is a reference type
     && C is convertible to forward_traversal_tag)
 {
     if (C is convertible to random_access_traversal_tag)
-        return random_access_iterator_tag
+        random_access_iterator_tag
     else if (C is convertible to bidirectional_traversal_tag)
-        return bidirectional_iterator_tag
+        bidirectional_iterator_tag
     else
-        return forward_traversal_tag
+        forward_iterator_tag
 }
 else
 {
     if (C is convertible to single_pass_traversal_tag
         && R is convertible to V)
-    {
+        input_iterator_tag
-        if (V is const)
-            return input_iterator_tag
     else
-            return input_iterator_tag and output_iterator_tag
+        C
-    }
-    else
-        return output_iterator_tag
 }
 </pre>
 </li>
@@ -1892,15 +1887,10 @@ private:
     Iterator m_end;   // exposition only
 };
 </pre>
-<p>If <tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::reference</span></tt> is a reference to
+<p>If <tt class="literal"><span class="pre">Iterator</span></tt> models Readable Lvalue Iterator and Forward Traversal
-<tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::value_type</span></tt> and
+Iterator then <tt class="literal"><span class="pre">iterator_category</span></tt> is convertible to
-<tt class="literal"><span class="pre">iterator_traversal&lt;Iterator&gt;::type</span></tt> is convertible to
+<tt class="literal"><span class="pre">std::forward_iterator_tag</span></tt>. Otherwise <tt class="literal"><span class="pre">iterator_category</span></tt> is
-<tt class="literal"><span class="pre">forward_traversal_tag</span></tt> then the <tt class="literal"><span class="pre">iterator_category</span></tt> member is a
+convertible to <tt class="literal"><span class="pre">std::input_iterator_tag</span></tt>.</p>
-type convertible to <tt class="literal"><span class="pre">forward_iterator_tag</span></tt>.  Otherwise
-<tt class="literal"><span class="pre">iterator_category</span></tt> is a type convertible to
-<tt class="literal"><span class="pre">input_iterator_tag</span></tt>.</p>
-<!-- In that last case, I think the implementation produces a tag
-convertible to both input and output, which seems wrong. -JGS -->
 </div>
 <div class="section" id="filter-iterator-requirements">
 <h4><a class="toc-backref" href="#id58" name="filter-iterator-requirements"><tt class="literal"><span class="pre">filter_iterator</span></tt> requirements</a></h4>
@@ -2350,7 +2340,7 @@ LocalWords:  OtherIncrementable Coplien -->
 <hr class="footer" />
 <div class="footer">
 <a class="reference" href="facade-and-adaptor.rst">View document source</a>.
-Generated on: 2004-01-13 14:26 UTC.
+Generated on: 2004-01-13 18:07 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 </div>
 </body>

doc/filter_iterator.html

@@ -91,15 +91,10 @@ private:
     Iterator m_end;   // exposition only
 };
 </pre>
-<p>If <tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::reference</span></tt> is a reference to
+<p>If <tt class="literal"><span class="pre">Iterator</span></tt> models Readable Lvalue Iterator and Forward Traversal
-<tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::value_type</span></tt> and
+Iterator then <tt class="literal"><span class="pre">iterator_category</span></tt> is convertible to
-<tt class="literal"><span class="pre">iterator_traversal&lt;Iterator&gt;::type</span></tt> is convertible to
+<tt class="literal"><span class="pre">std::forward_iterator_tag</span></tt>. Otherwise <tt class="literal"><span class="pre">iterator_category</span></tt> is
-<tt class="literal"><span class="pre">forward_traversal_tag</span></tt> then the <tt class="literal"><span class="pre">iterator_category</span></tt> member is a
+convertible to <tt class="literal"><span class="pre">std::input_iterator_tag</span></tt>.</p>
-type convertible to <tt class="literal"><span class="pre">forward_iterator_tag</span></tt>.  Otherwise
-<tt class="literal"><span class="pre">iterator_category</span></tt> is a type convertible to
-<tt class="literal"><span class="pre">input_iterator_tag</span></tt>.</p>
-<!-- In that last case, I think the implementation produces a tag
-convertible to both input and output, which seems wrong. -JGS -->
 </div>
 <div class="section" id="filter-iterator-requirements">
 <h1><a class="toc-backref" href="#id3" name="filter-iterator-requirements"><tt class="literal"><span class="pre">filter_iterator</span></tt> requirements</a></h1>
@@ -383,7 +378,7 @@ int main()
 <hr class="footer" />
 <div class="footer">
 <a class="reference" href="filter_iterator.rst">View document source</a>.
-Generated on: 2004-01-13 15:59 UTC.
+Generated on: 2004-01-13 18:08 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 </div>
 </body>

doc/filter_iterator_ref.rst

@@ -30,16 +30,10 @@
   };
 
 
-If ``iterator_traits<Iterator>::reference`` is a reference to
+If ``Iterator`` models Readable Lvalue Iterator and Forward Traversal
-``iterator_traits<Iterator>::value_type`` and
+Iterator then ``iterator_category`` is convertible to
-``iterator_traversal<Iterator>::type`` is convertible to
+``std::forward_iterator_tag``. Otherwise ``iterator_category`` is
-``forward_traversal_tag`` then the ``iterator_category`` member is a
+convertible to ``std::input_iterator_tag``.
-type convertible to ``forward_iterator_tag``.  Otherwise
-``iterator_category`` is a type convertible to
-``input_iterator_tag``.
-
-.. In that last case, I think the implementation produces a tag
-   convertible to both input and output, which seems wrong. -JGS
 
 
 ``filter_iterator`` requirements

doc/iterator_facade.html

@@ -486,24 +486,19 @@ if (R is a reference type
     && C is convertible to forward_traversal_tag)
 {
     if (C is convertible to random_access_traversal_tag)
-        return random_access_iterator_tag
+        random_access_iterator_tag
     else if (C is convertible to bidirectional_traversal_tag)
-        return bidirectional_iterator_tag
+        bidirectional_iterator_tag
     else
-        return forward_traversal_tag
+        forward_iterator_tag
 }
 else
 {
     if (C is convertible to single_pass_traversal_tag
         && R is convertible to V)
-    {
+        input_iterator_tag
-        if (V is const)
-            return input_iterator_tag
     else
-            return input_iterator_tag and output_iterator_tag
+        C
-    }
-    else
-        return output_iterator_tag
 }
 </pre>
 </li>
@@ -1137,7 +1132,7 @@ even be superior.</p>
 <hr class="footer" />
 <div class="footer">
 <a class="reference" href="iterator_facade.rst">View document source</a>.
-Generated on: 2004-01-13 14:25 UTC.
+Generated on: 2004-01-13 18:05 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 </div>
 </body>

doc/iterator_facade_ref.rst

@@ -192,24 +192,19 @@ is a type which satisfies the following conditions:
              && C is convertible to forward_traversal_tag)
          {
              if (C is convertible to random_access_traversal_tag)
-                 return random_access_iterator_tag
+                 random_access_iterator_tag
              else if (C is convertible to bidirectional_traversal_tag)
-                 return bidirectional_iterator_tag
+                 bidirectional_iterator_tag
              else
-                 return forward_traversal_tag
+                 forward_iterator_tag
          }
          else
          {
              if (C is convertible to single_pass_traversal_tag
                  && R is convertible to V)
-             {
+                 input_iterator_tag
-                 if (V is const)
-                     return input_iterator_tag
              else
-                     return input_iterator_tag and output_iterator_tag
+                 C
-             }
-             else
-                 return output_iterator_tag
          }
 
      - ``iterator_traversal<X>::type`` is convertible to the most