--- parser3/src/main/pa_exception.C	2002/03/27 15:30:36	1.40
+++ parser3/src/main/pa_exception.C	2003/01/24 11:33:03	1.43.2.5
@@ -1,65 +1,42 @@
 /** @file
 	Parser: exception class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_exception.C,v 1.40 2002/03/27 15:30:36 paf Exp $
 */
 
+static const char* IDENT_EXCEPTION_C="$Date: 2003/01/24 11:33:03 $";
+
 #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=0;
-	owns_comment=false; fcomment=0;
+	fproblem_source=undefined_source;
+	fcomment=CharPtr(0);
 }
 Exception::Exception(const char *atype, 
-					  const String *aproblem_source, 
+					  ConstStringPtr 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) {
-		fcomment=(char *)malloc(MAX_STRING);
-		if(!fcomment)
-			SAPI::die("out of memory in 'Exception::Exception', failed to allocated %u bytes", MAX_STRING);
+		comment=new char[MAX_STRING];
 		va_list args;
 		va_start(args, comment_fmt);
-		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
+		vsnprintf(comment, MAX_STRING, comment_fmt, args);
 		va_end(args);
 	} else
-		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);
+		comment=0;
+
+	fcomment=CharPtr(comment);
 }
 
 #ifdef XML
@@ -123,3 +100,7 @@ Exception::Exception(
 		fcomment=0;
 }
 #endif
+
+ConstStringPtr Exception::problem_source() const { 
+	return fproblem_source.get() && fproblem_source->size()?fproblem_source:undefined_source; 
+}