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

Updated History.

Browse Source 
Added additional tests for regexes that are supposed to be empty.
Added additional test cases for non-greedy repeats.


[SVN r30605]
This commit is contained in:
John Maddock
2005-08-19 16:12:45 +00:00
parent c39176085b
commit 233f083720
5 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
doc/Attic/history.html
View File

@ -24,6 +24,25 @@
</P>
<HR>
<p></p>
<P>Boost 1.33.0 Hotfix</P>
<UL>
<LI>
Fixed broken makefiles.</LI>
<LI>
Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2 when
using /Zc:wchar_t.</LI>
<LI>
Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler
can cope.</LI>
<LI>
Added missing #includes to fileiter.hpp and cpp_regex_traits.hpp, this is
probably an SGI Irix specific fix.</LI>
<LI>
Fixed a bug where non-greedy repeats could in certain strange curcumstances
repeat more times than their maximum value.</LI>
<LI>
Fixed the value returned by basic_regex&lt;&gt;::empty() from a default
constructed object.</LI></UL>
<P>Boost 1.33.0.</P>
<UL>
<LI>

19
doc/history.html
View File

@ -24,6 +24,25 @@
</P>
<HR>
<p></p>
<P>Boost 1.33.0 Hotfix</P>
<UL>
<LI>
Fixed broken makefiles.</LI>
<LI>
Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2 when
using /Zc:wchar_t.</LI>
<LI>
Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler
can cope.</LI>
<LI>
Added missing #includes to fileiter.hpp and cpp_regex_traits.hpp, this is
probably an SGI Irix specific fix.</LI>
<LI>
Fixed a bug where non-greedy repeats could in certain strange curcumstances
repeat more times than their maximum value.</LI>
<LI>
Fixed the value returned by basic_regex&lt;&gt;::empty() from a default
constructed object.</LI></UL>
<P>Boost 1.33.0.</P>
<UL>
<LI>

6
test/regress/test.hpp
View File

@ -60,6 +60,12 @@ void do_test(const charT& c, const tagT& tag)
#ifndef BOOST_NO_STD_LOCALE
test_info<charT>::set_typename(typeid(boost::basic_regex<charT, boost::cpp_regex_traits<charT> >).name());
boost::basic_regex<charT, boost::cpp_regex_traits<charT> > e1;
static bool done_empty_test = false;
if(done_empty_test == false)
{
test_empty(e1);
done_empty_test = true;
}
if(test_locale::cpp_locale_state() == test_locale::test_with_locale)
e1.imbue(test_locale::cpp_locale());
if(test_locale::cpp_locale_state() != test_locale::no_test)

27
test/regress/test_not_regex.hpp
View File

@ -25,6 +25,31 @@
//
struct test_invalid_regex_tag{};
template<class charT, class traits>
void test_empty(boost::basic_regex<charT, traits>& r)
{
if(!r.empty())
{
BOOST_REGEX_TEST_ERROR("Invalid value returned from basic_regex<>::empty().", charT);
}
if(r.size())
{
BOOST_REGEX_TEST_ERROR("Invalid value returned from basic_regex<>::size().", charT);
}
if(r.str().size())
{
BOOST_REGEX_TEST_ERROR("Invalid value returned from basic_regex<>::str().", charT);
}
if(r.begin() != r.end())
{
BOOST_REGEX_TEST_ERROR("Invalid value returned from basic_regex<>::begin().", charT);
}
if(r.status() == 0)
{
BOOST_REGEX_TEST_ERROR("Invalid value returned from basic_regex<>::status().", charT);
}
}
template<class charT, class traits>
void test(boost::basic_regex<charT, traits>& r, const test_invalid_regex_tag&)
{
@ -39,6 +64,7 @@ void test(boost::basic_regex<charT, traits>& r, const test_invalid_regex_tag&)
{
BOOST_REGEX_TEST_ERROR("Expression compiled when it should not have done so.", charT);
}
test_empty(r);
}
catch(...)
{
@ -58,6 +84,7 @@ void test(boost::basic_regex<charT, traits>& r, const test_invalid_regex_tag&)
catch(const boost::bad_expression&)
{
have_catch = true;
test_empty(r);
}
catch(const std::runtime_error& r)
{

14
test/regress/test_simple_repeats.cpp
View File

@ -98,6 +98,20 @@ void test_simple_repeats()
TEST_REGEX_SEARCH("a{ 2 , }", perl, "aaaaa", match_default, make_array(0, 5, -2, -2));
TEST_REGEX_SEARCH("a{ 2 }", perl, "aaa", match_default, make_array(0, 2, -2, -2));
TEST_REGEX_SEARCH("a\\{\\}", perl, "a{}", match_default, make_array(0, 3, -2, -2));
TEST_REGEX_SEARCH("a{2,4}?", perl, "a", match_default, make_array(-2, -2));
TEST_REGEX_SEARCH("a{2,4}?", perl, "aa", match_default, make_array(0, 2, -2, -2));
TEST_REGEX_SEARCH("a{2,4}?", perl, "aaa", match_default, make_array(0, 2, -2, -2));
TEST_REGEX_SEARCH("a{2,4}?", perl, "aaaa", match_default, make_array(0, 2, -2, 2, 4, -2, -2));
TEST_REGEX_SEARCH("a{2,4}?", perl, "aaaaa", match_default, make_array(0, 2, -2, 2, 4, -2, -2));
TEST_REGEX_SEARCH("a{2,4}?$", perl, "aa", match_default, make_array(0, 2, -2, -2));
TEST_REGEX_SEARCH("a{2,4}?$", perl, "aaa", match_default, make_array(0, 3, -2, -2));
TEST_REGEX_SEARCH("a{2,4}?$", perl, "aaaa", match_default, make_array(0, 4, -2, -2));
TEST_REGEX_SEARCH("a{2,4}?$", perl, "aaaaa", match_default, make_array(1, 5, -2, -2));
TEST_REGEX_SEARCH("^a{0,1}?$", perl, "aaaaa", match_default, make_array(-2, -2));
TEST_REGEX_SEARCH("^(?:a){0,1}?$", perl, "aaaaa", match_default, make_array(-2, -2));
TEST_REGEX_SEARCH("^a(?:bc)?", perl, "abcbc", match_any|match_all, make_array(-2, -2));
TEST_INVALID_REGEX("a{}", perl);
TEST_INVALID_REGEX("a{", perl);
TEST_INVALID_REGEX("a{1", perl);