--- parser3/src/include/pa_hash.h	2003/03/24 15:26:02	1.58.2.18.2.6
+++ parser3/src/include/pa_hash.h	2005/08/05 13:02:59	1.62.12.1
@@ -1,7 +1,7 @@
 /** @file
 	Parser: hash class decl.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
@@ -17,11 +17,23 @@
 #ifndef PA_HASH_H
 #define PA_HASH_H
 
-static const char* IDENT_HASH_H="$Date: 2003/03/24 15:26:02 $";
+static const char * const IDENT_HASH_H="$Date: 2005/08/05 13:02:59 $";
 
 #include "pa_memory.h"
 #include "pa_types.h"
 
+const int HASH_ALLOCATES_COUNT=29;
+
+/** Zend comment: Generated on an Octa-ALPHA 300MHz CPU & 2.5GB RAM monster 
+
+	paf: HPUX ld could not handle static member: unsatisfied symbols
+*/
+static uint Hash_allocates[HASH_ALLOCATES_COUNT]={
+	5, 11, 19, 53, 107, 223, 463, 983, 1979, 3907, 7963, 
+	16229, 32531, 65407, 130987, 262237, 524521, 1048793, 
+	2097397, 4194103, 8388857, 16777447, 33554201, 67108961, 
+	134217487, 268435697, 536870683, 1073741621, 2147483399};
+
 /** 
 	Simple hash.
 
@@ -37,10 +49,10 @@ public:
 	typedef V value_type;
 
 	Hash() { 
-		allocated=allocates[allocates_index=0];
+		allocated=Hash_allocates[allocates_index=0];
 		threshold=allocated*THRESHOLD_PERCENT/100;
 		fpairs_count=fused_refs=0;
-		refs=new(0) Pair*[allocated];
+		refs=new(UseGC) Pair*[allocated];
 	}
 
 	Hash(const Hash& source) {
@@ -49,7 +61,7 @@ public:
 		threshold=source.threshold;
 		fused_refs=source.fused_refs;
 		fpairs_count=source.fpairs_count;
-		refs=new(0) Pair*[allocated];
+		refs=new(UseGC) Pair*[allocated];
 
 		// clone & rehash
 		Pair **old_ref=source.refs;
@@ -184,6 +196,14 @@ public:
 				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);
+	}
+
 	/// 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;
@@ -208,14 +228,9 @@ private:
 		THRESHOLD_PERCENT=75
 	};
 
-	/// the index of [allocated] in [allocates]
+	/// the index of [allocated] in [Hash_allocates]
 	int allocates_index;
 
-	/// possible [allocates]. prime numbers
-	static uint allocates[];
-	
-	static int allocates_count;
-
 	/// number of allocated pairs
 	int allocated;
 
@@ -251,9 +266,9 @@ private:
 		int old_allocated=allocated;
 		Pair **old_refs=refs;
 
-		allocates_index=allocates_index+1<allocates_count?allocates_index+1:allocates_count-1;
+		allocates_index=allocates_index+1<HASH_ALLOCATES_COUNT?allocates_index+1:HASH_ALLOCATES_COUNT-1;
 		// allocated bigger refs array
-		allocated=allocates[allocates_index];
+		allocated=Hash_allocates[allocates_index];
 		threshold=allocated*THRESHOLD_PERCENT/100;
 		refs=new(UseGC) Pair*[allocated];
 
@@ -279,17 +294,6 @@ private: //disabled
 	Hash& operator = (const Hash&) { return *this; }
 };
 
-/* Zend comment: Generated on an Octa-ALPHA 300MHz CPU & 2.5GB RAM monster */
-template<typename K, typename V>
-uint Hash<K, V>::allocates[]={
-	5, 11, 19, 53, 107, 223, 463, 983, 1979, 3907, 7963, 
-	16229, 32531, 65407, 130987, 262237, 524521, 1048793, 
-	2097397, 4194103, 8388857, 16777447, 33554201, 67108961, 
-	134217487, 268435697, 536870683, 1073741621, 2147483399};
-
-template<typename K, typename V>
-int Hash<K, V>::allocates_count=sizeof(allocates)/sizeof(uint);
-
 /// useful generic hash function
 inline void generic_hash_code(uint& result, char c) {
 	result=(result<<4)+c;