--- parser3/src/include/pa_request.h	2003/04/03 11:19:49	1.160.2.37.2.22
+++ parser3/src/include/pa_request.h	2003/09/24 14:32:06	1.162.4.1
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char* IDENT_REQUEST_H="$Date: 2003/04/03 11:19:49 $";
+static const char* IDENT_REQUEST_H="$Date: 2003/09/24 14:32:06 $";
 
 #include "pa_hash.h"
 #include "pa_wcontext.h"
@@ -50,17 +50,17 @@ class Request: public PA_Object {
 public:
 	class Trace {
 		const String* fname;
-		Operation::Info forigin;
+		Operation::Origin forigin;
 	public:
 		Trace(): fname(0) {}
 		void clear() { fname=0; }
 		operator bool() const { return fname!=0; }
 
-		Trace(const String* aname, const Operation::Info aorigin):
+		Trace(const String* aname, const Operation::Origin aorigin):
 			fname(aname), forigin(aorigin) {}
 
 		const String* name() const { return fname; }
-		const Operation::Info origin() const { return forigin; }
+		const Operation::Origin origin() const { return forigin; }
 	};
 
 
@@ -111,9 +111,9 @@ private:
 	HashStringValue fclasses;
 
 	/// already used files to avoid cyclic uses
-	Hash<const StringBody, bool> used_files;
+	Hash<const String::Body, bool> used_files;
 	/// list of all used files, Operation::file_no = index to it
-	Array<StringBody> file_list;
+	Array<String::Body> file_list;
 
 	/**	endless execute(execute(... preventing counter 
 		@see ANTI_ENDLESS_EXECUTE_RECOURSION
@@ -143,7 +143,7 @@ public:
 	bool finterrupted;
 
 public:
-	size_t register_file(StringBody file_spec);
+	size_t register_file(String::Body file_spec);
 
 	struct Exception_details {
 		const Trace trace;
@@ -338,7 +338,7 @@ public: // charset helpers
 	/// @see Charset::transcode
 	GdomeDOMString_auto_ptr transcode(const String& s);
 	/// @see Charset::transcode
-	GdomeDOMString_auto_ptr transcode(const StringBody s);
+	GdomeDOMString_auto_ptr transcode(const String::Body s);
 	/// @see Charset::transcode
 	const String& transcode(GdomeDOMString* s);
 	/// @see Charset::transcode
@@ -436,8 +436,8 @@ class Request_context_saver {
 
 public:
 	Request_context_saver(Request& ar) : 
-		exception_trace(ar.exception_trace.top_index()),	
-		stack(ar.stack.top_index()),
+		exception_trace(ar.exception_trace.top()),	
+		stack(ar.stack.top()),
 		method_frame(ar.method_frame),
 		rcontext(ar.rcontext),
 		wcontext(ar.wcontext),
@@ -445,8 +445,8 @@ public:
 		fconnection(ar.fconnection),
 		fr(ar) {}
 	void restore() {
-		fr.exception_trace.top_index(exception_trace);
-		fr.stack.top_index(stack);
+		fr.exception_trace.top(exception_trace);
+		fr.stack.top(stack);
 		fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext;
 		fr.flang=flang;
 		fr.fconnection=fconnection;