sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
John Wiegley 2004-09-23 21:37:39 -04:00
parent c57bfb72c3
commit 84259bde51
19 changed files with 45 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile.am
View file

@ -50,7 +50,7 @@ all-clean: maintainer-clean
rm -fr *~ .*~ .\#* *.html *.info *.pdf *.a *.so *.o *.lo *.la \
*.elc *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr \
.gdb_history gmon.out h out TAGS ledger valexpr .deps \
.libs build AUTHORS ChangeLog COPYING INSTALL Makefile \
acconf.h acconf.h.in aclocal.m4 autom4te config.guess \
config.sub configure depcomp install-sh libtool ltconfig \
ltmain.sh missing stamp texinfo.tex Makefile.in
.libs build AUTHORS COPYING INSTALL Makefile acconf.h \
acconf.h.in aclocal.m4 autom4te config.guess config.sub \
configure depcomp install-sh libtool ltconfig ltmain.sh \
missing stamp texinfo.tex Makefile.in

1
amount.h
View file

@ -6,6 +6,7 @@
#include <ctime>
#include <cctype>
#include <iostream>
#include <sstream>
#include <cassert>
#include <exception>

2
autoxact.h
View file

@ -1,7 +1,7 @@
#ifndef _AUTOXACT_H
#define _AUTOXACT_H
#include "ledger.h"
#include "journal.h"
#include "valexpr.h"
#include <deque>

2
binary.cc
View file

@ -1,4 +1,4 @@
#include "ledger.h"
#include "journal.h"
#include "binary.h"
#include <fstream>

2
binary.h
View file

@ -1,7 +1,7 @@
#ifndef _BINARY_H
#define _BINARY_H
#include "ledger.h"
#include "journal.h"
#include "parser.h"
#include <deque>

2
config.h
View file

@ -1,7 +1,7 @@
#ifndef _CONFIG_H
#define _CONFIG_H
#include "ledger.h"
#include "journal.h"
#include "option.h"
#include "valexpr.h"
#include "datetime.h"

2
datetime.h
View file

@ -1,7 +1,7 @@
#ifndef _DATETIME_H
#define _DATETIME_H
#include "ledger.h"
#include "journal.h"
#include <ctime>
#include <sstream>

2
error.h
View file

@ -1,7 +1,7 @@
#ifndef _ERROR_H
#define _ERROR_H
#include "ledger.h"
#include "journal.h"
#include <exception>
#include <string>

2
format.h
View file

@ -1,7 +1,7 @@
#ifndef _FORMAT_H
#define _FORMAT_H
#include "ledger.h"
#include "journal.h"
#include "valexpr.h"
#include "walk.h"

2
gnucash.cc
View file

@ -1,5 +1,5 @@
#include "gnucash.h"
#include "ledger.h"
#include "journal.h"
#include "error.h"
#include <iostream>

2
journal.cc
View file

@ -1,4 +1,4 @@
#include "ledger.h"
#include "journal.h"
#include "valexpr.h"
#include "datetime.h"
#include "error.h"

273
ledger.h
View file

@ -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 <balance.h>
#include <value.h>
#include "amount.h"
#include "value.h"
#include "debug.h"
#include <journal.h>
namespace ledger {
#include <datetime.h>
#include <format.h>
#include <quotes.h>
#include <valexpr.h>
#include <walk.h>
// 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
#include <option.h>
#include <config.h>
class entry_t;
class account_t;
#include <parser.h>
#include <textual.h>
#include <autoxact.h>
#include <binary.h>
#include <qif.h>
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 <error.h>
#include <timing.h>
#include <util.h>
#endif // _LEDGER_H

5
main.cc
View file

@ -1,7 +1,6 @@
#include "ledger.h"
#include "journal.h"
#include "parser.h"
#include "textual.h"
#include "autoxact.h"
#include "binary.h"
#include "qif.h"
#include "acconf.h"
@ -164,8 +163,6 @@ int parse_and_report(int argc, char * argv[], char * envp[])
{
std::auto_ptr<journal_t> journal(new journal_t);
add_hook(journal->entry_finalize_hooks, handle_auto_xacts);
// Parse command-line arguments, and those set in the environment
TIMER_START(process_opts);

2
parser.cc
View file

@ -1,5 +1,5 @@
#include "parser.h"
#include "ledger.h"
#include "journal.h"
#include <fstream>
#include <deque>

2
python.cc
View file

@ -1,5 +1,5 @@
#include "python.h"
#include "ledger.h"
#include "journal.h"
#include "acconf.h"
#include <boost/python.hpp>

2
qif.cc
View file

@ -1,4 +1,4 @@
#include "ledger.h"
#include "journal.h"
#include "qif.h"
#include "datetime.h"
#include "error.h"

7
textual.cc
View file

@ -1,4 +1,4 @@
#include "ledger.h"
#include "journal.h"
#include "textual.h"
#include "datetime.h"
#include "autoxact.h"
@ -223,6 +223,7 @@ unsigned int textual_parser_t::parse(std::istream& in,
account_t * master,
const std::string * original_file)
{
static bool added_autoxact_hook = false;
static char line[MAX_LINE + 1];
char c;
unsigned int count = 0;
@ -431,6 +432,10 @@ unsigned int textual_parser_t::parse(std::istream& in,
}
case '=': // automated transactions
if (! added_autoxact_hook) {
add_hook(journal->entry_finalize_hooks, handle_auto_xacts);
added_autoxact_hook = true;
}
parse_automated_transactions(in, account_stack.front(), auto_xacts);
break;

2
valexpr.h
View file

@ -1,7 +1,7 @@
#ifndef _EXPR_H
#define _EXPR_H
#include "ledger.h"
#include "journal.h"
#include "value.h"
#include "error.h"

2
walk.h
View file

@ -1,7 +1,7 @@
#ifndef _WALK_H
#define _WALK_H
#include "ledger.h"
#include "journal.h"
#include "balance.h"
#include "valexpr.h"
#include "datetime.h"