--- parser3/src/include/pa_exception.h	2003/01/29 12:02:22	1.38.2.10
+++ parser3/src/include/pa_exception.h	2003/11/06 08:48:59	1.41
@@ -1,80 +1,60 @@
 /** @file
 	Parser: exception decls.
 
-	Copyright (c) 2001, 2003 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)
 */
 
 #ifndef PA_EXCEPTION_H
 #define PA_EXCEPTION_H
 
-static const char* IDENT_EXCEPTION_H="$Date: 2003/01/29 12:02:22 $";
+static const char* IDENT_EXCEPTION_H="$Date: 2003/11/06 08:48:59 $";
 
 // includes
 
-#include "pa_pool.h"
+#include "pa_memory.h"
 
 // forwards
 
-class String;  typedef object_ptr<const String> ConstStringPtr;
+class String;
 
 // defines
 
 class Exception {
 public:
 
-	static const char *undefined_type;
-	static const ConstStringPtr undefined_source;
-
 	Exception();
 	Exception(
-		const char *atype,
-		ConstStringPtr aproblem_source, 
-		const char *comment_fmt, ...);
-	Exception(const Exception& src):
-		ftype(src.ftype),
-		fproblem_source(src.fproblem_source),
-		fcomment(src.fcomment) {
-	}
-	Exception& operator =(const Exception& src) {
-		ftype=src.ftype;
-		fproblem_source=src.fproblem_source;
-		fcomment=src.fcomment;
-		return *this;
-	}
-
-#ifdef XML
-	Exception(
-		ConstStringPtr aproblem_source, 
-		GdomeException& exc);
-#endif
+		const char* atype,
+		const String* aproblem_source, 
+		const char* comment_fmt, ...);
+	Exception(const Exception& src);
+	Exception& operator =(const Exception& src);
 
 	/// extracts exception type
-	const char *type(bool can_be_empty=false) const { 
+	const char* type(bool can_be_empty=false) const { 
 		if(can_be_empty)
 			return ftype; 
 		else
 			return ftype?ftype:"<no type>";
 	}
 	/// extracts exception problem_source
-	ConstStringPtr problem_source() const;	/// extracts exception comment
-	const char *comment(bool can_be_empty=false) const { 
-		const char *result=fcomment.get()!=0 && *fcomment.get()?fcomment.get():0;
+	const String* problem_source() const;
+	/// extracts exception comment
+	const char* comment(bool can_be_empty=false) const { 
+		const char* result=fcomment && *fcomment?fcomment:0;
 		if(can_be_empty)
 			return result; 
 		else
 			return result?result:"<no comment>";
 	}
 
-private:
+protected:
 
-	const char *ftype;
-	ConstStringPtr fproblem_source;
-	CharPtr fcomment;
+	const char* ftype;
+	const String* fproblem_source;
+	char* fcomment;
 
 };
 
-const char *undefined_type=0;
-const ConstStringPtr Exception::undefined_source(0);
-
 #endif