[Boost-commit] svn:boost r48141 - in trunk: boost/xpressive/detail/utility libs/xpressive/test

From: eric_at_[hidden]
Date: 2008-08-14 13:21:36

Author: eric_niebler
Date: 2008-08-14 13:21:36 EDT (Thu, 14 Aug 2008)
New Revision: 48141
URL: http://svn.boost.org/trac/boost/changeset/48141

Log:
fix problem with case-insensitive alternation
Text files modified: 
   trunk/boost/xpressive/detail/utility/hash_peek_bitset.hpp |     5 ++++-                                   
   trunk/libs/xpressive/test/regress.txt                     |    10 ++++++++++                              
   2 files changed, 14 insertions(+), 1 deletions(-)

Modified: trunk/boost/xpressive/detail/utility/hash_peek_bitset.hpp
==============================================================================
--- trunk/boost/xpressive/detail/utility/hash_peek_bitset.hpp	(original)
+++ trunk/boost/xpressive/detail/utility/hash_peek_bitset.hpp	2008-08-14 13:21:36 EDT (Thu, 14 Aug 2008)
@@ -104,7 +104,10 @@
 
     void set_bitset(hash_peek_bitset<Char> const &that)
     {
-        this->bset_ |= that.bset_;
+        if(this->test_icase_(that.icase()))
+        {
+            this->bset_ |= that.bset_;
+        }
     }
 
     void set_charset(basic_chset_8bit<Char> const &that, bool icase)

Modified: trunk/libs/xpressive/test/regress.txt
==============================================================================
--- trunk/libs/xpressive/test/regress.txt	(original)
+++ trunk/libs/xpressive/test/regress.txt	2008-08-14 13:21:36 EDT (Thu, 14 Aug 2008)
@@ -3738,3 +3738,13 @@
 flg=m
 br0=c
 [end]
+
+[nocasealternate]
+str=common HighLight and Blow this
+pat=highlight|blow
+flg=ig
+sub=<b>$&</b>
+res=common <b>HighLight</b> and <b>Blow</b> this
+br0=HighLight
+br1=Blow
+[end]