Test of ID constraint should use regex_match and not regex_search.

Update tests accordingly and change Jamfile.v2 to match current Trunk.

[SVN r71977]
This commit is contained in:
John Maddock 2011-05-16 11:20:27 +00:00
parent b1325e59ac
commit 8c4fce697e
3 changed files with 5 additions and 2 deletions

View File

@ -349,7 +349,7 @@ void process_node(boost::tiny_xml::element_ptr node, node_id* prev, title_info*
//
std::pair<std::string, std::string> item_index(*pid, i->term);
if(((no_duplicates == false) || (0 == found_terms.count(item_index)))
&& (i->search_id.empty() || regex_search(*pid, i->search_id)))
&& (i->search_id.empty() || regex_match(*pid, i->search_id)))
{
// We have something to index!
found_terms.insert(item_index);

View File

@ -10,7 +10,7 @@ import type ;
path-constant local-boost-root : [ modules.peek : BOOST ] ;
alias line_compare_tool : $(local-boost-root)/tools/quickbook/test//line-compare-tool ;
alias line_compare_tool : $(local-boost-root)/tools/quickbook/test/src//line-compare-tool ;
rule auto-index-test ( target-name : input-file : output-file ? : options * )
{
@ -68,3 +68,4 @@ auto-index-test test3 : type_traits.docbook : : --internal-index index-type=inde

View File

@ -18,7 +18,9 @@
!rewrite-name "(?:A|An|The)\s+(.*)" "\1"
"Constrained Index Term" add_const "boost_typetraits\.reference.*" class_name
"This term should not appear anywhere because of the ID constraint" strlen "(?!boost_typetraits.background).*" function_name
type-traits "" ".*.intro" test_index_1
type-traits "" ".*.background" test_index_2