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

Full merge from trunk at revision 41356 of entire boost-root tree.

Browse Source 
[SVN r41369]
This commit is contained in:
Beman Dawes
2007-11-25 18:07:19 +00:00
parent c48d7bb478
commit ff95eb8d98
40 changed files with 559 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/boost/regex/v4/regex_format.hpp
View File

@ -24,9 +24,16 @@
namespace boost{
#ifdef BOOST_MSVC
#pragma warning(push)
#pragma warning(disable: 4103)
#endif
#ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_PREFIX
#endif
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
//
// Forward declaration:
@ -75,7 +82,7 @@ class basic_regex_formatter
public:
typedef typename traits::char_type char_type;
basic_regex_formatter(OutputIterator o, const Results& r, const traits& t)
: m_traits(t), m_results(r), m_out(o), m_state(output_copy), m_have_conditional(false) {}
: m_traits(t), m_results(r), m_out(o), m_state(output_copy), m_restore_state(output_copy), m_have_conditional(false) {}
OutputIterator format(const char_type* p1, const char_type* p2, match_flag_type f);
OutputIterator format(const char_type* p1, match_flag_type f)
{
@ -108,6 +115,7 @@ private:
const char_type* m_end; // format string end
match_flag_type m_flags; // format flags to use
output_state m_state; // what to do with the next character
output_state m_restore_state; // what state to restore to.
bool m_have_conditional; // we are parsing a conditional
private:
basic_regex_formatter(const basic_regex_formatter&);
@ -362,6 +370,7 @@ void basic_regex_formatter<OutputIterator, Results, traits>::format_escape()
{
case 'l':
++m_position;
m_restore_state = m_state;
m_state = output_next_lower;
breakout = true;
break;
@ -372,6 +381,7 @@ void basic_regex_formatter<OutputIterator, Results, traits>::format_escape()
break;
case 'u':
++m_position;
m_restore_state = m_state;
m_state = output_next_upper;
breakout = true;
break;
@ -495,11 +505,11 @@ void basic_regex_formatter<OutputIterator, Results, traits>::put(char_type c)
return;
case output_next_lower:
c = m_traits.tolower(c);
this->m_state = output_copy;
this->m_state = m_restore_state;
break;
case output_next_upper:
c = m_traits.toupper(c);
this->m_state = output_copy;
this->m_state = m_restore_state;
break;
case output_lower:
c = m_traits.tolower(c);
@ -622,9 +632,16 @@ std::basic_string<charT> regex_format(const match_results<Iterator>& m,
return result;
}
#ifdef BOOST_MSVC
#pragma warning(push)
#pragma warning(disable: 4103)
#endif
#ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_SUFFIX
#endif
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
} // namespace boost