--- parser3/src/include/pa_hash.h	2001/02/22 16:21:48	1.16
+++ parser3/src/include/pa_hash.h	2001/03/11 12:04:43	1.23
@@ -1,10 +1,9 @@
 /*
-  $Id: pa_hash.h,v 1.16 2001/02/22 16:21:48 paf Exp $
-*/
-
-/*
-
+	Parser
+	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.23 2001/03/11 12:04:43 paf Exp $
 */
 
 #ifndef PA_HASH_H
@@ -16,7 +15,7 @@
 #include "pa_types.h"
 #include "pa_string.h"
 
-class Hash : virtual public Pooled {
+class Hash : public Pooled {
 public:
 
 	typedef String Key;
@@ -28,19 +27,30 @@ public:
 	Hash(Pool& apool) : Pooled(apool) { construct(apool, false); }
 
 	// useful generic hash function
-	static uint generic_code(uint aresult, const char *start, uint size);
+	static uint generic_code(uint aresult, const char *start, uint allocated);
 
-	// put a [value] under the [key]
-	/*SYNCHRONIZED*/ void put(const Key& key, Value *value);
+	// 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] 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] NOT existed, return existed or not
+	/*SYNCHRONIZED*/ bool put_dont_replace(const Key& key, Value *value);
+
+	// 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)); }
 
 	int get_int(const Key& key) { return reinterpret_cast<int>(get(key)); }
-	String *get_string(const Key& key) { return static_cast<String *>(get(key)); }
+	const String *get_string(const Key& key) { return static_cast<String *>(get(key)); }
+
+	int size() { return used; }
 
 protected:
 
@@ -48,7 +58,7 @@ protected:
 
 private:
 
-	// expand when these %% of size exausted
+	// expand when these %% of allocated exausted
 	enum {
 		THRESHOLD_PERCENT=75
 	};
@@ -56,15 +66,15 @@ private:
 	// am I thread-safe?
 	bool thread_safe;
 
-	// the index of [size] in [sizes]
-	int size_index;
+	// the index of [allocated] in [allocates]
+	int allocates_index;
 
-	// possible [sizes]. prime numbers
-	static uint sizes[];
-	static int sizes_count;
+	// possible [allocates]. prime numbers
+	static uint allocates[];
+	static int allocates_count;
 
 	// number of allocated pairs
-	int size;
+	int allocated;
 
 	// helper: expanding when used == threshold
 	int threshold;
@@ -81,7 +91,7 @@ private:
 		Value *value;
 		Pair *link;
 		
-		void *operator new(size_t size, Pool& apool);
+		void *operator new(size_t allocated, Pool& apool);
 
 		Pair(uint acode, const Key& akey, Value *avalue, Pair *alink) :
 			code(acode),