--- parser3/src/main/pa_exception.C	2002/02/08 08:30:16	1.38
+++ parser3/src/main/pa_exception.C	2003/03/19 16:28:08	1.43.2.15.2.2
@@ -1,32 +1,45 @@
 /** @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.38 2002/02/08 08:30:16 paf Exp $
 */
 
+static const char* IDENT_EXCEPTION_C="$Date: 2003/03/19 16:28:08 $";
+
 #include "pa_common.h"
 #include "pa_exception.h"
+#include "pa_sapi.h"
 #include "pa_globals.h"
 
-Exception::Exception() {
-	ftype=fcode=fproblem_source=0;
-	owns_comment=false; fcomment=0;
+
+// 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(const String *atype, const String *acode,
-					  const String *aproblem_source, 
-					  const char *comment_fmt, ...) {
+Exception& Exception::operator =(const Exception& src) {
+	ftype=src.ftype;
+	fproblem_source=src.fproblem_source;
+	fcomment=src.fcomment;
+	return *this;
+}
+
+
+
+Exception::Exception(const char* atype, 
+					  const String* aproblem_source, 
+					  const char* comment_fmt, ...) {
 	//_asm int 3;
 //__asm__("int3");
 	ftype=atype;
-	fcode=acode;
 	fproblem_source=aproblem_source;
-	owns_comment=true;
 
 	if(comment_fmt) {
-		fcomment=(char *)malloc(MAX_STRING);
+		fcomment=new char[MAX_STRING];
 		va_list args;
 		va_start(args, comment_fmt);
 		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
@@ -34,46 +47,17 @@ Exception::Exception(const String *atype
 	} 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);
-}
 
 #ifdef XML
 Exception::Exception(
-	const String *atype, const String *acode,
-	const String *aproblem_source, 
+	const String* aproblem_source, 
 	GdomeException& exc) :
-	ftype(atype),
-	fcode(acode),
-	fproblem_source(aproblem_source),
-	owns_comment(true) {
-
-	const char *xml_generic_errors=xmlGenericErrors();
-	if(xml_generic_errors || exc) {
-		const char *s;
+	ftype("xml"),
+	fproblem_source(aproblem_source) {
+
+	const char* xml_generic_errors=xmlGenericErrors();
+	if(xml_generic_errors.get() || exc) {
+		const char* s;
 		switch((GdomeExceptionCode)exc) {
 		case GDOME_NOEXCEPTION_ERR: s="NOEXCEPTION_ERR"; break;
 		case GDOME_INDEX_SIZE_ERR: s="INDEX_SIZE_ERR"; break;
@@ -95,9 +79,9 @@ Exception::Exception(
 		default: s="<UNKNOWN CODE>"; break;
 		}
 		
-		fcomment=(char *)malloc(MAX_STRING);
-		const char *xml_error_message;
-		const char *xml_error_prefix;
+		fcomment=CharPtr(new char[MAX_STRING]);
+		const char* xml_error_message;
+		const char* xml_error_prefix;
 		if(xml_generic_errors) {
 			xml_error_prefix="\n";
 			xml_error_message=xml_generic_errors;
@@ -118,9 +102,11 @@ Exception::Exception(
 				"%s", 
 					xml_error_message // xml generic messages accumulated
 			);
-		if(xml_generic_errors)
-			free((void *)xml_generic_errors);
 	} else
-		fcomment=0;
+		fcomment=CharPtr(0);
 }
 #endif
+
+const String* Exception::problem_source() const { 
+	return fproblem_source && fproblem_source->size()?fproblem_source:0; 
+}