--- parser3/src/include/pa_exception.h	2002/01/21 13:04:02	1.28
+++ parser3/src/include/pa_exception.h	2003/11/06 08:22:48	1.40
@@ -1,66 +1,69 @@
 /** @file
 	Parser: exception decls.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_exception.h,v 1.28 2002/01/21 13:04:02 paf Exp $
+	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
 
-#include "pa_types.h"
-#include "pa_string.h"
+static const char* IDENT_EXCEPTION_H="$Date: 2003/11/06 08:22:48 $";
+
+// includes
+
+#include "pa_memory.h"
+
+#ifdef XML
+#	include "gdome.h"
+#endif
+
+// forwards
 
-class Pool;
+class String;
 
 // defines
 
-/// Just simple longjump mechanizm dressed in class clothes. use Temp_exception
 class Exception {
 public:
 
 	Exception();
 	Exception(
-		const String *atype, const String *acode,
-		const String *aproblem_source, 
-		const char *comment_fmt, ...);
-	Exception(
-		const String *atype, const String *acode,
-		const String *aproblem_source, 
-		const char *comment_fmt, va_list args);	
+		const char* atype,
+		const String* aproblem_source, 
+		const char* comment_fmt, ...);
 	Exception(const Exception& src);
 	Exception& operator =(const Exception& src);
-	~Exception();
 
 #ifdef XML
 	Exception(
-		const String *atype, const String *acode,
-		const String *aproblem_source, 
+		const String* aproblem_source, 
 		GdomeException& exc);
 #endif
 
 	/// extracts exception type
-	const String *type() const { return ftype; }
-	/// extracts exception code
-	const String *code() const { return fcode; }
+	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
-	const String *problem_source() const { return fproblem_source; }
+	const String* problem_source() const;
 	/// extracts exception comment
-	const char *comment() const { return fcomment; }
-
-private:
-
-	void initialize(const String *atype, const String *acode,
-		const String *aproblem_source, 
-		const char *comment_fmt, va_list args);
-
-private:
-
-	const String *ftype, *fcode, *fproblem_source;
-	bool owns_comment;
-	char *fcomment;
+	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>";
+	}
+
+protected:
+
+	const char* ftype;
+	const String* fproblem_source;
+	char* fcomment;
 
 };