--- parser3/src/main/pa_exception.C	2005/08/09 08:14:52	1.48
+++ parser3/src/main/pa_exception.C	2020/12/15 17:10:36	1.57
@@ -1,26 +1,27 @@
 /** @file
 	Parser: exception class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_EXCEPTION_C="$Date: 2005/08/09 08:14:52 $";
-
 #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.57 2020/12/15 17:10:36 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,25 @@ 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];
+		char comment[MAX_STRING];
 		va_list args;
 		va_start(args, comment_fmt);
-		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
-//		_asm int 3;
+		fcomment=pa_strdup(comment, vsnprintf(comment, MAX_STRING, comment_fmt, args));
 		va_end(args);
 	} else
 		fcomment=0;
 }
 
-const String* Exception::problem_source() const { 
-	return fproblem_source && fproblem_source->length()?fproblem_source:0; 
+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->is_empty() ? fproblem_source : 0;
 }