--- parser3/src/main/pa_exception.C	2003/01/24 11:33:03	1.43.2.5
+++ parser3/src/main/pa_exception.C	2003/03/17 14:48:06	1.43.4.1
@@ -5,38 +5,61 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXCEPTION_C="$Date: 2003/01/24 11:33:03 $";
+static const char* IDENT_EXCEPTION_C="$Date: 2003/03/17 14:48:06 $";
 
 #include "pa_common.h"
 #include "pa_exception.h"
-//#include "pa_globals.h"
+#include "pa_globals.h"
 #include "pa_sapi.h"
-#include "pa_string.h"
 
 Exception::Exception() {
 	ftype=0;
-	fproblem_source=undefined_source;
-	fcomment=CharPtr(0);
+	fproblem_source=0;
+	owns_comment=false; fcomment=0;
 }
 Exception::Exception(const char *atype, 
-					  ConstStringPtr aproblem_source, 
+					  const String *aproblem_source, 
 					  const char *comment_fmt, ...) {
 	//_asm int 3;
 //__asm__("int3");
 	ftype=atype;
 	fproblem_source=aproblem_source;
+	owns_comment=true;
 
-	char *comment;
 	if(comment_fmt) {
-		comment=new char[MAX_STRING];
+		fcomment=(char *)::malloc(MAX_STRING);
+		if(!fcomment)
+			SAPI::die("out of memory in 'Exception::Exception', failed to allocated %u bytes", MAX_STRING);
 		va_list args;
 		va_start(args, comment_fmt);
-		vsnprintf(comment, MAX_STRING, comment_fmt, args);
+		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
 		va_end(args);
 	} else
-		comment=0;
-
-	fcomment=CharPtr(comment);
+		fcomment=0;
+}
+Exception::Exception(const Exception& src) : 
+	ftype(src.ftype),
+	fproblem_source(src.fproblem_source),
+	fcomment(src.fcomment),
+	owns_comment(src.owns_comment) {
+	// that ugly string got from STL, along with principal ideal
+	const_cast<Exception *>(&src)->owns_comment=false;
+}
+Exception& Exception::operator =(const Exception& src) {
+	ftype=src.ftype;
+	fproblem_source=src.fproblem_source;
+
+	if(owns_comment)
+		free(fcomment);
+	fcomment=src.fcomment;
+	// that ugly string got from STL, along with principal ideal
+	owns_comment=src.owns_comment;  ((Exception*)&src)->owns_comment=false;
+	
+	return *this;
+}
+Exception::~Exception() {
+	if(owns_comment)
+		::free(fcomment);
 }
 
 #ifdef XML
@@ -71,7 +94,7 @@ Exception::Exception(
 		default: s="<UNKNOWN CODE>"; break;
 		}
 		
-		fcomment=(char *)malloc(MAX_STRING);
+		fcomment=(char *)::malloc(MAX_STRING);
 		const char *xml_error_message;
 		const char *xml_error_prefix;
 		if(xml_generic_errors) {
@@ -100,7 +123,3 @@ Exception::Exception(
 		fcomment=0;
 }
 #endif
-
-ConstStringPtr Exception::problem_source() const { 
-	return fproblem_source.get() && fproblem_source->size()?fproblem_source:undefined_source; 
-}