--- parser3/src/main/pa_exception.C	2003/03/07 14:56:59	1.43.2.15
+++ parser3/src/main/pa_exception.C	2003/07/24 11:31:23	1.44
@@ -5,26 +5,17 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXCEPTION_C="$Date: 2003/03/07 14:56:59 $";
+static const char* IDENT_EXCEPTION_C="$Date: 2003/07/24 11:31: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),
@@ -37,35 +28,32 @@ Exception& Exception::operator =(const E
 	return *this;
 }
 
-
-
 Exception::Exception(const char* atype, 
-					  StringPtr aproblem_source, 
-					  const char* comment_fmt, ...) {
-	//_asm int 3;
-//__asm__("int3");
+		     const String* aproblem_source, 
+		     const char* comment_fmt, ...) {
 	ftype=atype;
 	fproblem_source=aproblem_source;
 
 	if(comment_fmt) {
-		fcomment=CharPtr(new char[MAX_STRING]);
+		fcomment=new(PointerFreeGC) char[MAX_STRING];
 		va_list args;
 		va_start(args, comment_fmt);
 		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
+//		_asm int 3;
 		va_end(args);
 	} else
-		fcomment=CharPtr(0);
+		fcomment=0;
 }
 
 #ifdef XML
 Exception::Exception(
-	StringPtr aproblem_source, 
+	const String* aproblem_source, 
 	GdomeException& exc) :
 	ftype("xml"),
 	fproblem_source(aproblem_source) {
 
-	CharPtr xml_generic_errors=xmlGenericErrors();
-	if(xml_generic_errors.get() || exc) {
+	const char* xml_generic_errors=xmlGenericErrors();
+	if(xml_generic_errors || exc) {
 		const char* s;
 		switch((GdomeExceptionCode)exc) {
 		case GDOME_NOEXCEPTION_ERR: s="NOEXCEPTION_ERR"; break;
@@ -88,7 +76,7 @@ Exception::Exception(
 		default: s="<UNKNOWN CODE>"; break;
 		}
 		
-		fcomment=CharPtr(new char[MAX_STRING]);
+		fcomment=new(PointerFreeGC) char[MAX_STRING];
 		const char* xml_error_message;
 		const char* xml_error_prefix;
 		if(xml_generic_errors) {
@@ -112,10 +100,10 @@ Exception::Exception(
 					xml_error_message // xml generic messages accumulated
 			);
 	} else
-		fcomment=CharPtr(0);
+		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; 
 }