diff options
Diffstat (limited to 'src/predicate.h')
| -rw-r--r-- | src/predicate.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/predicate.h b/src/predicate.h index c21167d7..673f1d5d 100644 --- a/src/predicate.h +++ b/src/predicate.h @@ -48,8 +48,6 @@ namespace ledger { -class query_t; - class predicate_t : public expr_t { public: @@ -63,15 +61,21 @@ public: : expr_t(other), what_to_keep(other.what_to_keep) { TRACE_CTOR(predicate_t, "copy"); } - predicate_t(const query_t& other); - - predicate_t(const string& str, const keep_details_t& _what_to_keep, - const parse_flags_t& flags = PARSE_DEFAULT) + predicate_t(ptr_op_t _ptr, + const keep_details_t& _what_to_keep, + scope_t * _context = NULL) + : expr_t(_ptr, _context), what_to_keep(_what_to_keep) { + TRACE_CTOR(predicate_t, "ptr_op_t, keep_details_t, scope_t *"); + } + predicate_t(const string& str, + const keep_details_t& _what_to_keep, + const parse_flags_t& flags = PARSE_DEFAULT) : expr_t(str, flags), what_to_keep(_what_to_keep) { TRACE_CTOR(predicate_t, "string, keep_details_t, parse_flags_t"); } - predicate_t(std::istream& in, const keep_details_t& _what_to_keep, - const parse_flags_t& flags = PARSE_DEFAULT) + predicate_t(std::istream& in, + const keep_details_t& _what_to_keep, + const parse_flags_t& flags = PARSE_DEFAULT) : expr_t(in, flags), what_to_keep(_what_to_keep) { TRACE_CTOR(predicate_t, "std::istream&, keep_details_t, parse_flags_t"); } @@ -81,10 +85,10 @@ public: virtual value_t real_calc(scope_t& scope) { return (*this ? - expr_t::real_calc(scope) - .strip_annotations(what_to_keep) - .to_boolean() : - true); + expr_t::real_calc(scope) + .strip_annotations(what_to_keep) + .to_boolean() : + true); } #if defined(HAVE_BOOST_SERIALIZATION) |