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

Fixed test program after changes to regex_match code.

Browse Source 
[SVN r14111]
This commit is contained in:
John Maddock
2002-06-08 10:37:47 +00:00
parent b2c4abc9cf
commit de40dac5d1
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test/regress/tests.cpp
View File

@ -594,20 +594,31 @@ void cpp_hl_tests(RegEx& e, bool recurse = true)
} }
} }
if((matches[0] == 0) && (e.Match(search_text.c_str(), flags[3]))) //
// test RegEx::Match only if we expect to match all of the input:
//
if((matches[0] == 0) && (matches[1] == search_text.size()))
{ {
unsigned int i = 0; if(e.Match(search_text.c_str(), flags[3]))
unsigned int j = 0;
while(matches[j] != -2)
{ {
if( (matches[j] != (int)e.Position(i)) unsigned int i = 0;
|| ((matches[j] != -1) && ((matches[j+1] - matches[j] != (int)e.Length(i)))) ) unsigned int j = 0;
while(matches[j] != -2)
{ {
begin_error(); if( (matches[j] != (int)e.Position(i))
cout << "RegEx::Match error in subexpression " << i << ": found [" << e.Position(i) << "," << (e.Position(i) + e.Length(i)) << "] expected [" << matches[j] << "," << matches[j+1] << "]" << endl; || ((matches[j] != -1) && ((matches[j+1] - matches[j] != (int)e.Length(i)))) )
{
begin_error();
cout << "RegEx::Match error in subexpression " << i << ": found [" << e.Position(i) << "," << (e.Position(i) + e.Length(i)) << "] expected [" << matches[j] << "," << matches[j+1] << "]" << endl;
}
++i;
j += 2;
} }
++i; }
j += 2; else
{
begin_error();
cout << "Match expected but not found with RegEx::Match" << endl;
} }
} }
} }