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

*** empty log message ***

Browse source
This commit is contained in:
John Wiegley 2003-10-09 01:01:25 +00:00
parent 36a541a745
commit 5f7710fe6c
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -1,17 +1,16 @@
CODE = amount.cc ledger.cc parse.cc reports.cc CODE = amount.cc ledger.cc parse.cc reports.cc
OBJS = $(patsubst %.cc,%.o,$(CODE)) OBJS = $(patsubst %.cc,%.o,$(CODE))
CFLAGS = -Wall -ansi -pedantic CFLAGS = -Wall -ansi -pedantic
#DFLAGS = -O3 -fomit-frame-pointer -mcpu=pentium DFLAGS = -O3 -fomit-frame-pointer -mcpu=pentium
#DFLAGS = -g -DDEBUG=1 #DFLAGS = -g -DDEBUG=1
DFLAGS = -O2
INCS = INCS =
LIBS = -lgmpxx -lgmp -lpcre LIBS = -lgmpxx -lgmp -lpcre
ifdef GNUCASH ifdef GNUCASH
CODE := $(CODE) gnucash.cc CODE := $(CODE) gnucash.cc
CFLAGS := $(CFLAGS) -DREAD_GNUCASH=1 CFLAGS := $(CFLAGS) -DREAD_GNUCASH=1
INCS := $(INCS) -I/usr/include/xmltok INCS := $(INCS) -I/usr/include/xmltok
LIBS := $(LIBS) -lxmlparse LIBS := $(LIBS) -lxmlparse
endif endif
all: make.deps ledger ledger.info all: make.deps ledger ledger.info

10
ledger.cc
View file

@ -323,9 +323,13 @@ bool matches(const regexps_map& regexps, const std::string& str,
// << (match ? "match" : "not match") << std::endl; // << (match ? "match" : "not match") << std::endl;
} }
if (match && ! definite && by_exclusion) { if (by_exclusion) {
// out << " Note: Matched by exclusion rule" << std::endl; if (match && ! definite && by_exclusion) {
*by_exclusion = true; // out << " Note: Matched by exclusion rule" << std::endl;
*by_exclusion = true;
} else {
*by_exclusion = false;
}
} }
// out << " Final result: " << (match ? "match" : "not match") // out << " Final result: " << (match ? "match" : "not match")

2
reports.cc
View file

@ -100,7 +100,7 @@ void report_balances(std::ostream& out, regexps_map& regexps)
acct->checked = 1; acct->checked = 1;
} }
else { else {
bool by_exclusion; bool by_exclusion = false;
bool match = matches(regexps, acct->as_str(), bool match = matches(regexps, acct->as_str(),
&by_exclusion); &by_exclusion);
if (! match) { if (! match) {