boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-13 04:16:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

A partial Pro6 fix (Pro6 is missing the message facet - what do we do about /that/?)

Browse Source 
[SVN r8031]
This commit is contained in:
Dave Abrahams
2000-10-21 13:14:45 +00:00
parent 74ca42eb88
commit 13df83ab96
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/boost/re_detail/regex_match.hpp
View File

@ -1118,7 +1118,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
else else
{ {
need_init = false; need_init = false;
for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart); for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
{} // dwa 10/20/2000 - warning suppression for MWCW
if(restart != last) if(restart != last)
++restart; ++restart;
_skip_and_inc(clines, last_line, first, restart); _skip_and_inc(clines, last_line, first, restart);
@ -1134,7 +1135,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
} }
else else
{ {
for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart); for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
{} // dwa 10/20/2000 - warning suppression for MWCW
if(restart != last) if(restart != last)
++restart; ++restart;
_skip_and_inc(clines, last_line, first, restart); _skip_and_inc(clines, last_line, first, restart);
@ -1207,7 +1209,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
} }
else else
{ {
for(int k = 0; (restart != first) && (k < j); ++k, --restart); for(int k = 0; (restart != first) && (k < j); ++k, --restart)
{} // dwa 10/20/2000 - warning suppression for MWCW
if(restart != last) if(restart != last)
++restart; ++restart;
_skip_and_inc(clines, last_line, first, restart); _skip_and_inc(clines, last_line, first, restart);
@ -1250,7 +1253,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
else else
{ {
need_init = false; need_init = false;
for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart); for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
{} // dwa 10/20/2000 - warning suppression for MWCW
if(restart != last) if(restart != last)
++restart; ++restart;
_skip_and_inc(clines, last_line, first, restart); _skip_and_inc(clines, last_line, first, restart);
@ -1267,7 +1271,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
} }
else else
{ {
for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart); for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
{} // dwa 10/20/2000 - warning suppression for MWCW
if(restart != last) if(restart != last)
++restart; ++restart;
_skip_and_inc(clines, last_line, first, restart); _skip_and_inc(clines, last_line, first, restart);
@ -1337,7 +1342,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
else else
{ {
need_init = false; need_init = false;
for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart); for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
{} // dwa 10/20/2000 - warning suppression for MWCW
if(restart != last) if(restart != last)
++restart; ++restart;
_skip_and_inc(clines, last_line, first, restart); _skip_and_inc(clines, last_line, first, restart);
@ -1353,7 +1359,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
} }
else else
{ {
for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart); for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
{} // dwa 10/20/2000 - warning suppression for MWCW
if(restart != last) if(restart != last)
++restart; ++restart;
_skip_and_inc(clines, last_line, first, restart); _skip_and_inc(clines, last_line, first, restart);
@ -1411,7 +1418,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
else else
{ {
need_init = false; need_init = false;
for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart); for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
{} // dwa 10/20/2000 - warning suppression for MWCW
if(restart != last) if(restart != last)
++restart; ++restart;
_skip_and_inc(clines, last_line, first, restart); _skip_and_inc(clines, last_line, first, restart);
@ -1427,7 +1435,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
} }
else else
{ {
for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart); for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
{} // dwa 10/20/2000 - warning suppression for MWCW
if(restart != last) if(restart != last)
++restart; ++restart;
_skip_and_inc(clines, last_line, first, restart); _skip_and_inc(clines, last_line, first, restart);

1
src/c_regex_traits.cpp
View File

@ -29,6 +29,7 @@
#include <boost/regex_traits.hpp> #include <boost/regex_traits.hpp>
#include <boost/re_detail/regex_synch.hpp> #include <boost/re_detail/regex_synch.hpp>
#include <boost/re_detail/regex_cstring.hpp> #include <boost/re_detail/regex_cstring.hpp>
#include <wchar.h> // dwa 10/20/2000 - needed for definition of wcslen()
#include "primary_transform.hpp" #include "primary_transform.hpp"

9
src/cpp_regex_traits.cpp
View File

@ -28,17 +28,20 @@
#include <map> #include <map>
#include <boost/cregex.hpp> #include <boost/cregex.hpp>
#include "primary_transform.hpp" #include "primary_transform.hpp"
#include <locale> // dwa 10/20/2000 - needed for definition of std::messages
#include <wchar.h> // dwa 10/20/2000 - needed for wcscpy
#ifndef BOOST_RE_NO_LOCALE_H #ifndef BOOST_RE_NO_LOCALE_H
#ifdef BOOST_MSVC # ifdef BOOST_MSVC
#pragma warning(disable:4786) # pragma warning(disable:4786)
namespace std namespace std
{ {
using ::abs; using ::abs;
using ::mbstate_t; using ::mbstate_t;
} }
#endif # endif
namespace{ namespace{
const unsigned int re_classes_max = 14; const unsigned int re_classes_max = 14;