regex configuration tweeks, and point release.

[SVN r9225]
This commit is contained in:
John Maddock
2001-02-16 11:26:21 +00:00
parent 973b12c5c8
commit d754f23bcf
48 changed files with 131 additions and 97 deletions

View File

@ -16,7 +16,7 @@
/*
*
* FILE tests.cpp
* VERSION 3.03
* VERSION 3.04
*
* the actual tests conducted by regress.
*
@ -213,7 +213,7 @@ void cpp_tests(const reg_expression<C, T, A>& e, bool recurse = true)
if(s != merge_string)
{
begin_error();
cout << "merge result mismatch: found \"" << s.c_str() << "\" expected \"" << merge_string.c_str() << "\"" << endl;
cout << "merge result mismatch: found \"" << make_narrow(s.c_str()) << "\" expected \"" << make_narrow(merge_string.c_str()) << "\"" << endl;
}
return;
}
@ -715,8 +715,8 @@ void begin_error()
if(line != last_line)
{
cout << "Error in line " << line << " of file " << file << endl;
cout << "Expression: " << expression.c_str() << endl;
cout << "Search text: " << search_text.c_str() << endl;
cout << "Expression: " << make_narrow(expression.c_str()) << endl;
cout << "Search text: " << make_narrow(search_text.c_str()) << endl;
cout << "Flags: ";
bool started = false;
unsigned int id = 0;
@ -726,7 +726,7 @@ void begin_error()
{
if(started)
cout << " | ";
cout << flag_data[id].name;
cout << make_narrow(flag_data[id].name);
started = true;
}
++id;