Ticket #6291: disctinct_patch.patch

boost/spirit/repository/home/qi/directive/distinct.hpp

@@ -64 +64 @@
       : spirit::qi::unary_parser<distinct_parser<Subject, Tail, Modifier> >
     {
         template <typename Context, typename Iterator>
-        struct attribute 
-          : traits::attribute_of<Subject, Context, Iterator>
-        {};
+        struct attribute  :  traits::attribute_of<Subject, Context, Iterator>       
+        {
+        };
 
         distinct_parser(Subject const& subject, Tail const& tail)
           : subject(subject), tail(tail) {}
@@ -137 +137 @@
     struct has_semantic_action<
             repository::qi::distinct_parser<Subject, Tail, Modifier> >
       : unary_has_semantic_action<Subject> {};
+
+    template <typename Subject, typename Tail, typename Modifier,
+       typename Attribute ,typename Context, typename Iterator>
+    struct handles_container< repository::qi::distinct_parser<Subject, Tail, Modifier>
+      , Attribute, Context, Iterator>
+      : handles_container<Subject, Attribute, Context, Iterator> {};
 }}}
 
 #endif

libs/spirit/repository/test/qi/distinct.cpp

@@ -96 +96 @@
         BOOST_TEST(!test("descriptionident", r, space));
     }
 
+    {
+        using namespace boost::spirit::ascii;
+        namespace repo=boost::spirit::repository;
+        boost::spirit::qi::rule<const char*, std::string(), space_type> string_keyword;
+        string_keyword %= '+' >> (repo::qi::distinct("0-9a-zA-Z_")[string("ALPHA")] |
+                              repo::qi::distinct("0-9a-zA-Z_")[string("BETA")]);
+    
+        std::string r1;
+        BOOST_TEST(test_attr("+ BETA",string_keyword,r1,space));
+        BOOST_TEST(r1.compare("BETA")==0);
+        BOOST_TEST(!test_attr("+ BETAA",string_keyword,r1,space));
+        
+    }
     return boost::report_errors();
 }