--- parser3/src/main/pa_exception.C	2002/01/21 13:04:03	1.33
+++ parser3/src/main/pa_exception.C	2003/03/07 14:56:59	1.43.2.15
@@ -1,91 +1,72 @@
 /** @file
 	Parser: exception class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_exception.C,v 1.33 2002/01/21 13:04:03 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/03/07 14:56:59 $";
+
 #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;
-}
-void Exception::initialize(
-	const String *atype, const String *acode,
-	const String *aproblem_source, 
-	const char *comment_fmt, va_list args) {
-	//_asm int 3;
-//__asm__("int3");
-	ftype=atype;
-	fcode=acode;
-	fproblem_source=aproblem_source;
-	owns_comment=true;
+// statics
 
-	if(comment_fmt) {
-		fcomment=(char *)malloc(MAX_STRING);
-		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
-	} else
-		fcomment=0;
-}
-Exception::Exception(
-	const String *atype, const String *acode,
-	const String *aproblem_source, 
-	const char *comment_fmt, va_list args) {
-	initialize(atype, acode, aproblem_source, comment_fmt, args);
-}
-Exception::Exception(const String *atype, const String *acode,
-					  const String *aproblem_source, 
-					  const char *comment_fmt, ...) {
-	va_list args;
-    va_start(args, comment_fmt);
-	initialize(atype, acode, aproblem_source, comment_fmt, args);
-	va_end(args);
+
+const char* Exception::undefined_type=0;
+const StringPtr Exception::undefined_source(0);
+
+// methods
+
+Exception::Exception() {
+	ftype=0;
+	fproblem_source=undefined_source;
+	fcomment=CharPtr(0);
 }
-Exception::Exception(const Exception& src) : 
+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;
+	fcomment(src.fcomment) {
 }
 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);
+
+
+
+Exception::Exception(const char* atype, 
+					  StringPtr aproblem_source, 
+					  const char* comment_fmt, ...) {
+	//_asm int 3;
+//__asm__("int3");
+	ftype=atype;
+	fproblem_source=aproblem_source;
+
+	if(comment_fmt) {
+		fcomment=CharPtr(new char[MAX_STRING]);
+		va_list args;
+		va_start(args, comment_fmt);
+		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
+		va_end(args);
+	} else
+		fcomment=CharPtr(0);
 }
 
 #ifdef XML
 Exception::Exception(
-	const String *atype, const String *acode,
-	const String *aproblem_source, 
+	StringPtr 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) {
+
+	CharPtr 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;
@@ -107,25 +88,34 @@ Exception::Exception(
 		default: s="<UNKNOWN CODE>"; break;
 		}
 		
-		fcomment=(char *)malloc(MAX_STRING);
-		const char *xml_error_message=
-			xml_generic_errors?xml_generic_errors:"<no xml_generic_errors>";
+		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;
+		} else {
+			xml_error_prefix="";
+			xml_error_message="";
+		}
 		if(exc)
 			snprintf(fcomment, MAX_STRING, 
-				"DOMException %s (%d).\n"
-				"%s", 
+				"DOMException %s (%d)."
+				"%s%s", 
 					s,  // decoded code of exception
 					exc, // DOM exception code
-					xml_error_message // xml generic messages accumulated
+					xml_error_prefix, xml_error_message // xml generic messages accumulated
 			);
 		else // no DOM exception
 			snprintf(fcomment, MAX_STRING, 
 				"%s", 
 					xml_error_message // xml generic messages accumulated
 			);
-		if(xml_generic_errors)
-			free((void *)xml_generic_errors);
 	} else
-		fcomment=0;
+		fcomment=CharPtr(0);
 }
 #endif
+
+StringPtr Exception::problem_source() const { 
+	return fproblem_source.get() && fproblem_source->size()?fproblem_source:undefined_source; 
+}