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

Balances and sequences can be compared to amounts

Browse source
This commit is contained in:
John Wiegley 2010-06-22 01:25:03 -04:00
parent 1c0785ce78
commit 7d005b8d98
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/value.cc
View file

@ -901,13 +901,10 @@ bool value_t::is_less_than(const value_t& val) const
switch (val.type()) { switch (val.type()) {
case INTEGER: case INTEGER:
case AMOUNT: { case AMOUNT: {
if (val.is_nonzero())
break;
bool no_amounts = true; bool no_amounts = true;
foreach (const balance_t::amounts_map::value_type& pair, foreach (const balance_t::amounts_map::value_type& pair,
as_balance().amounts) { as_balance().amounts) {
if (pair.second >= 0L) if (pair.second >= val)
return false; return false;
no_amounts = false; no_amounts = false;
} }
@ -927,12 +924,9 @@ bool value_t::is_less_than(const value_t& val) const
switch (val.type()) { switch (val.type()) {
case INTEGER: case INTEGER:
case AMOUNT: { case AMOUNT: {
if (val.is_nonzero())
break;
bool no_amounts = true; bool no_amounts = true;
foreach (const value_t& value, as_sequence()) { foreach (const value_t& value, as_sequence()) {
if (value >= 0L) if (value >= val)
return false; return false;
no_amounts = false; no_amounts = false;
} }
@ -1023,13 +1017,10 @@ bool value_t::is_greater_than(const value_t& val) const
switch (val.type()) { switch (val.type()) {
case INTEGER: case INTEGER:
case AMOUNT: { case AMOUNT: {
if (val.is_nonzero())
break;
bool no_amounts = true; bool no_amounts = true;
foreach (const balance_t::amounts_map::value_type& pair, foreach (const balance_t::amounts_map::value_type& pair,
as_balance().amounts) { as_balance().amounts) {
if (pair.second <= 0L) if (pair.second <= val)
return false; return false;
no_amounts = false; no_amounts = false;
} }
@ -1049,12 +1040,9 @@ bool value_t::is_greater_than(const value_t& val) const
switch (val.type()) { switch (val.type()) {
case INTEGER: case INTEGER:
case AMOUNT: { case AMOUNT: {
if (val.is_nonzero())
break;
bool no_amounts = true; bool no_amounts = true;
foreach (const value_t& value, as_sequence()) { foreach (const value_t& value, as_sequence()) {
if (value <= 0L) if (value <= val)
return false; return false;
no_amounts = false; no_amounts = false;
} }