diff options
author | John Wiegley <johnw@newartisans.com> | 2009-11-05 04:24:15 -0500 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2009-11-05 04:24:15 -0500 |
commit | 15555d497f56e4b4d39e9a14f74b2c82cce52b90 (patch) | |
tree | 1e6c661379f02fdc52ef107fd500438ab69f3e60 /src/session.h | |
parent | 94b2518c4156e5a6b2be45bdbeeacf1ced0cd17f (diff) | |
parent | 060fc0e00bacb96d1d16163779d98c45c3999014 (diff) | |
download | fork-ledger-15555d497f56e4b4d39e9a14f74b2c82cce52b90.tar.gz fork-ledger-15555d497f56e4b4d39e9a14f74b2c82cce52b90.tar.bz2 fork-ledger-15555d497f56e4b4d39e9a14f74b2c82cce52b90.zip |
Merge branch 'next'
Diffstat (limited to 'src/session.h')
-rw-r--r-- | src/session.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/session.h b/src/session.h index 58e33f6b..7c5d47dd 100644 --- a/src/session.h +++ b/src/session.h @@ -80,27 +80,11 @@ public: flush_on_next_data_file = truth; } - std::size_t read_journal(std::istream& in, - const path& pathname, - account_t * master = NULL, - scope_t * scope = NULL); - std::size_t read_journal(const path& pathname, - account_t * master = NULL, - scope_t * scope = NULL); - std::size_t read_data(const string& master_account = ""); void read_journal_files(); void close_journal_files(); - void clean_posts(); - void clean_posts(xact_t& xact); - void clean_accounts(); - void clean_all() { - clean_posts(); - clean_accounts(); - } - void report_options(std::ostream& out) { HANDLER(account_).report(out); @@ -116,7 +100,8 @@ public: option_t<session_t> * lookup_option(const char * p); - virtual expr_t::ptr_op_t lookup(const string& name); + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name); /** * Option handlers |