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

Remove dead files.

Browse Source 
Strip tabs from files.
Fix MSVC-specific workaround that doesn't work on Win64.


[SVN r30002]
This commit is contained in:
John Maddock
2005-07-12 09:49:21 +00:00
parent 4781768515
commit 1991c202ed
7 changed files with 34 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/regex/v4/basic_regex_parser.hpp
View File

@ -74,7 +74,7 @@ private:
std::ptrdiff_t m_paren_start; // where the last seen ')' began (where repeats are inserted).
std::ptrdiff_t m_alt_insert_point; // where to insert the next alternative
bool m_has_case_change; // true if somewhere in the current block the case has changed
#ifdef BOOST_MSVC
#if defined(BOOST_MSVC) && defined(_M_IX86)
// This is an ugly warning suppression workaround (for warnings *inside* std::vector
// that can not otherwise be suppressed)...
BOOST_STATIC_ASSERT(sizeof(long) >= sizeof(void*));

16
include/boost/regex/v4/cpp_regex_traits.hpp
View File

@ -597,7 +597,7 @@ typename cpp_regex_traits_implementation<charT>::string_type
std::string name;
const charT* p0 = p1;
while(p0 != p2)
name.append(1, char(*p0++));
name.append(1, char(*p0++));
#endif
name = lookup_default_collate_name(name);
#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
@ -608,13 +608,13 @@ typename cpp_regex_traits_implementation<charT>::string_type
#else
if(name.size())
{
string_type result;
typedef std::string::const_iterator iter;
iter b = name.begin();
iter e = name.end();
while(b != e)
result.append(1, charT(*b++));
return result;
string_type result;
typedef std::string::const_iterator iter;
iter b = name.begin();
iter e = name.end();
while(b != e)
result.append(1, charT(*b++));
return result;
}
#endif
if(p2 - p1 == 1)

18
include/boost/regex/v4/perl_matcher_non_recursive.hpp
View File

@ -320,12 +320,12 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_startmark()
{
// independent sub-expression, currently this is always recursive:
bool old_independent = m_independent;
m_independent = true;
m_independent = true;
const re_syntax_base* next_pstate = static_cast<const re_jump*>(pstate->next.p)->alt.p->next.p;
pstate = pstate->next.p->next.p;
bool r = match_all_states();
pstate = next_pstate;
m_independent = old_independent;
m_independent = old_independent;
#ifdef BOOST_REGEX_MATCH_EXTRA
if(r && (m_match_flags & match_extra))
{
@ -489,7 +489,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_rep()
return false;
}
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
if(greedy)
{
// try and take the repeat if we can:
@ -553,7 +553,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_slow()
return false;
++count;
}
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
if(greedy)
{
// repeat for as long as we can:
@ -593,7 +593,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_fast()
return match_dot_repeat_slow();
const re_repeat* rep = static_cast<const re_repeat*>(pstate);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
unsigned count = static_cast<unsigned>((std::min)(static_cast<unsigned>(::boost::re_detail::distance(position, last)), static_cast<unsigned>(greedy ? rep->max : rep->min)));
if(rep->min > count)
{
@ -640,7 +640,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_char_repeat()
//
// start by working out how much we can skip:
//
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
std::size_t desired = greedy ? rep->max : rep->min;
if(::boost::is_random_access_iterator<BidiIterator>::value)
{
@ -708,7 +708,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_set_repeat()
//
// start by working out how much we can skip:
//
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
std::size_t desired = greedy ? rep->max : rep->min;
if(::boost::is_random_access_iterator<BidiIterator>::value)
{
@ -770,14 +770,14 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_long_set_repeat()
#ifdef __BORLANDC__
#pragma option push -w-8008 -w-8066 -w-8004
#endif
typedef typename traits::char_class_type mask_type;
typedef typename traits::char_class_type mask_type;
const re_repeat* rep = static_cast<const re_repeat*>(pstate);
const re_set_long<mask_type>* set = static_cast<const re_set_long<mask_type>*>(pstate->next.p);
std::size_t count = 0;
//
// start by working out how much we can skip:
//
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
std::size_t desired = greedy ? rep->max : rep->min;
if(::boost::is_random_access_iterator<BidiIterator>::value)
{

16
include/boost/regex/v4/perl_matcher_recursive.hpp
View File

@ -127,12 +127,12 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_startmark()
{
// independent sub-expression:
bool old_independent = m_independent;
m_independent = true;
m_independent = true;
const re_syntax_base* next_pstate = static_cast<const re_jump*>(pstate->next.p)->alt.p->next.p;
pstate = pstate->next.p->next.p;
r = match_all_states();
pstate = next_pstate;
m_independent = old_independent;
m_independent = old_independent;
#ifdef BOOST_REGEX_MATCH_EXTRA
if(r && (m_match_flags & match_extra))
{
@ -314,7 +314,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_rep()
}
return false;
}
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
if(greedy)
{
// try and take the repeat if we can:
@ -382,7 +382,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_slow()
return false;
++count;
}
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
if(greedy)
{
// normal repeat:
@ -444,7 +444,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_fast()
#pragma warning(push)
#pragma warning(disable:4267)
#endif
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
std::size_t count = (std::min)(static_cast<std::size_t>(::boost::re_detail::distance(position, last)), static_cast<std::size_t>(greedy ? rep->max : rep->min));
if(rep->min > count)
{
@ -505,7 +505,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_char_repeat()
//
// start by working out how much we can skip:
//
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
std::size_t desired = greedy ? rep->max : rep->min;
if(::boost::is_random_access_iterator<BidiIterator>::value)
{
@ -594,7 +594,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_set_repeat()
//
// start by working out how much we can skip:
//
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
std::size_t desired = greedy ? rep->max : rep->min;
if(::boost::is_random_access_iterator<BidiIterator>::value)
{
@ -684,7 +684,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_long_set_repeat()
//
// start by working out how much we can skip:
//
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);
std::size_t desired = greedy ? rep->max : rep->min;
if(::boost::is_random_access_iterator<BidiIterator>::value)
{

16
include/boost/regex/v4/w32_regex_traits.hpp
View File

@ -396,7 +396,7 @@ typename w32_regex_traits_implementation<charT>::string_type
std::string name;
const charT* p0 = p1;
while(p0 != p2)
name.append(1, char(*p0++));
name.append(1, char(*p0++));
#endif
name = lookup_default_collate_name(name);
#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
@ -407,13 +407,13 @@ typename w32_regex_traits_implementation<charT>::string_type
#else
if(name.size())
{
string_type result;
typedef std::string::const_iterator iter;
iter b = name.begin();
iter e = name.end();
while(b != e)
result.append(1, charT(*b++));
return result;
string_type result;
typedef std::string::const_iterator iter;
iter b = name.begin();
iter e = name.end();
while(b != e)
result.append(1, charT(*b++));
return result;
}
#endif
if(p2 - p1 == 1)