From da23154da47ba8788aa10e4266037951ea75fc99 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 23 Nov 2020 17:55:09 +0000 Subject: [PATCH] Fix incorrect references to sub_match having a .last member. Fixes https://github.com/boostorg/regex/issues/115. --- doc/html/boost_regex/ref/regex_iterator.html | 4 ++-- doc/html/boost_regex/ref/regex_match.html | 4 ++-- doc/html/boost_regex/ref/regex_replace.html | 4 ++-- doc/html/boost_regex/ref/regex_search.html | 4 ++-- doc/html/index.html | 2 +- doc/regex_iterator.qbk | 4 ++-- doc/regex_match.qbk | 4 ++-- doc/regex_replace.qbk | 4 ++-- doc/regex_search.qbk | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/html/boost_regex/ref/regex_iterator.html b/doc/html/boost_regex/ref/regex_iterator.html index 1bdc0599..39aa982f 100644 --- a/doc/html/boost_regex/ref/regex_iterator.html +++ b/doc/html/boost_regex/ref/regex_iterator.html @@ -203,7 +203,7 @@

- (*it).prefix().last + (*it).prefix().second

@@ -240,7 +240,7 @@

- (*it).suffix().last + (*it).suffix().second

diff --git a/doc/html/boost_regex/ref/regex_match.html b/doc/html/boost_regex/ref/regex_match.html index e4d3b7cb..7af902e3 100644 --- a/doc/html/boost_regex/ref/regex_match.html +++ b/doc/html/boost_regex/ref/regex_match.html @@ -173,7 +173,7 @@

- m.prefix().last + m.prefix().second

@@ -209,7 +209,7 @@

- m.suffix().last + m.suffix().second

diff --git a/doc/html/boost_regex/ref/regex_replace.html b/doc/html/boost_regex/ref/regex_replace.html index 2556384a..660788c5 100644 --- a/doc/html/boost_regex/ref/regex_replace.html +++ b/doc/html/boost_regex/ref/regex_replace.html @@ -135,7 +135,7 @@

calls

-
std::copy(m.prefix().first, m.prefix().last, out),
+
std::copy(m.prefix().first, m.prefix().second, out),
 

 

         and then calls
@@ -150,7 +150,7 @@
 

         calls
       

-
std::copy(last_m.suffix().first, last_m,suffix().last, out)
+
std::copy(last_m.suffix().first, last_m.suffix().second, out)
 

 

         where last_m is a copy of the last match found.
diff --git a/doc/html/boost_regex/ref/regex_search.html b/doc/html/boost_regex/ref/regex_search.html
index f315f325..219df924 100644
--- a/doc/html/boost_regex/ref/regex_search.html
+++ b/doc/html/boost_regex/ref/regex_search.html
@@ -165,7 +165,7 @@
 
 
                 

-                  m.prefix().last
+                  m.prefix().second
                 

               
 
@@ -202,7 +202,7 @@
 
 
                 

-                  m.suffix().last
+                  m.suffix().second
                 

               
 
diff --git a/doc/html/index.html b/doc/html/index.html
index 61eb74b2..74ba0669 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -215,7 +215,7 @@
   

 
 
-
+
Last revised: October 12, 2020 at 17:21:16 GMT
Last revised: November 23, 2020 at 17:52:46 GMT

 

 

 

diff --git a/doc/regex_iterator.qbk b/doc/regex_iterator.qbk
index d3c966ba..92c6c612 100644
--- a/doc/regex_iterator.qbk
+++ b/doc/regex_iterator.qbk
@@ -130,13 +130,13 @@ to a [match_results] object, whose members are set as follows:
 [[`(*it).empty()`][`false`]]
 [[`(*it).prefix().first`][The end of the last match found, or the start 
    of the underlying sequence if this is the first match enumerated]]
-[[`(*it).prefix().last`][The same as the start of the match found:
+[[`(*it).prefix().second`][The same as the start of the match found:
       `(*it)[0].first`]]
 [[`(*it).prefix().matched`][True if the prefix did not match an empty string:
       `(*it).prefix().first != (*it).prefix().second`]]
 [[`(*it).suffix().first`][The same as the end of the match found:
       `(*it)[0].second`]]
-[[`(*it).suffix().last`][The end of the underlying sequence.]]
+[[`(*it).suffix().second`][The end of the underlying sequence.]]
 [[`(*it).suffix().matched`][True if the suffix did not match an empty string:
       `(*it).suffix().first != (*it).suffix().second`]]
 [[`(*it)[0].first`][The start of the sequence of characters that matched the regular expression]]
diff --git a/doc/regex_match.qbk b/doc/regex_match.qbk
index d5039bfc..bd82436b 100644
--- a/doc/regex_match.qbk
+++ b/doc/regex_match.qbk
@@ -85,10 +85,10 @@ given in the table:
 [[`m.size()`][`1 + e.mark_count()`]]
 [[`m.empty()`][`false`]]
 [[`m.prefix().first`][`first`]]
-[[`m.prefix().last`][`first`]]
+[[`m.prefix().second`][`first`]]
 [[`m.prefix().matched`][`false`]]
 [[`m.suffix().first`][`last`]]
-[[`m.suffix().last`][`last`]]
+[[`m.suffix().second`][`last`]]
 [[`m.suffix().matched`][`false`]]
 [[`m[0].first`][`first`]]
 [[`m[0].second`][`last`]]
diff --git a/doc/regex_replace.qbk b/doc/regex_replace.qbk
index 7228ba59..99689438 100644
--- a/doc/regex_replace.qbk
+++ b/doc/regex_replace.qbk
@@ -97,7 +97,7 @@ Otherwise, for each match found, if
 
 calls
 
-   std::copy(m.prefix().first, m.prefix().last, out), 
+   std::copy(m.prefix().first, m.prefix().second, out), 
 
 and then calls
 
@@ -109,7 +109,7 @@ Finally if
 
 calls
 
-   std::copy(last_m.suffix().first, last_m,suffix().last, out) 
+   std::copy(last_m.suffix().first, last_m.suffix().second, out) 
 
 where /last_m/ is a copy of the last match found.
 
diff --git a/doc/regex_search.qbk b/doc/regex_search.qbk
index 6b8ccc46..f7f5fba0 100644
--- a/doc/regex_search.qbk
+++ b/doc/regex_search.qbk
@@ -83,10 +83,10 @@ are given in the table:
 [[`m.size()`][`1 + e.mark_count()`]]
 [[`m.empty()`][`false`]]
 [[`m.prefix().first`][`first`]]
-[[`m.prefix().last`][`m[0].first`]]
+[[`m.prefix().second`][`m[0].first`]]
 [[`m.prefix().matched`][`m.prefix().first != m.prefix().second`]]
 [[`m.suffix().first`][`m[0].second`]]
-[[`m.suffix().last`][`last`]]
+[[`m.suffix().second`][`last`]]
 [[`m.suffix().matched`][`m.suffix().first != m.suffix().second`]]
 [[`m[0].first`][The start of the sequence of characters that matched the regular expression]]
 [[`m[0].second`][The end of the sequence of characters that matched the regular expression]]