--- parser3/src/include/pa_exception.h	2002/03/18 15:29:45	1.32
+++ parser3/src/include/pa_exception.h	2002/04/29 06:27:29	1.35
@@ -4,7 +4,7 @@
 	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.32 2002/03/18 15:29:45 paf Exp $
+	$Id: pa_exception.h,v 1.35 2002/04/29 06:27:29 paf Exp $
 */
 
 #ifndef PA_EXCEPTION_H
@@ -22,7 +22,7 @@ public:
 
 	Exception();
 	Exception(
-		const String *atype, const String *acode,
+		const char *atype,
 		const String *aproblem_source, 
 		const char *comment_fmt, ...);
 	Exception(const Exception& src);
@@ -31,25 +31,35 @@ public:
 
 #ifdef XML
 	Exception(
-		const String *atype, const String *acode,
 		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;
 
 };