Merged regex-4 branch.

[SVN r18430]

example/Jamfile

@@ -38,11 +38,14 @@ test-suite regex-examples :
 [ regex-test-run snippets/regex_grep_example_4.cpp : $(BOOST_ROOT)/boost/rational.hpp ]
 [ regex-test-run snippets/regex_match_example.cpp : -auto ]
 [ regex-test-run snippets/regex_merge_example.cpp : $(BOOST_ROOT)/boost/rational.hpp ]
+[ regex-test-run snippets/regex_replace_example.cpp : $(BOOST_ROOT)/boost/rational.hpp ]
 [ regex-test-run snippets/regex_search_example.cpp : $(BOOST_ROOT)/boost/rational.hpp ]
 [ regex-test-run snippets/regex_split_example_1.cpp : -auto ]
-[ regex-test-run snippets/regex_split_example_2.cpp : $(BOOST_ROOT)/libs/regex/index.htm ]
+[ regex-test-run snippets/regex_split_example_2.cpp : $(BOOST_ROOT)/libs/regex/doc/index.html ]
 
 ;
 
 
 
+
+

example/jgrep/jgrep.cpp

@@ -19,6 +19,7 @@
   */
 
 #include <stdio.h>
+#include <algorithm>
 #include <boost/regex.hpp>
 #ifdef JM_OLD_IOSTREAM
 #include <iostream.h>
@@ -33,7 +34,11 @@ using std::endl;
 #  pragma hrdstop
 #endif
 
+#ifdef BOOST_REGEX_V3
 #include <boost/regex/v3/fileiter.hpp>
+#else
+#include <boost/regex/v4/fileiter.hpp>
+#endif
 
 #include "jgrep.h"
 
@@ -47,10 +52,10 @@ class ogrep_predicate
    unsigned int& lines;
    const char* filename;
    unsigned int last_line;
-   iterator end_of_storage;
+   iterator end_of_storage, last_line_start;
 public:
-   ogrep_predicate(unsigned int& i, const char* p, iterator e) : lines(i), filename(p), last_line(-1), end_of_storage(e) {}
-   ogrep_predicate(const ogrep_predicate& o) : lines(o.lines), filename(o.filename), last_line(o.last_line), end_of_storage(o.end_of_storage) {}
+   ogrep_predicate(unsigned int& i, const char* p, iterator start, iterator end) : lines(i), filename(p), last_line(-1), end_of_storage(end), last_line_start(start) {}
+   ogrep_predicate(const ogrep_predicate& o) : lines(o.lines), filename(o.filename), last_line(o.last_line), end_of_storage(o.end_of_storage), last_line_start(o.last_line_start) {}
    bool operator () (const boost::match_results<iterator, Allocator>& i);
 };
 
@@ -63,42 +68,54 @@ public:
 template <class iterator, class Allocator>
 bool ogrep_predicate<iterator, Allocator>::operator()(const boost::match_results<iterator, Allocator>& i)
 {
+   // if we haven't printed the filename yet, then do it now:
    if(last_line == (unsigned int)-1)
+   {
       cout << "File " << filename << ":" << endl;
-   if(last_line != i.line())
+      last_line = 0;
+   }
+   // calculate which line we are on, by adding the number of newlines 
+   // we've skipped in the last search:
+   int current_line = last_line + std::count(last_line_start, end_of_storage, '\n');
+   // if we haven't already printed this line out, then do it now:
+   if(last_line != current_line)
    {
       ++lines;
-      last_line = i.line();
+      last_line = current_line;
       if(count_only == 0)
       {
          if(show_lines)
-            cout << i.line() << "\t";
-         iterator ptr = i.line_start();
-         while((ptr != end_of_storage) && (*ptr != '\n'))++ptr;
-         iterator pos = i.line_start();
-         while(pos != ptr)
+            cout << current_line << "\t";
+         const char* nls = "\n";
+         iterator ptr = std::find_end(last_line_start, i[0].first, nls, nls+1);
+         ++ptr;
+         iterator ptr2 = ptr;
+         while((ptr2 != end_of_storage) && (*ptr2 != '\n'))++ptr2;
+         while(ptr != ptr2)
          {
-            cout.put(*pos);
-            ++pos;
+            cout.put(*ptr);
+            ++ptr;
          }
          cout << endl;
       }
    }
+   // set the last line seen to the start of the current match:
+   last_line_start = i[0].first;
    return true;
 }
 
+using namespace boost;
 
 void process_grep(const char* file)
 {
    try{
-   using namespace boost;
    mapfile f(file);
    unsigned int count = 0;
-   ogrep_predicate<mapfile::iterator, allocator_type> oi(count, file, f.end());
+   ogrep_predicate<mapfile::iterator, boost::match_results<mapfile::iterator>::allocator_type> oi(count, file, f.begin(), f.end());
    if(files_only)
    {
       bool ok;
-      boost::match_results<mapfile::iterator, allocator_type> m;
+      boost::match_results<mapfile::iterator> m;
          ok = regex_search(f.begin(), f.end(), m, e, match_not_dot_newline | match_not_dot_null);
       if(ok)
          cout << "File " << file << endl;

example/jgrep/main.cpp

@@ -34,7 +34,11 @@ using std::endl;
 #  pragma hrdstop
 #endif
 
+#ifdef BOOST_REGEX_V3
 #include <boost/regex/v3/fileiter.hpp>
+#else
+#include <boost/regex/v4/fileiter.hpp>
+#endif
 #include "jgrep.h"
 
 #ifndef JM_ALGO_INCLUDED
@@ -165,6 +169,8 @@ void parse_switch(const char* flag)
    }
 }
 
+using namespace boost;
+
 void HandleFile(const char* wild)
 {
    using namespace boost;
@@ -226,14 +232,14 @@ void HandleArg(const char* arg)
       {
          if(words_only == 0)
          {
-            e.set_expression(arg, use_case ? regbase::normal : regbase::normal | regbase::icase);
+            e.set_expression(arg, use_case ? regex::normal : regbase::normal | regbase::icase);
             //ei.set_expression(arg);
          }
          else
          {
             char* buf = new char[std::strlen(arg) + 8];
             std::sprintf(buf, "\\<%s\\>", arg);
-            e.set_expression(buf, use_case ? regbase::normal : regbase::normal | regbase::icase);
+            e.set_expression(buf, use_case ? regex::normal : regbase::normal | regbase::icase);
             //ei.set_expression(buf);
             delete[] buf;
          }
@@ -255,7 +261,7 @@ void HandleArg(const char* arg)
          }
          if(words_only)
             std::strcat(buf2, "\\>");
-         e.set_expression(buf2, use_case ? regbase::normal : regbase::normal | regbase::icase);
+         e.set_expression(buf2, use_case ? regex::normal : regbase::normal | regbase::icase);
          //ei.set_expression(buf2);
          delete[] buf2;
       }

example/snippets/credit_card_example.cpp

@@ -35,12 +35,12 @@ const std::string human_format("\\1-\\2-\\3-\\4");
 
 std::string machine_readable_card_number(const std::string& s)
 {
-   return boost::regex_merge(s, e, machine_format, boost::match_default | boost::format_sed);
+   return boost::regex_replace(s, e, machine_format, boost::match_default | boost::format_sed);
 }
 
 std::string human_readable_card_number(const std::string& s)
 {
-   return boost::regex_merge(s, e, human_format, boost::match_default | boost::format_sed);
+   return boost::regex_replace(s, e, human_format, boost::match_default | boost::format_sed);
 }
 
 #include <iostream>

example/snippets/regex_grep_example_1.cpp

@@ -29,7 +29,7 @@
 // and searches for all the C++ class definitions, storing
 // their locations in a map of strings/int's
 
-typedef std::map<std::string, int, std::less<std::string> > map_type;
+typedef std::map<std::string, std::string::difference_type, std::less<std::string> > map_type;
 
 const char* re = 
    // possibly leading whitespace:   
@@ -61,7 +61,7 @@ class IndexClassesPred
    std::string::const_iterator base;
 public:
    IndexClassesPred(map_type& a, std::string::const_iterator b) : m(a), base(b) {}
-   bool operator()(const boost::match_results<std::string::const_iterator, boost::regex::allocator_type>& what)
+   bool operator()(const boost::match_results<std::string::const_iterator>& what)
    {
       // what[0] contains the whole string
       // what[5] contains the class name.

example/snippets/regex_grep_example_2.cpp

@@ -30,7 +30,7 @@
 // and searches for all the C++ class definitions, storing
 // their locations in a map of strings/int's
 
-typedef std::map<std::string, int, std::less<std::string> > map_type;
+typedef std::map<std::string, std::string::difference_type, std::less<std::string> > map_type;
 
 const char* re = 
    // possibly leading whitespace:   
@@ -59,7 +59,7 @@ boost::regex expression(re);
 map_type class_index;
 std::string::const_iterator base;
 
-bool grep_callback(const boost::match_results<std::string::const_iterator, boost::regex::allocator_type>& what)
+bool grep_callback(const boost::match_results<std::string::const_iterator>& what)
 {
    // what[0] contains the whole string
    // what[5] contains the class name.

example/snippets/regex_grep_example_3.cpp

@@ -31,7 +31,7 @@
 // and searches for all the C++ class definitions, storing
 // their locations in a map of strings/int's
 
-typedef std::map<std::string, int, std::less<std::string> > map_type;
+typedef std::map<std::string, std::string::difference_type, std::less<std::string> > map_type;
 
 const char* re = 
    // possibly leading whitespace:   
@@ -62,7 +62,7 @@ class class_index
    map_type index;
    std::string::const_iterator base;
 
-   bool grep_callback(boost::match_results<std::string::const_iterator, boost::regex::allocator_type> what);
+   bool grep_callback(boost::match_results<std::string::const_iterator> what);
 public:
    map_type& get_map() { return index; }
    void IndexClasses(const std::string& file);
@@ -72,7 +72,7 @@ public:
         {}
 };
 
-bool class_index::grep_callback(boost::match_results<std::string::const_iterator, boost::regex::allocator_type> what)
+bool class_index::grep_callback(boost::match_results<std::string::const_iterator> what)
 {
    // what[0] contains the whole string
    // what[5] contains the class name.

example/snippets/regex_grep_example_4.cpp

@@ -63,9 +63,9 @@ class class_index
    boost::regex expression;
    map_type index;
    std::string::const_iterator base;
-   typedef boost::match_results<std::string::const_iterator, boost::regex::allocator_type> arg_type;
+   typedef boost::match_results<std::string::const_iterator> arg_type;
 
-   bool grep_callback(const boost::match_results<std::string::const_iterator, boost::regex::allocator_type>& what);
+   bool grep_callback(const boost::match_results<std::string::const_iterator>& what);
 public:
    map_type& get_map() { return index; }
    typedef bool (__closure* grep_callback_type)(const arg_type&);
@@ -76,7 +76,7 @@ public:
         {}
 };
 
-bool class_index::grep_callback(const boost::match_results<std::string::const_iterator, boost::regex::allocator_type>& what)
+bool class_index::grep_callback(const boost::match_results<std::string::const_iterator>& what)
 {
    // what[0] contains the whole string
    // what[5] contains the class name.

example/snippets/regex_merge_example.cpp

@@ -73,12 +73,12 @@ int main(int argc, const char** argv)
       // temporary string stream
       std::ostringstream t(std::ios::out | std::ios::binary);
       std::ostream_iterator<char> oi(t);
-      boost::regex_merge(oi, in.begin(), in.end(), e2, pre_format);
+      boost::regex_merge(oi, in.begin(), in.end(), e2, pre_format, boost::match_default | boost::format_all);
       // then output to final output stream
       // adding syntax highlighting:
       std::string s(t.str());
       std::ostream_iterator<char> out(os);
-      boost::regex_merge(out, s.begin(), s.end(), e1, format_string);
+      boost::regex_merge(out, s.begin(), s.end(), e1, format_string, boost::match_default | boost::format_all);
       os << footer_text;
    }
    }

example/snippets/regex_search_example.cpp

@@ -29,7 +29,7 @@
 // and searches for all the C++ class definitions, storing
 // their locations in a map of strings/int's
 
-typedef std::map<std::string, int, std::less<std::string> > map_type;
+typedef std::map<std::string, std::string::difference_type, std::less<std::string> > map_type;
 
 const char* re = 
    // possibly leading whitespace:   
@@ -62,7 +62,7 @@ void IndexClasses(map_type& m, const std::string& file)
    start = file.begin();
    end = file.end();   
    boost::match_results<std::string::const_iterator> what;
-   unsigned int flags = boost::match_default;
+   boost::match_flag_type flags = boost::match_default;
    while(boost::regex_search(start, end, what, expression, flags))   
    {
       // what[0] contains the whole string

example/snippets/regex_split_example_2.cpp

@@ -28,7 +28,7 @@
 #include <boost/regex.hpp>
 
 boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*)\"",
-               boost::regbase::normal | boost::regbase::icase);
+               boost::regex::normal | boost::regbase::icase);
 
 void load_file(std::string& s, std::istream& is)
 {