--- parser3/src/main/pa_exception.C	2003/02/04 12:08:56	1.43.2.12
+++ parser3/src/main/pa_exception.C	2003/03/26 07:45:23	1.43.2.15.2.8
@@ -5,25 +5,17 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXCEPTION_C="$Date: 2003/02/04 12:08:56 $";
+static const char* IDENT_EXCEPTION_C="$Date: 2003/03/26 07:45:23 $";
 
 #include "pa_common.h"
 #include "pa_exception.h"
 #include "pa_sapi.h"
+#include "pa_globals.h"
 
-// statics
-
-
-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(): ftype(0), fproblem_source(0), fcomment(0) {}
 Exception::Exception(const Exception& src):
 	ftype(src.ftype),
 	fproblem_source(src.fproblem_source),
@@ -39,33 +31,28 @@ Exception& Exception::operator =(const E
 
 
 Exception::Exception(const char* atype, 
-					  StringPtr aproblem_source, 
+					  const String* aproblem_source, 
 					  const char* comment_fmt, ...) {
-	//_asm int 3;
-//__asm__("int3");
 	ftype=atype;
 	fproblem_source=aproblem_source;
 
-	char *comment;
 	if(comment_fmt) {
-		comment=new char[MAX_STRING];
+		fcomment=new(PointerFreeGC) char[MAX_STRING];
 		va_list args;
 		va_start(args, comment_fmt);
-		vsnprintf(comment, MAX_STRING, comment_fmt, args);
+		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
+//		_asm int 3;
 		va_end(args);
 	} else
-		comment=0;
-
-	fcomment=CharPtr(comment);
+		fcomment=0;
 }
 
 #ifdef XML
 Exception::Exception(
-	const String *aproblem_source, 
+	const String* aproblem_source, 
 	GdomeException& exc) :
 	ftype("xml"),
-	fproblem_source(aproblem_source),
-	owns_comment(true) {
+	fproblem_source(aproblem_source) {
 
 	const char* xml_generic_errors=xmlGenericErrors();
 	if(xml_generic_errors || exc) {
@@ -91,7 +78,7 @@ Exception::Exception(
 		default: s="<UNKNOWN CODE>"; break;
 		}
 		
-		fcomment=(char *)malloc(MAX_STRING);
+		fcomment=new(PointerFreeGC) char[MAX_STRING];
 		const char* xml_error_message;
 		const char* xml_error_prefix;
 		if(xml_generic_errors) {
@@ -114,13 +101,11 @@ Exception::Exception(
 				"%s", 
 					xml_error_message // xml generic messages accumulated
 			);
-		if(xml_generic_errors)
-			free((void *)xml_generic_errors);
 	} else
 		fcomment=0;
 }
 #endif
 
-StringPtr Exception::problem_source() const { 
-	return fproblem_source.get() && fproblem_source->size()?fproblem_source:undefined_source; 
+const String* Exception::problem_source() const { 
+	return fproblem_source && fproblem_source->length()?fproblem_source:0; 
 }