--- parser3/src/include/pa_array.h	2003/01/27 15:35:24	1.57.2.10
+++ parser3/src/include/pa_array.h	2003/02/03 14:40:07	1.57.2.18
@@ -1,14 +1,14 @@
 /** @file
 	Parser: Array & Array_iterator classes decls.
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_ARRAY_H
 #define PA_ARRAY_H
 
-static const char* IDENT_ARRAY_Y="$Date: 2003/01/27 15:35:24 $";
+static const char* IDENT_ARRAY_Y="$Date: 2003/02/03 14:40:07 $";
 
 #include "pa_pool.h"
 #include "pa_exception.h"
@@ -23,9 +23,20 @@ template<typename T> class Array: public
 
 	friend class Array_iterator<T>;
 
+protected:
+
+	// default expand delta size
+	int fdelta;
+
+	/// elements[growing size] here
+	T *felements;
+
 	// allocated size
 	int fallocated;
 
+	// array size
+	int fused;
+
 public:
 	typedef T element_type;
 
@@ -87,23 +98,25 @@ public:
 	}
 
 	/// get index-element
-	T get(int index) const {
+	T& get(int index) {
 		if(!(index>=0 && index<count())) {
 			throw Exception(0, 
 				Exception::undefined_source,
 				"Array::get(%d) out of range [0..%d]", index, count()-1);
-			return 0; // never
+			return felements[0]; // never
 		}
 
 		return felements[index];
 	}
 
+	T& operator [](int index) { return get(index); }
+
 	/// put index-element
-	void put(int index, T element) {
-		if(!(index>=0 && index<size())) {
+	void put(int index, T& element) {
+		if(!(index>=0 && index<count())) {
 			throw Exception(0, 
 				Exception::undefined_source, 
-				"Array::put(%d) out of range [0..%d]", index, size()-1);
+				"Array::put(%d) out of range [0..%d]", index, count()-1);
 			return; // never
 		}
 		felements[index]=element;
@@ -129,15 +142,6 @@ public:
 
 protected:
 
-	// default expand delta size
-	int fdelta;
-
-	/// elements[growing size] here
-	T *felements;
-
-	// array size
-	int fused;
-
 	bool is_full() {
 		return fused == fallocated;
 	}
@@ -161,14 +165,18 @@ public:
 		return result.get();
 	}
 
-	char *malloc(const char *buf, size_t size) {
+	char *copy(const char* buf, size_t size=0) {
+		if(!size)
+			size=strlen(buf)+1;
+
 		char *result=malloc(size);
 		memcpy(result, buf, size);
 		return result;
 	}
 };
 
-void *operator new(size_t size, Pool& pool) { 
+#define HERE1
+inline void *operator new(size_t size, Pool& pool) { 
 	return pool.malloc(size);
 }
 
@@ -192,7 +200,7 @@ public:
 	}
 
 	/// quickly extracts next Array element
-	T next() {
+	T& next() {
 		return *(fcurrent++);
 	}