--- parser3/src/include/pa_stack.h	2002/08/01 11:26:48	1.15
+++ parser3/src/include/pa_stack.h	2003/07/24 11:31:21	1.18
@@ -1,45 +1,54 @@
 /** @file
 	Parser: stack class decl.
 
-	Copyright (c) 2001, 2002 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_STACK_H
 #define PA_STACK_H
 
-static const char* IDENT_STACK_H="$Id: pa_stack.h,v 1.15 2002/08/01 11:26:48 paf Exp $";
+static const char* IDENT_STACK_H="$Date: 2003/07/24 11:31:21 $";
 
 #include "pa_config_includes.h"
 #include "pa_array.h"
 
 /// simple stack based on Array
-class Stack : public Array {
+template<typename T> class Stack: public Array<T> {
 public:
 
-	Stack(Pool& apool) : Array(apool), ftop(0) {
-	}
+	Stack(): ftop(0) {}
 
-	void push(Item *item) {
-		if(ftop<size()) // cell is already allocated?
+	void push(T item) {
+		if(ftop<count()) // cell is already allocated?
 			put(ftop, item); // use it
 		else
 			*this+=item; // append it
 		ftop++;
 	}
-	Item *pop() {
+
+	T pop() {
 		return get(--ftop);
 	}
 
-	int top_index() { return ftop-1; }
-	void top_index(int top_index) { ftop=top_index+1; }
-	Item *top_value() { return get(top_index()); }
+	bool is_empty() { return ftop==0; }
+	size_t top() { return ftop; }
+	void top(size_t atop) { ftop=atop; }
+	T upper_value() { 
+		assert(!is_empty());
+		return get(ftop-1); 
+	}
 
-private:
+	/// call this prior to collecting garbage [in unused part of stack there may be pointers(unused)]
+	void wipe_unused() {
+		if(!is_full())
+			memset(&felements[fused], 0, (fallocated-fused)*sizeof(T));
+	}
 
-	// deepest used index
-	int ftop;
+protected:
 
+	// deepest used index+1
+	size_t ftop;
 };
 
 #endif