--- parser3/src/include/pa_request.h	2003/09/29 10:51:02	1.164
+++ parser3/src/include/pa_request.h	2003/10/22 07:15:47	1.167
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char* IDENT_REQUEST_H="$Date: 2003/09/29 10:51:02 $";
+static const char* IDENT_REQUEST_H="$Date: 2003/10/22 07:15:47 $";
 
 #include "pa_hash.h"
 #include "pa_wcontext.h"
@@ -72,9 +72,7 @@ private:
 	public:
 		Value& value() const { return *fvalue; }
 		const String& string() const { 
-			const String* result=fvalue->get_string();
-			assert(result);
-			return *result; 
+			return fvalue->as_string();
 		}
 		ArrayOperation& ops() const { return *fops; }
 		VMethodFrame& method_frame() const { return *fmethod_frame; }
@@ -92,6 +90,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() {
@@ -153,9 +152,7 @@ public:
 		Exception_details(
 			const Trace atrace,
 			const String* aproblem_source,
-			VHash& avhash):
-			trace(atrace), problem_source(aproblem_source), vhash(avhash) {}
-
+			VHash& avhash): trace(atrace), problem_source(aproblem_source), vhash(avhash) {}
 	};
 	Exception_details get_details(const Exception& e);
 
@@ -422,9 +419,11 @@ 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;
+	uint anti_endless_execute_recoursion;
 	/// contexts
 	VMethodFrame* method_frame;
 	Value* rcontext;
@@ -436,8 +435,10 @@ 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()),
+		anti_endless_execute_recoursion(ar.anti_endless_execute_recoursion),
 		method_frame(ar.method_frame),
 		rcontext(ar.rcontext),
 		wcontext(ar.wcontext),
@@ -445,8 +446,10 @@ 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.anti_endless_execute_recoursion=anti_endless_execute_recoursion;
 		fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext;
 		fr.flang=flang;
 		fr.fconnection=fconnection;