--- parser3/src/include/pa_request.h	2024/10/02 21:24:41	1.267
+++ parser3/src/include/pa_request.h	2026/09/25 17:03:52	1.275
@@ -1,39 +1,30 @@
 /** @file
 	Parser: request class decl.
 
-	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)
 	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.267 2024/10/02 21:24:41 moko Exp $"
+#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.275 2026/09/25 17:03:52 moko Exp $"
 
 #include "pa_pool.h"
 #include "pa_hash.h"
 #include "pa_wcontext.h"
 #include "pa_value.h"
+#include "pa_vhash.h"
 #include "pa_stack.h"
 #include "pa_request_info.h"
 #include "pa_request_charsets.h"
 #include "pa_sapi.h"
 
-// defines for externs
-
-#define EXCEPTION_HANDLED_PART_NAME "handled"
-
-
 // externs
 
 extern const String main_method_name;
 extern const String auto_method_name;
 
-extern const String exception_type_part_name;
-extern const String exception_source_part_name;
-extern const String exception_comment_part_name;
-extern const String exception_handled_part_name;
-
 // defines for statics
 
 #define MAIN_CLASS_NAME "MAIN"
@@ -54,6 +45,7 @@ class VResponse;
 class VCookie;
 class VStateless_class;
 class VConsole;
+class VException;
 
 extern int pa_loop_limit;
 extern int pa_array_limit;
@@ -70,6 +62,7 @@ class Request: public PA_Object {
 	friend class Temp_recursion;
 	friend class Request_context_saver;
 	friend class Exception_trace;
+	friend class VException;
 
 public:
 	class Trace {
@@ -125,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;
@@ -134,13 +128,16 @@ 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
 
 	/// classes
-	HashString<VStateless_class*> fclasses;
+	OrderedHashString<VStateless_class*> fclasses;
 
 	/// already used files to avoid cyclic uses
 	HashString<bool> used_files;
@@ -156,9 +153,9 @@ private:
 	/// execution stack
 	Stack<StackItem> stack;
 
+public:
 	/// exception stack trace
 	Exception_trace exception_trace;
-public:
 
 	bool allow_class_replace;
 
@@ -182,14 +179,7 @@ private:
 public:
 	uint register_file(String::Body file_spec);
 
-	struct Exception_details {
-		const Operation::Origin origin;
-		const String* problem_source;
-		VHash& vhash;
-		Exception_details(const Operation::Origin aorigin, const String* aproblem_source, VHash& avhash): origin(aorigin), problem_source(aproblem_source), vhash(avhash) {}
-	};
-	Exception_details get_details(const Exception& e);
-	const char* get_exception_cstr(const Exception& e, Exception_details& details);
+	const char* get_exception_cstr(const Exception& e, VException& details);
 
 	/// @see Stack::wipe_unused
 	void wipe_unused_execution_stack() {
@@ -208,7 +198,7 @@ public:
 	~Request();
 
 	/// global classes
-	HashString<VStateless_class*>& classes() { return fclasses; }
+	OrderedHashString<VStateless_class*>& classes() { return fclasses; }
 	VStateless_class* get_class(const String& name);
 	VStateless_class& get_class_ref(const String& name);
 	void put_class(VStateless_class *aclass){ classes().put(aclass->type(), aclass); }
@@ -253,7 +243,7 @@ public:
 
 	/// execute ops with anti-recursion check
 	void recursion_checked_execute(ArrayOperation& ops) {
-		if(++anti_endless_execute_recursion==pa_execute_recursion_limit) {
+		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");
 		}
@@ -433,13 +423,31 @@ private:
 	void output_result(VFile* body_file, bool header_only, bool as_attachment);
 };
 
+/// Hash-compatible exception; hash is built on demand.
+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;
+
+	VException(Request& r, const Exception& e);
+
+	override HashStringValue& hash();
+	override Value* get_element(const String& name);
+	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;
@@ -455,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),
@@ -465,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;