--- parser3/src/include/pa_exception.h	2001/01/30 13:43:42	1.3
+++ parser3/src/include/pa_exception.h	2002/04/29 06:27:29	1.35
@@ -1,42 +1,66 @@
-/*
-  $Id: pa_exception.h,v 1.3 2001/01/30 13:43:42 paf Exp $
+/** @file
+	Parser: exception decls.
+
+	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.35 2002/04/29 06:27:29 paf Exp $
 */
 
 #ifndef PA_EXCEPTION_H
 #define PA_EXCEPTION_H
 
-#include <setjmp.h>
-
 #include "pa_types.h"
 #include "pa_string.h"
 
+class Pool;
+
+// defines
+
 class Exception {
 public:
 
-	// address for long jump to jump to 
-	// regretfully public:
-	//   can't make local unless sure of inlining
-	//   for to-die stack frame ruins it all
-	jmp_buf mark;
-
-	void raise(
-		const String *atype, const String *acode,
+	Exception();
+	Exception(
+		const char *atype,
 		const String *aproblem_source, 
 		const char *comment_fmt, ...);
+	Exception(const Exception& src);
+	Exception& operator =(const Exception& src);
+	~Exception();
 
-	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; }
+#ifdef XML
+	Exception(
+		const String *aproblem_source, 
+		GdomeException& exc);
+#endif
+
+	/// 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 { 
+		return fproblem_source && fproblem_source->size()?fproblem_source:0; 
+	}
+	/// 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:
 
-	const String *ftype, *fcode, *fproblem_source;
-	char fcomment[MAX_STRING];
-};
+	const char *ftype;
+	const String *fproblem_source;
+	bool owns_comment; char *fcomment;
 
-// usage:
-//   if(EXCEPTION_TRY(e)) { ...; if(?) e.raise(?); ...; } else { catch-code }
-#define EXCEPTION_TRY(e) (setjmp((e).mark)==0)
+};
 
 #endif