--- parser3/src/main/pa_exception.C	2003/11/20 16:34:26	1.46
+++ parser3/src/main/pa_exception.C	2024/11/04 03:53:25	1.63
@@ -1,26 +1,27 @@
 /** @file
 	Parser: exception class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
-static const char * const IDENT_EXCEPTION_C="$Date: 2003/11/20 16:34:26 $";
-
 #include "pa_common.h"
 #include "pa_exception.h"
 #include "pa_sapi.h"
 #include "pa_globals.h"
 
+volatile const char * IDENT_PA_EXCEPTION_C="$Id: pa_exception.C,v 1.63 2024/11/04 03:53:25 moko Exp $" IDENT_PA_EXCEPTION_H;
 
 // methods
 
 Exception::Exception(): ftype(0), fproblem_source(0), fcomment(0) {}
+
 Exception::Exception(const Exception& src):
 	ftype(src.ftype),
 	fproblem_source(src.fproblem_source),
 	fcomment(src.fcomment) {
 }
+
 Exception& Exception::operator =(const Exception& src) {
 	ftype=src.ftype;
 	fproblem_source=src.fproblem_source;
@@ -28,23 +29,32 @@ Exception& Exception::operator =(const E
 	return *this;
 }
 
-Exception::Exception(const char* atype, 
-		     const String* aproblem_source, 
-		     const char* comment_fmt, ...) {
+Exception::Exception(const char* atype, const String* aproblem_source, const char* comment_fmt, ...) {
 	ftype=atype;
-	fproblem_source=aproblem_source;
+	fproblem_source=aproblem_source ? new String(*aproblem_source) : 0;
 
-	if(comment_fmt) {
-		fcomment=new(PointerFreeGC) char[MAX_STRING];
+	if(!comment_fmt) {
+		fcomment=0;
+	} else if (!strcmp(comment_fmt, "%s")) { // to avoid MAX_STRING limit
 		va_list args;
 		va_start(args, comment_fmt);
-		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
-//		_asm int 3;
+		fcomment=va_arg(args, const char *);
+		fcomment=fcomment ? pa_strdup(fcomment) : 0;
 		va_end(args);
-	} else
-		fcomment=0;
+	} else {
+		char comment[MAX_STRING];
+		va_list args;
+		va_start(args, comment_fmt);
+		fcomment=pa_strdup(comment, vsnprintf(comment, MAX_STRING, comment_fmt, args));
+		va_end(args);
+	}
+}
+
+void Exception::add_comment(const char* acomment) {
+	if(acomment)
+		fcomment=pa_strcat(fcomment, acomment);
 }
 
-const String* Exception::problem_source() const { 
-	return fproblem_source && fproblem_source->length()?fproblem_source:0; 
+const String* Exception::problem_source() const {
+	return fproblem_source && !fproblem_source->is_empty() ? fproblem_source : 0;
 }