--- parser3/src/include/pa_exception.h	2015/10/26 01:21:55	1.65
+++ parser3/src/include/pa_exception.h	2026/04/25 13:38:46	1.76
@@ -1,14 +1,14 @@
 /** @file
 	Parser: exception decls.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #ifndef PA_EXCEPTION_H
 #define PA_EXCEPTION_H
 
-#define IDENT_PA_EXCEPTION_H "$Id: pa_exception.h,v 1.65 2015/10/26 01:21:55 moko Exp $"
+#define IDENT_PA_EXCEPTION_H "$Id: pa_exception.h,v 1.76 2026/04/25 13:38:46 moko Exp $"
 
 const char* const PARSER_RUNTIME = "parser.runtime";
 const char* const IMAGE_FORMAT = "image.format";
@@ -18,16 +18,16 @@ const char* const BASE64_FORMAT = "base6
 
 const char* const NAME_MUST_BE_STRING = "name must be string";
 const char* const FILE_NAME_MUST_BE_STRING = "file name must be string";
+const char* const FILE_NAME_MUST_BE_STRING_OR_FILE = "file name must be string or file";
+const char* const FILE_NAME_MUST_BE_NE_STRING = "file name must be not empty string";
 const char* const VALUE_MUST_BE_STRING = "value must be string";
 const char* const PARAMETER_MUST_BE_STRING = "parameter must be string";
 const char* const COLUMN_NAME_MUST_BE_STRING = "column name must be string";
 
 const char* const FILE_NAME_MUST_BE_SPECIFIED = "file name must be specified";
-const char* const FILE_NAME_MUST_NOT_BE_CODE = "file name must not be code";
-const char* const FIRST_ARG_MUST_NOT_BE_CODE = "first argument must not be code";
 const char* const PARAM_MUST_NOT_BE_CODE = "param must not be code";
 const char* const PARAM_MUST_BE_HASH = "param must be hash";
-const char* const MODE_MUST_NOT_BE_CODE = "mode must not be code";
+const char* const MODE_MUST_BE_STRING = "mode must be string";
 const char* const OPTIONS_MUST_NOT_BE_CODE = "options must not be code";
 
 const char* const CALLED_WITH_INVALID_OPTION = "called with invalid option";
@@ -46,30 +46,48 @@ class Exception {
 public:
 
 	Exception();
-	Exception(
-		const char* atype,
-		const String* aproblem_source, 
-		const char* comment_fmt, ...);
+	Exception(const char* atype, const String* aproblem_source, const char* comment_fmt, ...);
 	Exception(const Exception& src);
+
 	operator bool() { return ftype || fproblem_source || fcomment; }
 	Exception& operator =(const Exception& src);
 
 	/// extracts exception type
-	const char* type(bool can_be_empty=false) const { 
-		if(can_be_empty)
-			return ftype; 
-		else
-			return ftype?ftype:"<no type>";
+	const char* type(bool can_be_empty=false) const {
+		return can_be_empty || ftype ? ftype : "<no type>";
 	}
+
 	/// extracts exception problem_source
 	const String* problem_source() const;
+
 	/// extracts exception comment
-	const char* comment(bool can_be_empty=false) const { 
-		const char* result=fcomment && *fcomment?fcomment:0;
-		if(can_be_empty)
-			return result; 
-		else
-			return result?result:"<no comment>";
+	const char* comment(bool can_be_empty=false) const {
+		const char* result=fcomment && *fcomment ? fcomment : 0;
+		return can_be_empty || result ? result : "<no comment>";
+	}
+
+	// modifies exception to fine-tune error reporting
+	void set_source(const String* aproblem_source) {
+		if(!problem_source())
+			fproblem_source=aproblem_source;
+	}
+
+	void add_comment(const char* acomment);
+
+#define ALTER_EXCEPTION_SOURCE(code, source)	\
+	try {					\
+		code;				\
+	} catch (Exception& e) {		\
+		e.set_source(source);		\
+		rethrow;			\
+	}
+
+#define ALTER_EXCEPTION_COMMENT(code, comment)	\
+	try {					\
+		code;				\
+	} catch (Exception& e) {		\
+		e.add_comment(comment);		\
+		rethrow;			\
 	}
 
 protected: