Update of /cvsroot/boost/boost/libs/xpressive/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30413
Modified Files:
Jamfile.v2 regress.ipp regress.txt
Log Message:
tests for different format dialects
Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/test/Jamfile.v2,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Jamfile.v2 5 Mar 2007 20:45:53 -0000 1.26
+++ Jamfile.v2 18 Mar 2007 18:30:50 -0000 1.27
@@ -16,7 +16,7 @@
<toolset>msvc,<stdlib>stlport:<define>_STLP_EXPOSE_GLOBALS_IMPLEMENTATION
<library>/boost/test//boost_unit_test_framework
<link>static
-# <define>BOOST_XPRESSIVE_BETTER_ERRORS
+ <define>BOOST_XPRESSIVE_BETTER_ERRORS
;
test-suite "xpressive"
Index: regress.ipp
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/test/regress.ipp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- regress.ipp 5 Mar 2007 20:48:10 -0000 1.5
+++ regress.ipp 18 Mar 2007 18:30:50 -0000 1.6
@@ -210,6 +210,18 @@
{
test.match_flags = test.match_flags &
~regex_constants::format_first_only;
}
+ if(std::string::npos != flg.find('a'))
+ {
+ test.match_flags = test.match_flags |
regex_constants::format_all;
+ }
+ if(std::string::npos != flg.find('p'))
+ {
+ test.match_flags = test.match_flags |
regex_constants::format_perl;
+ }
+ if(std::string::npos != flg.find('d'))
+ {
+ test.match_flags = test.match_flags |
regex_constants::format_sed;
+ }
}
else if(regex_match(line, what, rx_br))
{
Index: regress.txt
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/test/regress.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- regress.txt 4 Mar 2007 18:07:51 -0000 1.5
+++ regress.txt 18 Mar 2007 18:30:50 -0000 1.6
@@ -532,6 +532,22 @@
br7=bold
[end]
+[test64.sed]
+str=Now <foo>is</foo> the time for all <BOLD>good</bald> men</bold> to come to
the aid of their country.
+pat=<(.*?)>(.*?)</(\1)>
+flg=igd
+sub={\1}\2{/\3}
+res=Now {foo}is{/foo} the time for all {BOLD}good</bald> men{/bold} to come to
the aid of their country.
+br0=<foo>is</foo>
+br1=foo
+br2=is
+br3=foo
+br4=<BOLD>good</bald> men</bold>
+br5=BOLD
+br6=good</bald> men
+br7=bold
+[end]
+
[test68]
str=Now is the time for all good men to come to the aid of their country.
pat=o
@@ -578,6 +594,15 @@
br0=Bar
[end]
+[test72.perl]
+str=FooBarfoobar
+pat=bar
+flg=ip
+sub=($`$&)
+res=Foo(FooBar)foobar
+br0=Bar
+[end]
+
[test73]
str=FooBarfoobar
pat=bar
@@ -588,6 +613,16 @@
br1=bar
[end]
+[test73.perl]
+str=FooBarfoobar
+pat=bar
+flg=gip
+sub=($`$&)
+res=Foo(FooBar)foo(FooBarfoobar)
+br0=Bar
+br1=bar
+[end]
+
[test74]
str=FooBarfoobar
pat=bar
@@ -598,6 +633,16 @@
br1=bar
[end]
+[test74.perl]
+str=FooBarfoobar
+pat=bar
+flg=gip
+sub=($'$&)
+res=Foo(foobarBar)foo(bar)
+br0=Bar
+br1=bar
+[end]
+
[test75]
str=fooooo
pat=fo{1,}
@@ -605,25 +650,49 @@
br0=fooooo
[end]
-;[test76]
-;str=fOO bAr BaZ
-;pat=\w+
-;flg=g
-;sub=\L\u$&
-;res=Foo Bar Baz
-;br0=BaZ
-;[end]
+[test76.perl]
+str=fOO bAr BaZ
+pat=\w+
+flg=gp
+sub=\L\u$&
+res=Foo Bar Baz
+br0=fOO
+br1=bAr
+br2=BaZ
+[end]
-;[test77]
-;str=fOO bAr BaZ
-;pat=\w+
-;flg=ga
-;sub=a\LA\Ua\Ea
-;res=aaAa aaAa aaAa
-;br0=fOO
-;br1=bAr
-;br2=BaZ
-;[end]
+[test76.all]
+str=fOO bAr BaZ
+pat=\w+
+flg=ga
+sub=\L\u$&
+res=Foo Bar Baz
+br0=fOO
+br1=bAr
+br2=BaZ
+[end]
+
+[test77.perl]
+str=fOO bAr BaZ
+pat=\w+
+flg=gp
+sub=a\LA\Ua\Ea
+res=aaAa aaAa aaAa
+br0=fOO
+br1=bAr
+br2=BaZ
+[end]
+
+[test77.all]
+str=fOO bAr BaZ
+pat=\w+
+flg=ga
+sub=a\LA\Ua\Ea
+res=aaAa aaAa aaAa
+br0=fOO
+br1=bAr
+br2=BaZ
+[end]
[test78]
str=This (has) parens
@@ -1281,6 +1350,21 @@
br6=
[end]
+[test161.sed]
+str=foo
+pat=\w??
+sub=<&>
+flg=gd
+res=<><f><><o><><o><>
+br0=
+br1=f
+br2=
+br3=o
+br4=
+br5=o
+br6=
+[end]
+
[test162]
str=foo
pat=()
@@ -3544,3 +3628,24 @@
br3=
br4=c
[end]
+
+[replace1]
+str=acab
+pat=(a(c)?)|(b)
+flg=iga
+sub=(?1(?2(C:):A):B:)
+res=C:AB:
+br0=ac
+br1=ac
+br2=c
+br3=
+br4=a
+br5=a
+br6=
+br7=
+br8=b
+br9=
+br10=
+br11=b
+[end]
+
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
