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

stripped tabs from file.

Browse Source 
[SVN r34560]
This commit is contained in:
John Maddock
2006-07-16 16:06:38 +00:00
parent eb93be73eb
commit 0a998e8bc8
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/boost/regex/icu.hpp
View File

@ -277,8 +277,8 @@ inline u32regex do_make_u32regex(InputIterator i,
conv_type a(i), b(j); conv_type a(i), b(j);
while(a != b) while(a != b)
{ {
v.push_back(*a); v.push_back(*a);
++a; ++a;
} }
if(v.size()) if(v.size())
return u32regex(&*v.begin(), v.size(), opt); return u32regex(&*v.begin(), v.size(), opt);
@ -297,8 +297,8 @@ inline u32regex do_make_u32regex(InputIterator i,
conv_type a(i), b(j); conv_type a(i), b(j);
while(a != b) while(a != b)
{ {
v.push_back(*a); v.push_back(*a);
++a; ++a;
} }
if(v.size()) if(v.size())
return u32regex(&*v.begin(), v.size(), opt); return u32regex(&*v.begin(), v.size(), opt);
@ -315,8 +315,8 @@ inline u32regex do_make_u32regex(InputIterator i,
vector_type v; vector_type v;
while(i != j) while(i != j)
{ {
v.push_back((UCHAR32)(*i)); v.push_back((UCHAR32)(*i));
++a; ++a;
} }
if(v.size()) if(v.size())
return u32regex(&*v.begin(), v.size(), opt); return u32regex(&*v.begin(), v.size(), opt);
@ -880,7 +880,7 @@ inline OutputIterator u32regex_replace(OutputIterator out,
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
<OutputIterator> <OutputIterator>
#endif #endif
( (
re_detail::do_regex_replace( re_detail::do_regex_replace(
re_detail::make_utf32_out(out, static_cast<mpl::int_<sizeof(*first)> const*>(0)), re_detail::make_utf32_out(out, static_cast<mpl::int_<sizeof(*first)> const*>(0)),
re_detail::make_utf32_seq(first, last, static_cast<mpl::int_<sizeof(*first)> const*>(0)), re_detail::make_utf32_seq(first, last, static_cast<mpl::int_<sizeof(*first)> const*>(0)),
@ -902,7 +902,7 @@ inline OutputIterator u32regex_replace(OutputIterator out,
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
<OutputIterator> <OutputIterator>
#endif #endif
( (
re_detail::do_regex_replace( re_detail::do_regex_replace(
re_detail::make_utf32_out(out, static_cast<mpl::int_<sizeof(*first)> const*>(0)), re_detail::make_utf32_out(out, static_cast<mpl::int_<sizeof(*first)> const*>(0)),
re_detail::make_utf32_seq(first, last, static_cast<mpl::int_<sizeof(*first)> const*>(0)), re_detail::make_utf32_seq(first, last, static_cast<mpl::int_<sizeof(*first)> const*>(0)),
@ -924,7 +924,7 @@ inline OutputIterator u32regex_replace(OutputIterator out,
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
<OutputIterator> <OutputIterator>
#endif #endif
( (
re_detail::do_regex_replace( re_detail::do_regex_replace(
re_detail::make_utf32_out(out, static_cast<mpl::int_<sizeof(*first)> const*>(0)), re_detail::make_utf32_out(out, static_cast<mpl::int_<sizeof(*first)> const*>(0)),
re_detail::make_utf32_seq(first, last, static_cast<mpl::int_<sizeof(*first)> const*>(0)), re_detail::make_utf32_seq(first, last, static_cast<mpl::int_<sizeof(*first)> const*>(0)),

4
include/boost/regex/v4/basic_regex_creator.hpp
View File

@ -1185,7 +1185,7 @@ bool basic_regex_creator<charT, traits>::is_bad_repeat(re_syntax_base* pt)
unsigned id = static_cast<re_repeat*>(pt)->id; unsigned id = static_cast<re_repeat*>(pt)->id;
if(id > sizeof(m_bad_repeats) * CHAR_BIT) if(id > sizeof(m_bad_repeats) * CHAR_BIT)
return true; // run out of bits, assume we can't traverse this one. return true; // run out of bits, assume we can't traverse this one.
static const boost::uintmax_t one = 1uL; static const boost::uintmax_t one = 1uL;
return m_bad_repeats & (one << id); return m_bad_repeats & (one << id);
} }
default: default:
@ -1205,7 +1205,7 @@ void basic_regex_creator<charT, traits>::set_bad_repeat(re_syntax_base* pt)
case syntax_element_long_set_rep: case syntax_element_long_set_rep:
{ {
unsigned id = static_cast<re_repeat*>(pt)->id; unsigned id = static_cast<re_repeat*>(pt)->id;
static const boost::uintmax_t one = 1uL; static const boost::uintmax_t one = 1uL;
if(id <= sizeof(m_bad_repeats) * CHAR_BIT) if(id <= sizeof(m_bad_repeats) * CHAR_BIT)
m_bad_repeats |= (one << id); m_bad_repeats |= (one << id);
} }

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

@ -1220,17 +1220,17 @@ void basic_regex_parser<charT, traits>::parse_set_literal(basic_char_set<charT,
char_set.add_range(start_range, end_range); char_set.add_range(start_range, end_range);
if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_dash) if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_dash)
{ {
if(m_end == ++m_position) if(m_end == ++m_position)
{ {
fail(regex_constants::error_brack, m_position - m_base); fail(regex_constants::error_brack, m_position - m_base);
return; return;
} }
if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_set) if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_set)
{ {
// trailing - : // trailing - :
--m_position; --m_position;
return; return;
} }
fail(regex_constants::error_range, m_position - m_base); fail(regex_constants::error_range, m_position - m_base);
return; return;
} }