changed ledger.h to journal.h; moved adding of autoxact hook

1 files changed, 24 insertions, 259 deletions

diff --git a/ledger.h b/ledger.h
index 22069a6d..02b43cb3 100644
--- a/ledger.h
+++ b/ledger.h
@@ -10,264 +10,29 @@
 // Copyright (c) 2003,2004 John Wiegley <johnw@newartisans.com>
 //
 
-#include <map>
-#include <list>
-#include <string>
-#include <ctime>
-#include <iostream>
-
-#include "amount.h"
-#include "value.h"
-#include "debug.h"
-
-namespace ledger {
-
-// These flags persist with the object
-#define TRANSACTION_NORMAL     0x0000
-#define TRANSACTION_VIRTUAL    0x0001
-#define TRANSACTION_BALANCE    0x0002
-#define TRANSACTION_AUTO       0x0004
-#define TRANSACTION_BULK_ALLOC 0x0008
-
-class entry_t;
-class account_t;
-
-class transaction_t
-{
- public:
-  entry_t *	 entry;
-  account_t *	 account;
-  amount_t	 amount;
-  amount_t *	 cost;
-  unsigned short flags;
-  std::string	 note;
-  mutable void * data;
-
-  transaction_t(account_t * _account = NULL)
-    : entry(NULL), account(_account), cost(NULL),
-      flags(TRANSACTION_NORMAL), data(NULL) {
-  }
-
-  transaction_t(account_t *	   _account,
-		const amount_t&    _amount,
-		unsigned int	   _flags = TRANSACTION_NORMAL,
-		const std::string& _note  = "")
-    : entry(NULL), account(_account), amount(_amount),
-      cost(NULL), flags(_flags), note(_note), data(NULL) {
-  }
-
-  ~transaction_t() {
-    //assert(! data);
-    if (cost)
-      delete cost;
-  }
-
-  bool operator==(const transaction_t& xact) {
-    return this == &xact;
-  }
-  bool operator!=(const transaction_t& xact) {
-    return ! (*this == xact);
-  }
-
-  bool valid() const;
-};
-
-balance_pair_t& add_transaction_to(const transaction_t& xact,
-				   balance_pair_t&	bal_pair);
-value_t& add_transaction_to(const transaction_t& xact, value_t& value);
-
-typedef std::list<transaction_t *> transactions_list;
-
-class entry_t
-{
- public:
-  enum state_t {
-    UNCLEARED, CLEARED, PENDING
-  };
-
-  std::time_t date;
-  state_t     state;
-  std::string code;
-  std::string payee;
-
-  transactions_list transactions;
-
-  entry_t() : date(-1), state(UNCLEARED) {}
-  ~entry_t() {
-    for (transactions_list::iterator i = transactions.begin();
-	 i != transactions.end();
-	 i++)
-      if (! ((*i)->flags & TRANSACTION_BULK_ALLOC))
-	delete *i;
-      else
-	(*i)->~transaction_t();
-  }
-
-  bool operator==(const entry_t& entry) {
-    return this == &entry;
-  }
-  bool operator!=(const entry_t& entry) {
-    return ! (*this == entry);
-  }
-
-  void add_transaction(transaction_t * xact);
-  bool remove_transaction(transaction_t * xact);
-
-  bool valid() const;
-};
-
-bool finalize_entry(entry_t& entry);
-
-
-typedef std::map<const std::string, account_t *> accounts_map;
-typedef std::pair<const std::string, account_t *> accounts_pair;
-
-class account_t
-{
- public:
-  typedef unsigned long ident_t;
-
-  account_t *	      parent;
-  std::string	      name;
-  std::string	      note;
-  unsigned short      depth;
-  accounts_map	      accounts;
-  transactions_list   transactions;
-  mutable void *      data;
-  mutable ident_t     ident;
-  mutable std::string _fullname;
-
-  account_t(account_t *        _parent = NULL,
-	    const std::string& _name   = "",
-	    const std::string& _note   = "")
-    : parent(_parent), name(_name), note(_note),
-      depth(parent ? parent->depth + 1 : 0), data(NULL), ident(0) {}
-
-  ~account_t();
-
-  bool operator==(const account_t& account) {
-    return this == &account;
-  }
-  bool operator!=(const account_t& account) {
-    return ! (*this == account);
-  }
-
-  std::string fullname() const;
-
-  void add_account(account_t * acct) {
-    accounts.insert(accounts_pair(acct->name, acct));
-  }
-  bool remove_account(account_t * acct) {
-    accounts_map::size_type n = accounts.erase(acct->name);
-    return n > 0;
-  }
-
-  account_t * find_account(const std::string& name, bool auto_create = true);
-
-  operator std::string() const {
-    return fullname();
-  }
-
-  // These functions should only be called from journal_t::add_entry
-  // and journal_t::remove_entry; or from the various parsers.
-  void add_transaction(transaction_t * xact) {
-    transactions.push_back(xact);
-  }
-  bool remove_transaction(transaction_t * xact);
-
-  friend class journal_t;
-
-  bool valid() const;
-};
-
-std::ostream& operator<<(std::ostream& out, const account_t& account);
-
-
-template <typename T>
-void add_hook(std::list<T>& list, T func, const bool prepend = false) {
-  if (prepend)
-    list.push_front(func);
-  else
-    list.push_back(func);
-}
-
-template <typename T>
-void remove_hook(std::list<T>& list, T func) {
-  list.remove(func);
-}
-
-template <typename T, typename Data>
-bool run_hooks(std::list<T>& list, Data& entry) {
-  for (typename std::list<T>::const_iterator i = list.begin();
-       i != list.end();
-       i++)
-    if (! (*i)(entry))
-      return false;
-  return true;
-}
-
-
-typedef std::list<entry_t *>   entries_list;
-typedef std::list<std::string> strings_list;
-
-class journal_t
-{
- public:
-  account_t *  master;
-  entries_list entries;
-  strings_list sources;
-  char *       item_pool;
-  char *       item_pool_end;
-
-  mutable accounts_map accounts_cache;
-
-  typedef bool (*entry_finalize_hook_t)(entry_t& entry);
-
-  std::list<entry_finalize_hook_t> entry_finalize_hooks;
-
-  journal_t() {
-    master = new account_t(NULL, "");
-    item_pool = item_pool_end = NULL;
-    add_hook(entry_finalize_hooks, finalize_entry);
-  }
-  ~journal_t();
-
-  bool operator==(const journal_t& journal) {
-    return this == &journal;
-  }
-  bool operator!=(const journal_t& journal) {
-    return ! (*this == journal);
-  }
-
-  void add_account(account_t * acct) {
-    master->add_account(acct);
-  }
-  bool remove_account(account_t * acct) {
-    return master->remove_account(acct);
-  }
-
-  account_t * find_account(const std::string& name, bool auto_create = true) {
-    accounts_map::iterator c = accounts_cache.find(name);
-    if (c != accounts_cache.end())
-      return (*c).second;
-
-    account_t * account = master->find_account(name, auto_create);
-    accounts_cache.insert(accounts_pair(name, account));
-    return account;
-  }
-  account_t * find_account_re(const std::string& regexp);
-
-  bool add_entry(entry_t * entry);
-  bool remove_entry(entry_t * entry);
-
-  entry_t * derive_entry(strings_list::iterator begin,
-			 strings_list::iterator end);
-
-  bool valid() const;
-};
-
-extern const std::string version;
-
-} // namespace ledger
+#include <amount.h>
+#include <balance.h>
+#include <value.h>
+
+#include <journal.h>
+
+#include <datetime.h>
+#include <format.h>
+#include <quotes.h>
+#include <valexpr.h>
+#include <walk.h>
+
+#include <option.h>
+#include <config.h>
+
+#include <parser.h>
+#include <textual.h>
+#include <autoxact.h>
+#include <binary.h>
+#include <qif.h>
+
+#include <error.h>
+#include <timing.h>
+#include <util.h>
 
 #endif // _LEDGER_H