feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Tidies up new code, fixed one bug.

Browse Source 
[SVN r20635]
This commit is contained in:
John Maddock
2003-11-04 11:30:44 +00:00
parent 23f71d7727
commit 8324fad77c
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/boost/regex/v4/regex_token_iterator.hpp
View File

@ -44,9 +44,6 @@ namespace boost{
# pragma warning(disable:4700) # pragma warning(disable:4700)
#endif #endif
// testing
#define TEST_BECKER_INTERFACE
template <class BidirectionalIterator, template <class BidirectionalIterator,
class charT, class charT,
class traits, class traits,
@ -54,7 +51,7 @@ template <class BidirectionalIterator,
class regex_token_iterator_implementation class regex_token_iterator_implementation
{ {
typedef basic_regex<charT, traits, Allocator> regex_type; typedef basic_regex<charT, traits, Allocator> regex_type;
#ifdef TEST_BECKER_INTERFACE #if 1
typedef sub_match<BidirectionalIterator> value_type; typedef sub_match<BidirectionalIterator> value_type;
#else #else
typedef std::basic_string<charT> value_type; typedef std::basic_string<charT> value_type;
@ -106,7 +103,7 @@ public:
if(regex_search(first, end, what, *pre, flags) == true) if(regex_search(first, end, what, *pre, flags) == true)
{ {
N = 0; N = 0;
#ifdef TEST_BECKER_INTERFACE #if 1
result = ((subs[N] == -1) ? what.prefix() : what[(int)subs[N]]); result = ((subs[N] == -1) ? what.prefix() : what[(int)subs[N]]);
#else #else
result = ((subs[N] == -1) ? value_type(what.prefix().str()) : value_type(what[(int)subs[N]].str())); result = ((subs[N] == -1) ? value_type(what.prefix().str()) : value_type(what[(int)subs[N]].str()));
@ -115,10 +112,10 @@ public:
} }
else if((subs[N] == -1) && (first != end)) else if((subs[N] == -1) && (first != end))
{ {
#ifdef TEST_BECKER_INTERFACE #if 1
result.first = first; result.first = first;
result.second = end; result.second = end;
result.matched = true; result.matched = (first != end);
#else #else
result = value_type(first, end); result = value_type(first, end);
#endif #endif
@ -145,8 +142,8 @@ public:
if(N+1 < (int)subs.size()) if(N+1 < (int)subs.size())
{ {
++N; ++N;
#ifdef TEST_BECKER_INTERFACE #if 1
result =((subs[N] == -1) ? what.prefix().first : what[subs[N]]); result =((subs[N] == -1) ? what.prefix() : what[subs[N]]);
#else #else
result =((subs[N] == -1) ? value_type(what.prefix().first, what.prefix().second) : value_type(what[subs[N]].first, what[subs[N]].second)); result =((subs[N] == -1) ? value_type(what.prefix().first, what.prefix().second) : value_type(what[subs[N]].first, what[subs[N]].second));
#endif #endif
@ -158,7 +155,7 @@ public:
if(regex_search(last_end, end, what, *pre, ((what[0].first == what[0].second) ? flags | regex_constants::match_not_initial_null : flags))) if(regex_search(last_end, end, what, *pre, ((what[0].first == what[0].second) ? flags | regex_constants::match_not_initial_null : flags)))
{ {
N =0; N =0;
#ifdef TEST_BECKER_INTERFACE #if 1
result =((subs[N] == -1) ? what.prefix() : what[subs[N]]); result =((subs[N] == -1) ? what.prefix() : what[subs[N]]);
#else #else
result =((subs[N] == -1) ? value_type(what.prefix().first, what.prefix().second) : value_type(what[subs[N]].first, what[subs[N]].second)); result =((subs[N] == -1) ? value_type(what.prefix().first, what.prefix().second) : value_type(what[subs[N]].first, what[subs[N]].second));
@ -168,10 +165,10 @@ public:
else if((last_end != end) && (subs[0] == -1)) else if((last_end != end) && (subs[0] == -1))
{ {
N =-1; N =-1;
#ifdef TEST_BECKER_INTERFACE #if 1
result.first = last_end; result.first = last_end;
result.second = end; result.second = end;
result.matched = true; result.matched = (last_end != end);
#else #else
result = value_type(last_end, end); result = value_type(last_end, end);
#endif #endif
@ -192,7 +189,7 @@ private:
typedef shared_ptr<impl> pimpl; typedef shared_ptr<impl> pimpl;
public: public:
typedef basic_regex<charT, traits, Allocator> regex_type; typedef basic_regex<charT, traits, Allocator> regex_type;
#ifdef TEST_BECKER_INTERFACE #if 1
typedef sub_match<BidirectionalIterator> value_type; typedef sub_match<BidirectionalIterator> value_type;
#else #else
typedef std::basic_string<charT> value_type; typedef std::basic_string<charT> value_type;
@ -300,3 +297,4 @@ private: