From 207b0c63cd5b1bf267b11b34ef8b571210f81ec5 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Sat, 6 Dec 2003 12:11:49 +0000 Subject: [PATCH] Changed to use new iterator typedefs. [SVN r21161] --- doc/Attic/regex_iterator.html | 9 ++++----- doc/Attic/regex_token_iterator.html | 14 ++++++-------- doc/regex_iterator.html | 9 ++++----- doc/regex_token_iterator.html | 14 ++++++-------- example/snippets/regex_iterator_example.cpp | 4 ++-- example/snippets/regex_token_iterator_eg_1.cpp | 4 ++-- example/snippets/regex_token_iterator_eg_2.cpp | 10 ++++------ 7 files changed, 28 insertions(+), 36 deletions(-) diff --git a/doc/Attic/regex_iterator.html b/doc/Attic/regex_iterator.html index c8440154..7e77f6b7 100644 --- a/doc/Attic/regex_iterator.html +++ b/doc/Attic/regex_iterator.html @@ -396,9 +396,9 @@ map_type class_index; load_file(text, fs); // construct our iterators: - boost::regex_iterator<std::string::const_iterator> m1(text.begin(), text.end(), expression); - boost::regex_iterator<std::string::const_iterator> m2; - std::for_each(m1, m2, ®ex_callback); + boost::sregex_iterator m1(text.begin(), text.end(), expression); + boost::sregex_iterator m2; + std::for_each(m1, m2, &regex_callback); // copy results: cout << class_index.size() << " matches found" << endl; @@ -424,8 +424,7 @@ color= 24 Oct 2003

© Copyright John Maddock 1998- - - 2003

+ 2003

Use, modification and distribution are subject to the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/Attic/regex_token_iterator.html b/doc/Attic/regex_token_iterator.html index ccec08e0..2bc28310 100644 --- a/doc/Attic/regex_token_iterator.html +++ b/doc/Attic/regex_token_iterator.html @@ -191,8 +191,8 @@ regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const reg s = "This is a string of tokens"; boost::regex re("\\s+"); - boost::regex_token_iterator<std::string::const_iterator> i(s.begin(), s.end(), re, -1); - boost::regex_token_iterator<std::string::const_iterator> j; + boost::sregex_token_iterator i(s.begin(), s.end(), re, -1); + boost::sregex_token_iterator j; unsigned count = 0; while(i != j) @@ -246,9 +246,8 @@ boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*) s.erase(); std::ifstream is(argv[i]); load_file(s, is); - boost::regex_token_iterator<std::string::const_iterator> - i(s.begin(), s.end(), e, 1); - boost::regex_token_iterator<std::string::const_iterator> j; + boost::sregex_token_iterator i(s.begin(), s.end(), e, 1); + boost::sregex_token_iterator j; while(i != j) { std::cout << *i++ << std::endl; @@ -266,9 +265,8 @@ boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*) std::ifstream is(argv[i]); load_file(s, is); const int subs[] = {1, 0,}; - boost::regex_token_iterator<std::string::const_iterator> - i(s.begin(), s.end(), e, subs); - boost::regex_token_iterator<std::string::const_iterator> j; + boost::sregex_token_iterator i(s.begin(), s.end(), e, subs); + boost::sregex_token_iterator j; while(i != j) { std::cout << *i++ << std::endl; diff --git a/doc/regex_iterator.html b/doc/regex_iterator.html index c8440154..7e77f6b7 100644 --- a/doc/regex_iterator.html +++ b/doc/regex_iterator.html @@ -396,9 +396,9 @@ map_type class_index; load_file(text, fs); // construct our iterators: - boost::regex_iterator<std::string::const_iterator> m1(text.begin(), text.end(), expression); - boost::regex_iterator<std::string::const_iterator> m2; - std::for_each(m1, m2, ®ex_callback); + boost::sregex_iterator m1(text.begin(), text.end(), expression); + boost::sregex_iterator m2; + std::for_each(m1, m2, &regex_callback); // copy results: cout << class_index.size() << " matches found" << endl; @@ -424,8 +424,7 @@ color= 24 Oct 2003

© Copyright John Maddock 1998- - - 2003

+ 2003

Use, modification and distribution are subject to the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/regex_token_iterator.html b/doc/regex_token_iterator.html index ccec08e0..2bc28310 100644 --- a/doc/regex_token_iterator.html +++ b/doc/regex_token_iterator.html @@ -191,8 +191,8 @@ regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const reg s = "This is a string of tokens"; boost::regex re("\\s+"); - boost::regex_token_iterator<std::string::const_iterator> i(s.begin(), s.end(), re, -1); - boost::regex_token_iterator<std::string::const_iterator> j; + boost::sregex_token_iterator i(s.begin(), s.end(), re, -1); + boost::sregex_token_iterator j; unsigned count = 0; while(i != j) @@ -246,9 +246,8 @@ boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*) s.erase(); std::ifstream is(argv[i]); load_file(s, is); - boost::regex_token_iterator<std::string::const_iterator> - i(s.begin(), s.end(), e, 1); - boost::regex_token_iterator<std::string::const_iterator> j; + boost::sregex_token_iterator i(s.begin(), s.end(), e, 1); + boost::sregex_token_iterator j; while(i != j) { std::cout << *i++ << std::endl; @@ -266,9 +265,8 @@ boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*) std::ifstream is(argv[i]); load_file(s, is); const int subs[] = {1, 0,}; - boost::regex_token_iterator<std::string::const_iterator> - i(s.begin(), s.end(), e, subs); - boost::regex_token_iterator<std::string::const_iterator> j; + boost::sregex_token_iterator i(s.begin(), s.end(), e, subs); + boost::sregex_token_iterator j; while(i != j) { std::cout << *i++ << std::endl; diff --git a/example/snippets/regex_iterator_example.cpp b/example/snippets/regex_iterator_example.cpp index c88b96eb..a541ffb0 100644 --- a/example/snippets/regex_iterator_example.cpp +++ b/example/snippets/regex_iterator_example.cpp @@ -90,8 +90,8 @@ int main(int argc, const char** argv) std::ifstream fs(argv[i]); load_file(text, fs); // construct our iterators: - boost::regex_iterator m1(text.begin(), text.end(), expression); - boost::regex_iterator m2; + boost::sregex_iterator m1(text.begin(), text.end(), expression); + boost::sregex_iterator m2; std::for_each(m1, m2, ®ex_callback); // copy results: cout << class_index.size() << " matches found" << endl; diff --git a/example/snippets/regex_token_iterator_eg_1.cpp b/example/snippets/regex_token_iterator_eg_1.cpp index 613a2602..e49bf0a3 100644 --- a/example/snippets/regex_token_iterator_eg_1.cpp +++ b/example/snippets/regex_token_iterator_eg_1.cpp @@ -54,8 +54,8 @@ int main(int argc) s = "This is a string of tokens"; boost::regex re("\\s+"); - boost::regex_token_iterator i(s.begin(), s.end(), re, -1); - boost::regex_token_iterator j; + boost::sregex_token_iterator i(s.begin(), s.end(), re, -1); + boost::sregex_token_iterator j; unsigned count = 0; while(i != j) diff --git a/example/snippets/regex_token_iterator_eg_2.cpp b/example/snippets/regex_token_iterator_eg_2.cpp index 54735872..0eef3c30 100644 --- a/example/snippets/regex_token_iterator_eg_2.cpp +++ b/example/snippets/regex_token_iterator_eg_2.cpp @@ -53,9 +53,8 @@ int main(int argc, char** argv) s.erase(); std::ifstream is(argv[i]); load_file(s, is); - boost::regex_token_iterator - i(s.begin(), s.end(), e, 1); - boost::regex_token_iterator j; + boost::sregex_token_iterator i(s.begin(), s.end(), e, 1); + boost::sregex_token_iterator j; while(i != j) { std::cout << *i++ << std::endl; @@ -73,9 +72,8 @@ int main(int argc, char** argv) std::ifstream is(argv[i]); load_file(s, is); const int subs[] = {1, 0,}; - boost::regex_token_iterator - i(s.begin(), s.end(), e, subs); - boost::regex_token_iterator j; + boost::sregex_token_iterator i(s.begin(), s.end(), e, subs); + boost::sregex_token_iterator j; while(i != j) { std::cout << *i++ << std::endl;