diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-23 19:31:06 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-23 19:31:06 -0400 |
| commit | eda6cbd0146d371653feec70e0eb3ee4e4c56379 (patch) | |
| tree | aeb4e1ace0f9b284789f66f3ceb30bed66946b93 /src/predicate.h | |
| parent | 014fde3418783d1ee1ec7fe4ea6c8b04ae7f6cd8 (diff) | |
| parent | 93807fade69dd4f0ec575eda78fe1a77a85c24e3 (diff) | |
| download | fork-ledger-eda6cbd0146d371653feec70e0eb3ee4e4c56379.tar.gz fork-ledger-eda6cbd0146d371653feec70e0eb3ee4e4c56379.tar.bz2 fork-ledger-eda6cbd0146d371653feec70e0eb3ee4e4c56379.zip | |
Merge branch 'next'
Diffstat (limited to 'src/predicate.h')
| -rw-r--r-- | src/predicate.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/predicate.h b/src/predicate.h index fc99c3c6..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"); } |