--- parser3/src/include/pa_request.h	2026/09/24 02:40:10	1.273
+++ parser3/src/include/pa_request.h	2026/09/26 17:41:10	1.276
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.273 2026/09/24 02:40:10 moko Exp $"
+#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.276 2026/09/26 17:41:10 moko Exp $"
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -118,6 +118,7 @@ private:
 		size_t bottom_index() { return fbottom; }
 		void set_bottom_index(size_t abottom) { fbottom=abottom; }
 		element_type bottom_value() { return get(bottom_index()); }
+		void set_range(size_t bottom, size_t top) { fbottom=bottom; fsize=top; }
 
 		void clear() {
 			fsize=fbottom=0;
@@ -127,7 +128,10 @@ private:
 			return fsize==fbottom;
 		}
 
-		Table &table(Request &r);
+		Table &table(Request &r, const String* problem_source) {
+			return table(r, problem_source, bottom_index(), top_index());
+		}
+		Table &table(Request &r, const String* problem_source, size_t bottom, size_t top);
 	};
 
 	///@{ core data
@@ -143,15 +147,17 @@ private:
 
 	/// endless execute(execute(... preventing counter
 	int anti_endless_execute_recursion;
+	int execute_recursion_limit;
+	void recursion_limit_reached();
 
 	///@}
 
 	/// execution stack
 	Stack<StackItem> stack;
 
+public:
 	/// exception stack trace
 	Exception_trace exception_trace;
-public:
 
 	bool allow_class_replace;
 
@@ -239,10 +245,8 @@ public:
 
 	/// execute ops with anti-recursion check
 	void recursion_checked_execute(ArrayOperation& ops) {
-		if(++anti_endless_execute_recursion>=pa_execute_recursion_limit) {
-			anti_endless_execute_recursion=0; // give @exception a chance
-			throw Exception(PARSER_RUNTIME, 0, "call canceled - endless recursion detected");
-		}
+		if(++anti_endless_execute_recursion>=execute_recursion_limit)
+			recursion_limit_reached();
 		execute(ops); // execute it
 		anti_endless_execute_recursion--;
 	}
@@ -424,6 +428,7 @@ class VException: public VHashReference
 	Exception fexception;
 	String::Body ffile;
 	Value* fhandled;
+	size_t ftrace_bottom, ftrace_top;
 public:
 	Operation::Origin origin;
 	const String* problem_source;
@@ -435,15 +440,14 @@ public:
 	override const VJunction* put_element(const String& name, Value* value);
 
 	Value* handled();
+	Table& stack(Request& r);
+	void expire_trace() { ftrace_top=size_t(-1); }
 };
 
 /// Auto-object used to save request context across ^try body
 class Request_context_saver {
 	Request& fr;
 
-	/// exception stack trace
-	size_t exception_trace_top;
-	size_t exception_trace_bottom;
 	/// execution stack
 	size_t stack;
 	uint anti_endless_execute_recursion;
@@ -459,8 +463,6 @@ class Request_context_saver {
 public:
 	Request_context_saver(Request& ar) :
 		fr(ar),
-		exception_trace_top(ar.exception_trace.top_index()),
-		exception_trace_bottom(ar.exception_trace.bottom_index()),
 		stack(ar.stack.top_index()),
 		anti_endless_execute_recursion(ar.anti_endless_execute_recursion),
 		method_frame(ar.method_frame),
@@ -469,8 +471,6 @@ public:
 		flang(ar.flang),
 		fconnection(ar.fconnection) {}
 	void restore() {
-		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_recursion=anti_endless_execute_recursion;
 		fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext;