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

Value expression sequences are now comparable

Browse source 
Fixes #228 / ED9388D7-E523-40EB-841B-9AE9BAA70329
This commit is contained in:
John Wiegley 2010-06-05 03:22:02 -04:00
parent 63c7ba0322
commit 16f799767c
3 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/filters.h
View file

@ -226,16 +226,12 @@ class sort_posts : public item_handler<post_t>
public: public:
sort_posts(post_handler_ptr handler, const expr_t& _sort_order) sort_posts(post_handler_ptr handler, const expr_t& _sort_order)
: item_handler<post_t>(handler), : item_handler<post_t>(handler), sort_order(_sort_order) {
sort_order(_sort_order) { TRACE_CTOR(sort_posts, "post_handler_ptr, const value_expr&");
TRACE_CTOR(sort_posts,
"post_handler_ptr, const value_expr&");
} }
sort_posts(post_handler_ptr handler, const string& _sort_order) sort_posts(post_handler_ptr handler, const string& _sort_order)
: item_handler<post_t>(handler), : item_handler<post_t>(handler), sort_order(_sort_order) {
sort_order(_sort_order) { TRACE_CTOR(sort_posts, "post_handler_ptr, const string&");
TRACE_CTOR(sort_posts,
"post_handler_ptr, const string&");
} }
virtual ~sort_posts() { virtual ~sort_posts() {
TRACE_DTOR(sort_posts); TRACE_DTOR(sort_posts);

28
src/value.cc
View file

@ -935,6 +935,20 @@ bool value_t::is_less_than(const value_t& val) const
} }
return ! no_amounts; return ! no_amounts;
} }
case SEQUENCE: {
sequence_t::const_iterator i = as_sequence().begin();
sequence_t::const_iterator j = val.as_sequence().begin();
for (; (i != as_sequence().end() &&
j != val.as_sequence().end()); i++, j++) {
if (! ((*i) < (*j)))
return false;
}
if (i == as_sequence().end())
return true;
else
return false;
break;
}
default: default:
break; break;
} }
@ -1041,6 +1055,20 @@ bool value_t::is_greater_than(const value_t& val) const
} }
return ! no_amounts; return ! no_amounts;
} }
case SEQUENCE: {
sequence_t::const_iterator i = as_sequence().begin();
sequence_t::const_iterator j = val.as_sequence().begin();
for (; (i != as_sequence().end() &&
j != val.as_sequence().end()); i++, j++) {
if (! ((*i) > (*j)))
return false;
}
if (i == as_sequence().end())
return false;
else
return true;
break;
}
default: default:
break; break;
} }

2
src/value.h
View file

@ -878,7 +878,6 @@ public:
sequence_t::iterator begin() { sequence_t::iterator begin() {
return as_sequence_lval().begin(); return as_sequence_lval().begin();
} }
sequence_t::iterator end() { sequence_t::iterator end() {
return as_sequence_lval().end(); return as_sequence_lval().end();
} }
@ -886,7 +885,6 @@ public:
sequence_t::const_iterator begin() const { sequence_t::const_iterator begin() const {
return as_sequence().begin(); return as_sequence().begin();
} }
sequence_t::const_iterator end() const { sequence_t::const_iterator end() const {
return as_sequence().end(); return as_sequence().end();
} }