--- parser3/src/include/pa_array.h	2003/03/26 07:45:22	1.57.2.27.2.6
+++ parser3/src/include/pa_array.h	2003/03/27 10:53:01	1.57.2.27.2.9
@@ -8,7 +8,7 @@
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-static const char* IDENT_ARRAY_H="$Date: 2003/03/26 07:45:22 $";
+static const char* IDENT_ARRAY_H="$Date: 2003/03/27 10:53:01 $";
 
 // includes
 
@@ -30,10 +30,10 @@ protected:
 	T *felements;
 
 	// allocated size
-	int fallocated;
+	size_t fallocated;
 
 	// array size
-	int fused;
+	size_t fused;
 
 public:
 	typedef T element_type;
@@ -46,7 +46,7 @@ public:
 	}
 
 	/// how many items are in Array
-	int count() const { return fused; }
+	size_t count() const { return fused; }
 	/// append to array
 	Array& operator += (T src) {
 		if(is_full())
@@ -88,29 +88,42 @@ public:
 		return *this;
 	}
 
-	/// get index-element
-	T& get(int index) const {
-		if(!(index>=0 && index<count())) {
+	/// quick version of get index-element [use in tight places when sure]
+	T unchecked_get(size_t index) const {
+		return felements[index];
+	}
+
+	/// ref version of quick version of get index-element [use in tight places when sure]
+	T& unchecked_get_ref(size_t index) const {
+		return felements[index];
+	}
+
+	size_t check(const char* name, size_t index) const {
+		size_t lcount=count();
+		if(!(index>=0 && index<lcount)) {
 			throw Exception(0, 
 				0,
-				"Array::get(%d) out of range [0..%d]", index, count()-1);
-			return felements[0]; // never
+				"Array::%s(%d) out of range [0..%d]", name, index, lcount-1);
+			return 0; // never
 		}
+		return index;
+	}
 
-		return felements[index];
+	/// get index-element
+	T get(size_t index) const {
+		return unchecked_get(check("get", index));
 	}
 
-	T& operator [](int index) const { return get(index); }
+	T operator [](size_t index) const { return get(index); }
+/*
+	/// get the reference to index-element
+	T& get_ref(size_t index) {
+		return felements[check("get_ref", index)];
+	}*/
 
 	/// put index-element
-	void put(int index, T& element) {
-		if(!(index>=0 && index<count())) {
-			throw Exception(0, 
-				0, 
-				"Array::put(%d) out of range [0..%d]", index, count()-1);
-			return; // never
-		}
-		felements[index]=element;
+	void put(size_t index, T element) {
+		felements[check("put", index)]=element;
 	}
 
 
@@ -153,8 +166,7 @@ private: //disabled
 /** Array iterator, usage:
 	@code
 	// Array<T> a;
-	Array_iterator<T> i(a);
-	while(i.has_next()) {
+	for(Array_iterator<T> i(a); i.has_next(); ) {
 		T& element=i.next();
 		...
 	}	
@@ -179,22 +191,21 @@ public:
 	}
 
 	/// quickly extracts next Array element
-	const T& next() {
+	const T next() {
 		return *(fcurrent++);
 	}
 
 };
-
+/*
 /** Nonconst array iterator, usage:
 	@code
 	// Array<T> a;
-	Array_iterator<T> i(a);
-	while(i.has_next()) {
+	for(Array_iterator<T> i(a); i.has_next(); ) {
 		T& element=i.next();
 		...
 	}	
 	@endcode
-*/
+* /
 template<typename T> class Array_modifing_iterator {
 
 	Array<T>& farray;
@@ -219,5 +230,5 @@ public:
 	}
 
 };
-
+*/
 #endif