--- parser3/src/include/pa_exception.h	2001/11/15 20:26:34	1.22
+++ parser3/src/include/pa_exception.h	2002/04/29 06:27:29	1.35
@@ -1,37 +1,28 @@
 /** @file
 	Parser: exception decls.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_exception.h,v 1.22 2001/11/15 20:26:34 paf Exp $
+	$Id: pa_exception.h,v 1.35 2002/04/29 06:27:29 paf Exp $
 */
 
 #ifndef PA_EXCEPTION_H
 #define PA_EXCEPTION_H
 
-#include "pa_config_includes.h"
 #include "pa_types.h"
 #include "pa_string.h"
 
-#ifdef XML
-#include <PlatformSupport/XSLException.hpp>
-#include <sax/SAXException.hpp>
-#include <sax/SAXParseException.hpp>
-#include <util/XMLException.hpp>
-#endif
-
 class Pool;
 
 // defines
 
-/// Just simple longjump mechanizm dressed in class clothes. use Temp_exception
 class Exception {
 public:
 
 	Exception();
 	Exception(
-		const String *atype, const String *acode,
+		const char *atype,
 		const String *aproblem_source, 
 		const char *comment_fmt, ...);
 	Exception(const Exception& src);
@@ -39,32 +30,36 @@ public:
 	~Exception();
 
 #ifdef XML
-	/// converts XSL exception to parser exception
-	static void provide_source(Pool& pool, const String *source, const XSLException& e);
-	/// converts SAX exception to parser exception
-	static void provide_source(Pool& pool, const String *source, const SAXException& e);
-	/// converts SAX parse exception to parser exception
-	static void provide_source(Pool& pool, const String *source, const SAXParseException& e);
-	/// converts XML exception to parser exception
-	static void provide_source(Pool& pool, const String *source, const XMLException& e);
-	/// converts Xalan DOM exception to parser exception
-	static void provide_source(Pool& pool, const String *source, const XalanDOMException& e);
+	Exception(
+		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 { 
+		return fproblem_source && fproblem_source->size()?fproblem_source:0; 
+	}
 	/// extracts exception comment
-	const char *comment() const { return 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>";
+	}
 
 private:
 
-	const String *ftype, *fcode, *fproblem_source;
-	bool owns_comment;
-	char *fcomment;
+	const char *ftype;
+	const String *fproblem_source;
+	bool owns_comment; char *fcomment;
 
 };