From e5aae1bb97d5f73703287358f841c6d957101dfd Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 19 Jul 2015 12:06:57 +0200 Subject: Implement path iterator decrement operator --- butl/path | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'butl') diff --git a/butl/path b/butl/path index db77563..c667378 100644 --- a/butl/path +++ b/butl/path @@ -388,9 +388,9 @@ namespace butl { typedef string_type value_type; typedef string_type* pointer; - typedef string_type& reference; + typedef string_type reference; typedef std::ptrdiff_t difference_type; - typedef std::forward_iterator_tag iterator_category; + typedef std::bidirectional_iterator_tag iterator_category; typedef typename string_type::size_type size_type; @@ -409,9 +409,30 @@ namespace butl return *this; } + iterator& + operator-- () + { + e_ = b_; + + if (e_ != 0) + { + b_ = e_ == string_type::npos ? + traits::rfind_separator (*p_) /* Rigtmost component */ : + --e_ > 0 ? traits::rfind_separator (*p_, e_ - 1) : + string_type::npos /* Leftmost empty component */; + + b_ = b_ == string_type::npos ? 0 : b_ + 1; + } + + return *this; + } + iterator operator++ (int) {iterator r (*this); operator++ (); return r;} + iterator + operator-- (int) {iterator r (*this); operator-- (); return r;} + string_type operator* () const { return string_type (*p_, b_, (e_ != string_type::npos ? e_ - b_ : e_)); -- cgit v1.1