*** empty log message ***
This commit is contained in:
parent
36a541a745
commit
5f7710fe6c
3 changed files with 12 additions and 9 deletions
3
Makefile
3
Makefile
|
|
@ -1,9 +1,8 @@
|
|||
CODE = amount.cc ledger.cc parse.cc reports.cc
|
||||
OBJS = $(patsubst %.cc,%.o,$(CODE))
|
||||
CFLAGS = -Wall -ansi -pedantic
|
||||
#DFLAGS = -O3 -fomit-frame-pointer -mcpu=pentium
|
||||
DFLAGS = -O3 -fomit-frame-pointer -mcpu=pentium
|
||||
#DFLAGS = -g -DDEBUG=1
|
||||
DFLAGS = -O2
|
||||
INCS =
|
||||
LIBS = -lgmpxx -lgmp -lpcre
|
||||
|
||||
|
|
|
|||
|
|
@ -323,9 +323,13 @@ bool matches(const regexps_map& regexps, const std::string& str,
|
|||
// << (match ? "match" : "not match") << std::endl;
|
||||
}
|
||||
|
||||
if (by_exclusion) {
|
||||
if (match && ! definite && by_exclusion) {
|
||||
// out << " Note: Matched by exclusion rule" << std::endl;
|
||||
*by_exclusion = true;
|
||||
} else {
|
||||
*by_exclusion = false;
|
||||
}
|
||||
}
|
||||
|
||||
// out << " Final result: " << (match ? "match" : "not match")
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ void report_balances(std::ostream& out, regexps_map& regexps)
|
|||
acct->checked = 1;
|
||||
}
|
||||
else {
|
||||
bool by_exclusion;
|
||||
bool by_exclusion = false;
|
||||
bool match = matches(regexps, acct->as_str(),
|
||||
&by_exclusion);
|
||||
if (! match) {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue