sourcehook/sh_tinyhash.h
changeset 117 e322da4af2d2
parent 115 6d0d182ef25c
child 150 22fbddfa0209
     1.1 --- a/sourcehook/sh_tinyhash.h	Thu Sep 29 23:05:01 2005 +0000
     1.2 +++ b/sourcehook/sh_tinyhash.h	Mon Oct 03 17:20:22 2005 +0000
     1.3 @@ -27,13 +27,13 @@
     1.4  	 * This is a tiny, growable hash class.
     1.5  	 * Meant for quick and dirty dictionaries only!
     1.6  	 */
     1.7 -	template <class K, class V> 
     1.8 +	template <class K, class V>
     1.9  	class THash
    1.10  	{
    1.11  	public:
    1.12  		struct THashNode
    1.13  		{
    1.14 -			THashNode(const K & k, const V & v) : 
    1.15 +			THashNode(const K & k, const V & v) :
    1.16  				key(k), val(v)
    1.17  				{
    1.18  				};
    1.19 @@ -139,7 +139,7 @@
    1.20  				typename List<THashNode *>::iterator iter;
    1.21  				size_t place;
    1.22  				THashNode *pHashNode;
    1.23 -                NodePtr *temp = new NodePtr[m_numBuckets];
    1.24 +				NodePtr *temp = new NodePtr[m_numBuckets];
    1.25  				for (size_t i=0; i<m_numBuckets; i++)
    1.26  					temp[i] = NULL;
    1.27  				//look in old hash table
    1.28 @@ -222,10 +222,10 @@
    1.29  			{
    1.30  				if (where.hash == this->hash
    1.31  					&& where.end == this->end
    1.32 -					&& 
    1.33 -					 (this->end || 
    1.34 -					   ((where.curbucket == this->curbucket) 
    1.35 -					     && (where.iter == iter))
    1.36 +					&&
    1.37 +					 (this->end ||
    1.38 +					   ((where.curbucket == this->curbucket)
    1.39 +						&& (where.iter == iter))
    1.40  						 ))
    1.41  					return true;
    1.42  				return false;
    1.43 @@ -234,6 +234,20 @@
    1.44  			{
    1.45  				return !( (*this) == where );
    1.46  			}
    1.47 +
    1.48 +			void erase()
    1.49 +			{
    1.50 +				if (end || !hash || curbucket < 0 || curbucket >= static_cast<int>(hash->m_numBuckets))
    1.51 +					return;
    1.52 +
    1.53 +				// Remove this element and move to the next one
    1.54 +				iterator tmp = *this;
    1.55 +				++tmp;
    1.56 +				hash->m_Buckets[curbucket]->erase(iter);
    1.57 +				*this = tmp;
    1.58 +
    1.59 +				// :TODO: Maybe refactor to a lower size if required
    1.60 +			}
    1.61  		private:
    1.62  			void _Inc()
    1.63  			{
    1.64 @@ -321,10 +335,10 @@
    1.65  			{
    1.66  				if (where.hash == this->hash
    1.67  					&& where.end == this->end
    1.68 -					&& 
    1.69 -					 (this->end || 
    1.70 -					   ((where.curbucket == this->curbucket) 
    1.71 -					     && (where.iter == iter))
    1.72 +					&&
    1.73 +					 (this->end ||
    1.74 +					   ((where.curbucket == this->curbucket)
    1.75 +						&& (where.iter == iter))
    1.76  						 ))
    1.77  					return true;
    1.78  				return false;
    1.79 @@ -392,7 +406,7 @@
    1.80  			iter.hash = this;
    1.81  			return iter;
    1.82  		}
    1.83 -		
    1.84 +
    1.85  		const_iterator begin() const
    1.86  		{
    1.87  			return const_iterator(this);
    1.88 @@ -403,7 +417,7 @@
    1.89  			iter.hash = this;
    1.90  			return iter;
    1.91  		}
    1.92 -		
    1.93 +
    1.94  		template <typename U>
    1.95  		iterator find(const U & u) const
    1.96  		{
    1.97 @@ -428,6 +442,20 @@
    1.98  			}
    1.99  			return end();
   1.100  		}
   1.101 +
   1.102 +		iterator erase(iterator where)
   1.103 +		{
   1.104 +			where.erase();
   1.105 +			return where;
   1.106 +		}
   1.107 +		template <typename U>
   1.108 +		void erase(const U & u)
   1.109 +		{
   1.110 +			iterator iter = find(u);
   1.111 +			if (iter == end())
   1.112 +				return;
   1.113 +			iter.erase();
   1.114 +		}
   1.115  	private:
   1.116  		NodePtr	*m_Buckets;
   1.117  		size_t m_numBuckets;