--- parser3/src/include/pa_exception.h	2001/01/30 13:07:31	1.2
+++ parser3/src/include/pa_exception.h	2003/11/06 08:22:48	1.40
@@ -1,39 +1,70 @@
-/*
-  $Id: pa_exception.h,v 1.2 2001/01/30 13:07:31 paf Exp $
+/** @file
+	Parser: exception decls.
+
+	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 <setjmp.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 String;
 
-#include "pa_types.h"
-#include "pa_string.h"
+// defines
 
 class Exception {
 public:
 
-	// address for long jump to jump to 
-	jmp_buf mark;
-
 	Exception();
-	static void die(char *acomment);
-	void raise(
-		const String *atype, const String *acode,
-		const String *aproblem_source, 
-		const char *comment_fmt, ...);
-
-	const String *type() { return ftype; }
-	const String *code() { return fcode; }
-	const String *problem_source() { return fproblem_source; }
-	const char *comment() { return fcomment[0]?fcomment:0; }
+	Exception(
+		const char* atype,
+		const String* aproblem_source, 
+		const char* comment_fmt, ...);
+	Exception(const Exception& src);
+	Exception& operator =(const Exception& src);
+
+#ifdef XML
+	Exception(
+		const String* aproblem_source, 
+		GdomeException& exc);
+#endif
 
-private:
+	/// extracts exception type
+	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;
+	/// 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>";
+	}
+
+protected:
+
+	const char* ftype;
+	const String* fproblem_source;
+	char* fcomment;
 
-	const String *ftype, *fcode, *fproblem_source;
-	char fcomment[MAX_STRING];
 };
 
-#define EXCEPTION_TRY(e) (setjmp(e.mark)==0)
-
 #endif