--- parser3/src/include/pa_hash.h	2009/04/17 13:13:09	1.71
+++ parser3/src/include/pa_hash.h	2010/08/11 16:17:27	1.83
@@ -1,7 +1,7 @@
 /** @file
 	Parser: hash class decl.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
@@ -17,10 +17,11 @@
 #ifndef PA_HASH_H
 #define PA_HASH_H
 
-static const char * const IDENT_HASH_H="$Date: 2009/04/17 13:13:09 $";
+static const char * const IDENT_HASH_H="$Date: 2010/08/11 16:17:27 $";
 
 #include "pa_memory.h"
 #include "pa_types.h"
+#include "pa_string.h"
 
 const int HASH_ALLOCATES_COUNT=29;
 
@@ -72,6 +73,10 @@ inline uint hash_code(int self) {
 	return result;
 }
 
+#endif // PA_HASH_H
+
+#ifndef PA_HASH_CLASS
+#define PA_HASH_CLASS
 /** 
 	Simple hash.
 
@@ -80,43 +85,87 @@ inline uint hash_code(int self) {
 		get returning 0 means there were no such.
 		"put value 0" means "remove"
 */
-template<typename K, typename V> class Hash: public PA_Object {
+#ifdef HASH_ORDER
+
+#undef HASH
+#undef HASH_STRING
+#undef HASH_NEW_PAIR
+#undef HASH_FOR_EACH
+
+#define HASH OrderedHash
+#define HASH_STRING OrderedHashString
+#define HASH_NEW_PAIR(code, key, value) *ref=new Pair(code, key, value, *ref, this->last); this->last=&((*ref)->next)
+
+#define HASH_FOR_EACH \
+	for(Pair *pair=this->first; pair; pair=pair->next)
+
+#else
+
+#define HASH Hash
+#define HASH_STRING HashString
+#define HASH_NEW_PAIR(code, key, value) *ref=new Pair(code, key, value, *ref)
+
+#define HASH_FOR_EACH \
+	Pair **ref=this->refs; \
+	for(int index=0; index<this->allocated; index++) \
+		for(Pair *pair=*ref++; pair; pair=pair->link)
+
+#endif
+
+template<typename K, typename V> class HASH: public PA_Object {
 public:
 
 	typedef K key_type;
 	typedef V value_type;
 
-	Hash() { 
+	HASH() { 
 		allocated=Hash_allocates[allocates_index=0];
-		threshold=allocated*THRESHOLD_PERCENT/100;
 		fpairs_count=fused_refs=0;
 		refs=new(UseGC) Pair*[allocated];
+#ifdef HASH_ORDER
+		first=0;
+		last=&first;
+#endif
 	}
 
-	Hash(const Hash& source) {
+	HASH(const HASH& source) {
 		allocates_index=source.allocates_index;
 		allocated=source.allocated;
-		threshold=source.threshold;
 		fused_refs=source.fused_refs;
 		fpairs_count=source.fpairs_count;
 		refs=new(UseGC) Pair*[allocated];
-
 		// clone & rehash
-		Pair **old_ref=source.refs;
+#ifdef HASH_ORDER
+		first=0;
+		last=&first;
+		for(Pair *pair=source.first; pair; pair=pair->next)
+		{
+			uint index=pair->code%allocated;
+			Pair **ref=&refs[index];
+			HASH_NEW_PAIR(pair->code, pair->key, pair->value);
+		}
+#else
+		for(int i=0; i<source.allocated; i++)
+			for(Pair *pair=source.refs[i]; pair; pair=pair->link)
+			{
+				Pair **ref=&refs[i];
+				HASH_NEW_PAIR(pair->code, pair->key, pair->value);
+			}
+#endif
+	}
+
+#ifdef USE_DESTRUCTORS
+	~HASH() {
+		Pair **ref=refs;
 		for(int index=0; index<allocated; index++)
-			for(Pair *pair=*old_ref++; pair; ) {
+			for(Pair *pair=*ref++; pair;){
 				Pair *next=pair->link;
-
-				Pair **new_ref=&refs[index];
-				*new_ref=new Pair(pair->code, pair->key, pair->value, *new_ref);
-
+				delete pair;
 				pair=next;
 			}
-	}
-
-	~Hash() {
 		delete[] refs;
 	}
+#endif
 
 	/// put a [value] under the [key] @returns existed or not
 	bool put(K key, V value) {
@@ -140,133 +189,33 @@ public:
 		// proper pair not found -- create&link_in new pair
 		if(!*ref) // root cell were fused_refs?
 			fused_refs++; // not, we'll use it and record the fact
-		*ref=new Pair(code, key, value, *ref);
+		HASH_NEW_PAIR(code, key, value);
 		fpairs_count++;
 		return false;
 	}
 
-	/// put a [value] under the [key] @returns existed or not
-	template<typename R, typename F, typename I> R replace_maybe_append(K key, V value, F prevent, I info) {
-		if(!value) {
-			// they can come here from somewhere (true with maybe_replace_maybe_append, keeping parallel)
-			remove(key);
-			// this has nothing to do with properties, doing no special property handling here
-			return 0; 
-		}
-
-		if(is_full()) 
-			expand();
-
-		uint code=hash_code(key);
-		uint index=code%allocated;
-		Pair **ref=&refs[index];
-		for(Pair *pair=*ref; pair; pair=pair->link)
-			if(pair->code==code && pair->key==key) {
-				// found a pair with the same key
-				pair->value=value;
-				return reinterpret_cast<R>(1);
-			}
-		
-		// proper pair not found 
-		// prevent-function intercepted append?
-		if(R result=prevent(value, info))
-			return result;
-		
-		//create&link_in new pair
-		if(!*ref) // root cell were fused_refs?
-			fused_refs++; // not, we'll use it and record the fact
-		*ref=new Pair(code, key, value, *ref);
-		fpairs_count++;
-		return 0;
-	}
-
-	/// put a [value] under the [key] @returns existed or not
-	template<typename R, typename F1, typename F2, typename I> 
-		R maybe_replace_maybe_append(K key, V value, F1 prevent_replace, F2 prevent_append, I info) 
-	{
-		if(!value) {
-			// they can come here from Temp_value_element::dctor to restore some empty value
-			remove(key);
-			// this has nothing to do with properties, doing no special property handling here
-			return 0; 
-		}
-
-		if(is_full()) 
-			expand();
-
-		uint code=hash_code(key);
-		uint index=code%allocated;
-		Pair **ref=&refs[index];
-		for(Pair *pair=*ref; pair; pair=pair->link)
-			if(pair->code==code && pair->key==key) {
-				// found a pair with the same key
-
-				// prevent-function intercepted replace?
-				if(R result=prevent_replace(pair->value, info))
-					return result;
-				
-				pair->value=value;
-				return reinterpret_cast<R>(1);
-			}
-		
-		// proper pair not found 
-		// prevent-function intercepted append?
-		if(R result=prevent_append(value, info))
-			return result;
-		
-		//create&link_in new pair
-		if(!*ref) // root cell were fused_refs?
-			fused_refs++; // not, we'll use it and record the fact
-		*ref=new Pair(code, key, value, *ref);
-		fpairs_count++;
-		return 0;
-	}
-
-	/// put a [value] under the [key] @returns existed or not
-	template<typename R, typename F1, typename I> 
-		R maybe_replace_never_append(K key, V value, F1 prevent_replace, I info) 
-	{
-		if(!value) {
-			// they can come here from somewhere (true with maybe_replace_maybe_append, keeping parallel)
-			remove(key);
-			// this has nothing to do with properties, doing no special property handling here
-			return 0; 
-		}
-
-		if(is_full()) 
-			expand();
-
-		uint code=hash_code(key);
-		uint index=code%allocated;
-		Pair **ref=&refs[index];
-		for(Pair *pair=*ref; pair; pair=pair->link)
-			if(pair->code==code && pair->key==key) {
-				// found a pair with the same key
-
-				// prevent-function intercepted replace?
-				if(R result=prevent_replace(pair->value, info))
-					return result;
-				
-				pair->value=value;
-				return reinterpret_cast<R>(1);
-			}
-		
-		return 0;
-	}
-
 	/// remove the [key] @returns existed or not
 	bool remove(K key) {
 		uint code=hash_code(key);
 		uint index=code%allocated;
-		for(Pair **ref=&refs[index]; *ref; ref=&(*ref)->link)
-			if((*ref)->code==code && (*ref)->key==key) {
+		for(Pair **ref=&refs[index]; *ref; ref=&(*ref)->link){
+			Pair *pair=*ref;
+			if(pair->code==code && pair->key==key) {
 				// found a pair with the same key
-				Pair *next=(*ref)->link;
-				delete *ref;
+				Pair *next=pair->link;
+#ifdef HASH_ORDER
+				*(pair->prev)=pair->next;
+				if(pair->next)
+					pair->next->prev=pair->prev;
+				else
+					last=pair->prev;
+#endif
+				delete pair;
 				*ref=next;
 				--fpairs_count;
 				return true;
 			}
+		}
 
 		return false;
 	}
@@ -294,16 +243,16 @@ public:
 		return V(0);
 	}
 
-	/// get associated [value] by the [key] + [code] (faster)
-	V get_by_hash_code(uint code, K key) const {
-		uint index=code%allocated;
-		for(Pair *pair=refs[index]; pair; pair=pair->link)
-			if(pair->code==code && pair->key==key)
-				return pair->value;
-		
-		return V(0);
+#ifdef HASH_ORDER
+	V first_value() const {
+		return (first) ? first->value : V(0);
 	}
- 
+
+	V last_value() const {
+		return (fpairs_count) ? ((Pair *)((char *)last - offsetof(Pair, next)))->value : V(0);
+	}
+#endif
+
 	/// put a [value] under the [key] if that [key] existed @returns existed or not
 	bool put_replaced(K key, V value) {
 		if(!value) {
@@ -323,32 +272,6 @@ public:
 		return false;
 	}
 
-	/// put a [value] under the [key] if that [key] existed @returns existed or not
-	template<typename R, typename F> R maybe_put_replaced(K key, V value, F prevent) {
-		if(!value) {
-			// they can come here from Temp_value_element::dctor to restore some empty value
-			remove(key);
-			// this has nothing to do with properties, doing no special property handling here
-			return 0; 
-		}
-
-		uint code=hash_code(key);
-		uint index=code%allocated;
-		for(Pair *pair=refs[index]; pair; pair=pair->link)
-			if(pair->code==code && pair->key==key) {
-				// found a pair with the same key, replacing
-				// prevent-function intercepted put?
-				if(R result=prevent(pair->value))
-					return result;
-				
-				pair->value=value;
-				return reinterpret_cast<R>(1);
-			}
-
-		// proper pair not found 
-		return 0;
-	}
-
 	/// put a [value] under the [key] if that [key] NOT existed @returns existed or not
 	bool put_dont_replace(K key, V value) {
 		if(!value) {
@@ -370,17 +293,19 @@ public:
 		// proper pair not found -- create&link_in new pair
 		if(!*ref) // root cell were fused_refs?
 			fused_refs++; // not, we'll use it and record the fact
-		*ref=new Pair(code, key, value, *ref);
+		HASH_NEW_PAIR(code, key, value);
 		fpairs_count++;
 		return false;
 	}
 
-	/** put all 'src' values if NO with same key existed
-		@todo optimize this.allocated==src.allocated case
-	*/
-	void merge_dont_replace(const Hash& src) {
+	/// put all 'src' values if NO with same key existed
+	void merge_dont_replace(const HASH& src) {
+#ifdef HASH_ORDER
+		for(Pair *pair=src.first; pair; pair=pair->next)
+#else
 		for(int i=0; i<src.allocated; i++)
 			for(Pair *pair=src.refs[i]; pair; pair=pair->link)
+#endif
 				put_dont_replace(pair->key, pair->value);
 	}
 
@@ -389,28 +314,21 @@ public:
 
 	/// iterate over all pairs
 	template<typename I> void for_each(void callback(K, V, I), I info) const {
-		Pair **ref=refs;
-		for(int index=0; index<allocated; index++)
-			for(Pair *pair=*ref++; pair; pair=pair->link)
-				callback(pair->key, pair->value, info);
+		HASH_FOR_EACH
+			callback(pair->key, pair->value, info);
 	}
 
 	/// iterate over all pairs
 	template<typename I> void for_each_ref(void callback(K, V&, I), I info) const {
-		Pair **ref=refs;
-		for(int index=0; index<allocated; index++)
-			for(Pair *pair=*ref++; pair; pair=pair->link)
-				callback(pair->key, pair->value, info);
+		HASH_FOR_EACH
+			callback(pair->key, pair->value, info);
 	}
 
 	/// iterate over all pairs until condition becomes true, return that element
 	template<typename I> V first_that(bool callback(K, V, I), I info) const {
-		Pair **ref=refs;
-		for(int index=0; index<allocated; index++)
-			for(Pair *pair=*ref++; pair; pair=pair->link)
-				if(callback(pair->key, pair->value, info))
-					return pair->value;
-		
+		HASH_FOR_EACH
+			if(callback(pair->key, pair->value, info))
+				return pair->value;
 		return V(0);
 	}
 
@@ -418,14 +336,13 @@ public:
 	void clear() {
 		memset(refs, 0, sizeof(*refs)*allocated);
 		fpairs_count=fused_refs=0;	
+#ifdef HASH_ORDER
+		first=0;
+		last=&first;
+#endif
 	}
 
-private:
-
-	/// expand when these %% of allocated exausted
-	enum {
-		THRESHOLD_PERCENT=75
-	};
+protected:
 
 	/// the index of [allocated] in [Hash_allocates]
 	int allocates_index;
@@ -433,9 +350,6 @@ private:
 	/// number of allocated pairs
 	int allocated;
 
-	/// helper: expanding when fused_refs == threshold
-	int threshold;
-
 	/// used pairs
 	int fused_refs;
 
@@ -449,26 +363,33 @@ private:
 		K key;
 		V value;
 		Pair *link;
-		
-		Pair(uint acode, K akey, V avalue, Pair *alink) :
-			code(acode),
-			key(akey),
-			value(avalue),
-			link(alink) {}
+#ifdef HASH_ORDER
+		Pair **prev;
+		Pair *next;
+
+		Pair(uint acode, K akey, V avalue, Pair *alink, Pair **aprev) : code(acode), key(akey), value(avalue), link(alink), 
+			prev(aprev), next(0) { *aprev=this; }
+#else
+		Pair(uint acode, K akey, V avalue, Pair *alink) : code(acode), key(akey), value(avalue), link(alink) {}
+#endif
 	} **refs;
 
-	/// filled to threshold: needs expanding
-	bool is_full() { return fused_refs==threshold; }
+#ifdef HASH_ORDER
+	Pair *first;
+	Pair **last;
+#endif
+
+	/// filled to threshold (THRESHOLD_PERCENT=75), needs expanding
+	bool is_full() { return fused_refs + allocated/4 >= allocated; }
 
 	/// allocate larger buffer & rehash
 	void expand() {
 		int old_allocated=allocated;
 		Pair **old_refs=refs;
 
-		allocates_index=allocates_index+1<HASH_ALLOCATES_COUNT?allocates_index+1:HASH_ALLOCATES_COUNT-1;
+		if (allocates_index<HASH_ALLOCATES_COUNT-1) allocates_index++;
 		// allocated bigger refs array
 		allocated=Hash_allocates[allocates_index];
-		threshold=allocated*THRESHOLD_PERCENT/100;
 		refs=new(UseGC) Pair*[allocated];
 
 		// rehash
@@ -490,17 +411,225 @@ private:
 
 private: //disabled
 
-	Hash& operator = (const Hash&) { return *this; }
+	HASH& operator = (const HASH&) { return *this; }
 };
 
-///	Auto-object used to temporarily substituting/removing hash values
+/** 
+	Simple String::body hash.
+	Allows hash code caching
+*/
+
+#ifdef HASH_CODE_CACHING
+
+template<typename V> class HASH_STRING: public HASH<const CORD,V> {
+public:
+
+	typedef typename HASH<const CORD,V>::Pair Pair; 
+	typedef const String::Body &K;
+
+	typedef K key_type;
+	
+	/// put a [value] under the [key] @returns existed or not
+	bool put(K str, V value) {
+		if(!value) {
+			remove(str);
+			return false;
+		}
+		if(this->is_full()) 
+			this->expand();
+
+		CORD key=str.get_cord();
+
+		uint code=str.get_hash_code();
+		uint index=code%this->allocated;
+		Pair **ref=&this->refs[index];
+		for(Pair *pair=*ref; pair; pair=pair->link)
+			if(pair->code==code && CORD_cmp(pair->key,key)==0) {
+				// found a pair with the same key
+				pair->value=value;
+				return true;
+			}
+
+		// proper pair not found -- create&link_in new pair
+		if(!*ref) // root cell were fused_refs?
+			this->fused_refs++; // not, we'll use it and record the fact
+		HASH_NEW_PAIR(code, key, value);
+		this->fpairs_count++;
+		return false;
+	}
+
+	/// remove the [key] @returns existed or not
+	bool remove(K str) {
+		CORD key=str.get_cord();
+		uint code=str.get_hash_code();
+		uint index=code%this->allocated;
+		for(Pair **ref=&this->refs[index]; *ref; ref=&(*ref)->link){
+			Pair *pair=*ref;
+			if(pair->code==code && CORD_cmp(pair->key,key)==0) {
+				// found a pair with the same key
+				Pair *next=pair->link;
+#ifdef HASH_ORDER
+				*(pair->prev)=pair->next;
+				if(pair->next)
+					pair->next->prev=pair->prev;
+				else
+					this->last=pair->prev;
+#endif
+				delete pair;
+				*ref=next;
+				--this->fpairs_count;
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/// return true if key exists
+	bool contains(K str){
+		CORD key=str.get_cord();
+		uint code=str.get_hash_code();
+		uint index=code%this->allocated;
+		for(Pair *pair=this->refs[index]; pair; pair=pair->link){
+			if(pair->code==code && CORD_cmp(pair->key,key)==0)
+				return true;
+		}
+
+		return false;
+	}
+
+	/// get associated [value] by the [key]
+	V get(K str) const {
+		CORD key=str.get_cord();
+		uint code=str.get_hash_code();
+		uint index=code%this->allocated;
+		for(Pair *pair=this->refs[index]; pair; pair=pair->link)
+			if(pair->code==code && CORD_cmp(pair->key,key)==0)
+				return pair->value;
+
+		return V(0);
+	}
+
+	/// put a [value] under the [key] if that [key] existed @returns existed or not
+	bool put_replaced(K str, V value) {
+		if(!value) {
+			remove(str);
+			return false;
+		}
+
+		CORD key=str.get_cord();
+		uint code=str.get_hash_code();
+		uint index=code%this->allocated;
+		for(Pair *pair=this->refs[index]; pair; pair=pair->link)
+			if(pair->code==code && CORD_cmp(pair->key,key)==0) {
+				// found a pair with the same key, replacing
+				pair->value=value;
+				return true;
+			}
+
+		// proper pair not found 
+		return false;
+	}
+
+	/// put a [value] under the [key] if that [key] NOT existed @returns existed or not
+	bool put_dont_replace(K str, V value) {
+		if(!value) {
+			remove(str);
+			return false;
+		}
+		if(this->is_full()) 
+			this->expand();
+
+		CORD key=str.get_cord();
+		uint code=str.get_hash_code();
+		uint index=code%this->allocated;
+		Pair **ref=&this->refs[index];
+		for(Pair *pair=*ref; pair; pair=pair->link)
+			if(pair->code==code && CORD_cmp(pair->key,key)==0) {
+				// found a pair with the same key, NOT replacing
+				return true;
+			}
+
+		// proper pair not found -- create&link_in new pair
+		if(!*ref) // root cell were fused_refs?
+			this->fused_refs++; // not, we'll use it and record the fact
+		HASH_NEW_PAIR(code, key, value);
+		this->fpairs_count++;
+		return false;
+	}
+
+	/// put all 'src' values if NO with same key existed
+	void merge_dont_replace(const HASH_STRING& src) {
+#ifdef HASH_ORDER
+		for(Pair *pair=src.first; pair; pair=pair->next)
+#else
+		for(int i=0; i<src.allocated; i++)
+			for(Pair *pair=src.refs[i]; pair; pair=pair->link)
+#endif
+				put_dont_replace(String::Body(pair->key, pair->code), pair->value);
+	}
+
+	/// iterate over all pairs
+	template<typename I> void for_each(void callback(K, V, I), I info) const {
+		HASH_FOR_EACH
+			callback(String::Body(pair->key, pair->code), pair->value, info);
+	}
+
+	/// iterate over all pairs
+	template<typename I> void for_each_ref(void callback(K, V&, I), I info) const {
+		HASH_FOR_EACH
+			callback(String::Body(pair->key, pair->code), pair->value, info);
+	}
+
+	/// iterate over all pairs until condition becomes true, return that element
+	template<typename I> V first_that(bool callback(K, V, I), I info) const {
+		HASH_FOR_EACH
+			if(callback(String::Body(pair->key, pair->code), pair->value, info))
+				return pair->value;
+		return V(0);
+	}
+
+	/// simple hash iterator
+	class Iterator {
+		const HASH_STRING<V>& fhash;
+		Pair *fcurrent;
+	public:
+		Iterator(const HASH_STRING<V>& ahash): fhash(ahash) {
+			fcurrent=fhash.first;
+		}
+
+		operator bool () {
+			return fcurrent != 0;
+		}
+
+		void next() {
+			fcurrent=fcurrent->next;
+		}
+
+		String::Body key(){
+			return String::Body(fcurrent->key, fcurrent->code);
+		}
+
+		V value(){
+			return fcurrent->value;
+		}
+	};
+};
+#else //HASH_CODE_CACHING
+
+template<typename V> class HASH_STRING: public HASH<const String::Body,V>{};
+
+#endif //HASH_CODE_CACHING
+
+#ifndef HASH_ORDER
+///    Auto-object used to temporarily substituting/removing string hash values
 template <typename K, typename V>
 class Temp_hash_value {
-	Hash<K, V>& fhash;
+	HashString<V> &fhash;
 	K fname;
 	V saved_value;
 public:
-	Temp_hash_value(Hash<K, V>& ahash, K aname, V avalue) : 
+	Temp_hash_value(HashString<V>& ahash, K aname, V avalue) :
 		fhash(ahash),
 		fname(aname),
 		saved_value(ahash.get(aname)) {
@@ -510,5 +639,6 @@ public:
 		fhash.put(fname, saved_value);
 	}
 };
-
 #endif
+
+#endif //PA_HASH_CLASS