From ce7bc090cd410e6003f3bb3346513b1b8193eb15 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 16 Jul 2015 16:11:52 +0200 Subject: [PATCH] hash_set: add iterator and remove method. * hash-set.h (remove): New function. (iterator): New iteration class for hash_set. From-SVN: r225885 --- gcc/ChangeLog | 5 +++++ gcc/hash-set.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7046378a479..90254ffb0a8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-07-16 Martin Liska + + * hash-set.h (remove): New function. + (iterator): New iteration class for hash_set. + 2015-07-16 Richard Sandiford * genattrtab.c (make_canonical): Add a file_location parameter. diff --git a/gcc/hash-set.h b/gcc/hash-set.h index 2fb6cae7362..e85af2a1745 100644 --- a/gcc/hash-set.h +++ b/gcc/hash-set.h @@ -59,6 +59,11 @@ public: return !Traits::is_empty (e); } + void remove (const Key &k) + { + m_table.remove_elt_with_hash (k, Traits::hash (k)); + } + /* Call the call back on each pair of key and value with the passed in arg. */ @@ -74,6 +79,40 @@ public: size_t elements () const { return m_table.elements (); } + class iterator + { + public: + explicit iterator (const typename hash_table::iterator &iter) : + m_iter (iter) {} + + iterator &operator++ () + { + ++m_iter; + return *this; + } + + Key + operator* () + { + return *m_iter; + } + + bool + operator != (const iterator &other) const + { + return m_iter != other.m_iter; + } + + private: + typename hash_table::iterator m_iter; + }; + + /* Standard iterator retrieval methods. */ + + iterator begin () const { return iterator (m_table.begin ()); } + iterator end () const { return iterator (m_table.end ()); } + + private: template friend void gt_ggc_mx (hash_set *); -- 2.30.2