--- parser3/src/include/pa_hash.h	2001/03/11 08:16:32	1.22
+++ parser3/src/include/pa_hash.h	2001/04/16 11:26:40	1.36.2.1
@@ -1,9 +1,11 @@
-/*
-	Parser
+/** @file
+	Parser: hash class decl.
+
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_hash.h,v 1.22 2001/03/11 08:16:32 paf Exp $
+	$Id: pa_hash.h,v 1.36.2.1 2001/04/16 11:26:40 paf Exp $
 */
 
 #ifndef PA_HASH_H
@@ -15,46 +17,73 @@
 #include "pa_types.h"
 #include "pa_string.h"
 
-class Hash : virtual public Pooled {
+
+/** 
+	Pooled hash.
+
+	Automatically rehashed when almost full.
+*/
+class Hash : public Pooled {
 public:
 
-	typedef String Key;
-	typedef void Value;
+	typedef String Key; ///< hash Key type. longing for templates
+	typedef void Val; ///< hash Val type. longing for templates
+
+	/// for_each iterator function type
+	typedef void (*For_each_func)(const Key& key, Val *value, void *info);
 
 public:
 
-	Hash(Pool& apool,bool) : Pooled(apool) { construct(apool, true); }
-	Hash(Pool& apool) : Pooled(apool) { construct(apool, false); }
+	Hash(Pool& apool) : Pooled(apool) { 
+		construct(apool); 
+	}
 
-	// useful generic hash function
+	/// useful generic hash function
 	static uint generic_code(uint aresult, const char *start, uint allocated);
 
-	// put a [value] under the [key], return existed or not
-	/*SYNCHRONIZED*/ bool put(const Key& key, Value *value);
-
-	// get associated [value] by the [key]
-	/*SYNCHRONIZED*/ Value *get(const Key& key) const;
+	/// put a [value] under the [key], return existed or not
+	/*SYNCHRONIZED*/ bool put(const Key& key, Val *value);
+/*
+	/// dirty hack to allow constant items storage. I long for Hash<const Val*>
+	/*SYNCHRONIZED* / bool put(const Key& key, const Val *value) {
+		return put(key, const_cast<Val *>(value)); 
+	}
+*/
+	/// get associated [value] by the [key]
+	/*SYNCHRONIZED*/ Val *get(const Key& key) const;
 
-	// put a [value] under the [key] if that [key] existed, return existed or not
-	/*SYNCHRONIZED*/ bool put_replace(const Key& key, Value *value);
+	/// put a [value] under the [key] if that [key] existed, return existed or not
+	/*SYNCHRONIZED*/ bool put_replace(const Key& key, Val *value);
 
-	// put a [value] under the [key] if that [key] NOT existed, return existed or not
-	/*SYNCHRONIZED*/ bool put_dont_replace(const Key& key, Value *value);
+	/// put a [value] under the [key] if that [key] NOT existed, return existed or not
+	/*SYNCHRONIZED*/ bool put_dont_replace(const Key& key, Val *value);
 
-	// put all 'src' values if NO with same key existed
+	/// put all 'src' values if NO with same key existed
 	/*SYNCHRONIZED*/ void merge_dont_replace(const Hash& src);
 
-	void put(const Key& key, int     value) { put(key, reinterpret_cast<Value *>(value)); }
-	void put(const Key& key, String *value) { put(key, static_cast<Value *>(value)); }
+	void put(const Key& key, int     value) { put(key, reinterpret_cast<Val *>(value)); }
+	void put(const Key& key, const String *value) { 
+		put(key, static_cast<Val *>(const_cast<String *>(value))); 
+	}
+
+	//@{
+	/// handy get, longing for Hash<int>, Hash<String *>
+	int get_int(const Key& key) const { return reinterpret_cast<int>(get(key)); }
+	const String *get_string(const Key& key) const { return static_cast<String *>(get(key)); }
+	//@}
+
+	/// number of elements in hash
+	int size() const { return used; }
 
-	int get_int(const Key& key) { return reinterpret_cast<int>(get(key)); }
-	const String *get_string(const Key& key) { return static_cast<String *>(get(key)); }
+	/// iterate over all not zero elements
+	void for_each(For_each_func func, void *info=0) const;
 
-	int size() { return used; }
+	/// remove all elements
+	void clear();
 
 protected:
 
-	void construct(Pool& apool, bool athread_safe);
+	void construct(Pool& apool);
 
 private:
 
@@ -63,9 +92,6 @@ private:
 		THRESHOLD_PERCENT=75
 	};
 
-	// am I thread-safe?
-	bool thread_safe;
-
 	// the index of [allocated] in [allocates]
 	int allocates_index;
 
@@ -88,12 +114,12 @@ private:
 
 		uint code;
 		const Key key;
-		Value *value;
+		Val *value;
 		Pair *link;
 		
 		void *operator new(size_t allocated, Pool& apool);
 
-		Pair(uint acode, const Key& akey, Value *avalue, Pair *alink) :
+		Pair(uint acode, const Key& akey, Val *avalue, Pair *alink) :
 			code(acode),
 			key(akey),
 			value(avalue),