From 2d6fea330853ce2fa7c4068fefc98fc0c01aa83e Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sat, 17 Jun 2006 12:48:03 +0000
Subject: [PATCH] Allow match_results::position() to return a valid value for
 partial matches.

[SVN r34324]
---
 doc/Attic/history.html                   | 12 +++++++-----
 doc/Attic/match_results.html             |  4 +++-
 doc/history.html                         | 12 +++++++-----
 doc/match_results.html                   |  4 +++-
 include/boost/regex/v4/match_results.hpp |  2 +-
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/doc/Attic/history.html b/doc/Attic/history.html
index 03159b13..aa36daec 100644
--- a/doc/Attic/history.html
+++ b/doc/Attic/history.html
@@ -26,9 +26,12 @@
       <p></p>
       <P>Boost 1.34</P>
       <UL>
-      	<LI>
-      	Fix for non-greedy repeats and partial matches not working correctly in some cases.
-      	</LI>
+         <LI>
+         Fix for non-greedy repeats and partial matches not working correctly in some 
+         cases.
+         <LI>
+            Changed match_results::position() to return a valid result when *this 
+            represents a partial match.</LI>
       </UL>
       <P>Boost 1.33.1</P>
       <UL>
@@ -159,7 +162,7 @@
          <HR>
       <P></P>
       <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
+         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
          28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
@@ -169,4 +172,3 @@
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/Attic/match_results.html b/doc/Attic/match_results.html
index cb313dc5..6634b90a 100644
--- a/doc/Attic/match_results.html
+++ b/doc/Attic/match_results.html
@@ -300,7 +300,9 @@ difference_type position(unsigned int sub = 0)const;
 </pre>
       <b></b>
       <p><b>Effects:</b> Returns the starting location of sub-expression <EM>sub</EM>, 
-         or -1 if <EM>sub</EM> was not matched <code>.</code></p>
+         or -1 if <EM>sub</EM> was not matched.&nbsp; Note that if this represents a <A href="partial_matches.html">
+            partial match</A> , then <code>position()</code> will return the location of 
+         the partial match even though <code>(*this)[0].matched</code> is <EM>false</EM>.</p>
       <pre><A name=m6></A>
 string_type str(int sub = 0)const;
 </pre>
diff --git a/doc/history.html b/doc/history.html
index 03159b13..aa36daec 100644
--- a/doc/history.html
+++ b/doc/history.html
@@ -26,9 +26,12 @@
       <p></p>
       <P>Boost 1.34</P>
       <UL>
-      	<LI>
-      	Fix for non-greedy repeats and partial matches not working correctly in some cases.
-      	</LI>
+         <LI>
+         Fix for non-greedy repeats and partial matches not working correctly in some 
+         cases.
+         <LI>
+            Changed match_results::position() to return a valid result when *this 
+            represents a partial match.</LI>
       </UL>
       <P>Boost 1.33.1</P>
       <UL>
@@ -159,7 +162,7 @@
          <HR>
       <P></P>
       <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
+         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
          28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
@@ -169,4 +172,3 @@
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/match_results.html b/doc/match_results.html
index cb313dc5..6634b90a 100644
--- a/doc/match_results.html
+++ b/doc/match_results.html
@@ -300,7 +300,9 @@ difference_type position(unsigned int sub = 0)const;
 </pre>
       <b></b>
       <p><b>Effects:</b> Returns the starting location of sub-expression <EM>sub</EM>, 
-         or -1 if <EM>sub</EM> was not matched <code>.</code></p>
+         or -1 if <EM>sub</EM> was not matched.&nbsp; Note that if this represents a <A href="partial_matches.html">
+            partial match</A> , then <code>position()</code> will return the location of 
+         the partial match even though <code>(*this)[0].matched</code> is <EM>false</EM>.</p>
       <pre><A name=m6></A>
 string_type str(int sub = 0)const;
 </pre>
diff --git a/include/boost/regex/v4/match_results.hpp b/include/boost/regex/v4/match_results.hpp
index 3917d704..f56c4941 100644
--- a/include/boost/regex/v4/match_results.hpp
+++ b/include/boost/regex/v4/match_results.hpp
@@ -94,7 +94,7 @@ public:
       if(sub < m_subs.size())
       {
          const sub_match<BidiIterator>& s = m_subs[sub];
-         if(s.matched)
+         if(s.matched || (sub == 2))
          {
             return ::boost::re_detail::distance((BidiIterator)(m_base), (BidiIterator)(s.first));
          }