--- parser3/src/include/pa_request.h	2003/07/24 11:31:21	1.162
+++ parser3/src/include/pa_request.h	2003/10/02 07:26:46	1.165
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char* IDENT_REQUEST_H="$Date: 2003/07/24 11:31:21 $";
+static const char* IDENT_REQUEST_H="$Date: 2003/10/02 07:26:46 $";
 
 #include "pa_hash.h"
 #include "pa_wcontext.h"
@@ -92,6 +92,7 @@ private:
 		Exception_trace(): fbottom(0) {}
 
 		size_t bottom_index() { return fbottom; }
+		void set_bottom_index(size_t abottom) { fbottom=abottom; }
 		element_type bottom_value() { return get(bottom_index()); }
 
 		void clear() {
@@ -111,9 +112,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 +144,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 +339,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
@@ -362,7 +363,7 @@ private: // compile.C
 private: // execute.C
 
 	/// for @postprocess[body]
-	const String& execute_method(VMethodFrame& amethodFrame, const Method& method);
+	StringOrValue execute_method(VMethodFrame& amethodFrame, const Method& method);
 	//{ for @conf[filespec] and @auto[filespec]
 	const String* execute_method(Value& aself, 
 		const Method& method, VString* optional_param,
@@ -422,7 +423,8 @@ class Request_context_saver {
 	Request& fr;
 
 	/// exception stack trace
-	size_t exception_trace;
+	size_t exception_trace_top;
+	size_t exception_trace_bottom;
 	/// execution stack
 	size_t stack;
 	/// contexts
@@ -436,8 +438,9 @@ class Request_context_saver {
 
 public:
 	Request_context_saver(Request& ar) : 
-		exception_trace(ar.exception_trace.top()),	
-		stack(ar.stack.top()),
+		exception_trace_top(ar.exception_trace.top_index()),	
+		exception_trace_bottom(ar.exception_trace.bottom_index()),	
+		stack(ar.stack.top_index()),
 		method_frame(ar.method_frame),
 		rcontext(ar.rcontext),
 		wcontext(ar.wcontext),
@@ -445,8 +448,9 @@ public:
 		fconnection(ar.fconnection),
 		fr(ar) {}
 	void restore() {
-		fr.exception_trace.top(exception_trace);
-		fr.stack.top(stack);
+		fr.exception_trace.set_top_index(exception_trace_top);
+		fr.exception_trace.set_bottom_index(exception_trace_bottom);
+		fr.stack.set_top_index(stack);
 		fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext;
 		fr.flang=flang;
 		fr.fconnection=fconnection;