diff options
Diffstat (limited to 'src/textual.cc')
| -rw-r--r-- | src/textual.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/textual.cc b/src/textual.cc index 828a093d..7ddb5251 100644 --- a/src/textual.cc +++ b/src/textual.cc @@ -534,9 +534,13 @@ void instance_t::automated_xact_directive(char * line) bool reveal_context = true; try { - std::auto_ptr<auto_xact_t> ae - (new auto_xact_t(query_t(string(skip_ws(line + 1)), - keep_details_t(true, true, true), false))); + query_t query; + keep_details_t keeper(true, true, true); + expr_t::ptr_op_t expr = + query.parse_args(string_value(skip_ws(line + 1)).to_sequence(), + keeper, false, true); + + std::auto_ptr<auto_xact_t> ae(new auto_xact_t(predicate_t(expr, keeper))); ae->pos = position_t(); ae->pos->pathname = pathname; ae->pos->beg_pos = line_beg_pos; @@ -715,10 +719,10 @@ void instance_t::include_directive(char * line) mask_t glob; #if BOOST_VERSION >= 103700 path parent_path = filename.parent_path(); - glob.assign_glob(filename.filename()); + glob.assign_glob('^' + filename.filename() + '$'); #else // BOOST_VERSION >= 103700 path parent_path = filename.branch_path(); - glob.assign_glob(filename.leaf()); + glob.assign_glob('^' + filename.leaf() + '$'); #endif // BOOST_VERSION >= 103700 bool files_found = false; |