--- parser3/src/main/pa_exception.C	2002/02/08 07:27:47	1.37
+++ parser3/src/main/pa_exception.C	2003/01/24 11:33:03	1.43.2.5
@@ -1,73 +1,49 @@
 /** @file
 	Parser: exception class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_exception.C,v 1.37 2002/02/08 07:27:47 paf Exp $
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
+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=fcode=fproblem_source=0;
-	owns_comment=false; fcomment=0;
+	ftype=0;
+	fproblem_source=undefined_source;
+	fcomment=CharPtr(0);
 }
-Exception::Exception(const String *atype, const String *acode,
-					  const String *aproblem_source, 
+Exception::Exception(const char *atype, 
+					  ConstStringPtr aproblem_source, 
 					  const char *comment_fmt, ...) {
 	//_asm int 3;
 //__asm__("int3");
 	ftype=atype;
-	fcode=acode;
 	fproblem_source=aproblem_source;
-	owns_comment=true;
 
+	char *comment;
 	if(comment_fmt) {
-		fcomment=(char *)malloc(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),
-	fcode(src.fcode),
-	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;
-	fcode=src.fcode;
-	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
 Exception::Exception(
-	const String *atype, const String *acode,
 	const String *aproblem_source, 
 	GdomeException& exc) :
-	ftype(atype),
-	fcode(acode),
+	ftype("xml"),
 	fproblem_source(aproblem_source),
 	owns_comment(true) {
 
@@ -124,3 +100,7 @@ Exception::Exception(
 		fcomment=0;
 }
 #endif
+
+ConstStringPtr Exception::problem_source() const { 
+	return fproblem_source.get() && fproblem_source->size()?fproblem_source:undefined_source; 
+}