--- parser3/src/include/pa_exception.h	2001/03/13 11:19:30	1.9
+++ parser3/src/include/pa_exception.h	2003/01/28 12:11:49	1.38.2.7
@@ -1,46 +1,72 @@
-/*
-	Parser
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+/** @file
+	Parser: exception decls.
 
-	$Id: pa_exception.h,v 1.9 2001/03/13 11:19:30 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 <setjmp.h>
+static const char* IDENT_EXCEPTION_H="$Date: 2003/01/28 12:11:49 $";
 
-#include "pa_types.h"
 #include "pa_string.h"
 
+// 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
-	mutable jmp_buf mark;
-
-	void _throw(
-		const String *atype, const String *acode,
-		const String *aproblem_source, 
-		const char *comment_fmt, ...) const;
-
-	const String *type() const { return ftype; }
-	const String *code() const { return fcode; }
-	const String *problem_source() const { return fproblem_source; }
-	const char *comment() const { return fcomment[0]?fcomment:0; }
+	static const ConstStringPtr undefined_source;
+
+	Exception();
+	Exception(
+		const char *atype,
+		ConstStringPtr aproblem_source, 
+		const char *comment_fmt, ...);
+	Exception(const Exception& src):
+		ftype(src.ftype),
+		fproblem_source(src.fproblem_source),
+		fcomment(src.fcomment) {
+	}
+	Exception& operator =(const Exception& src) {
+		ftype=src.ftype;
+		fproblem_source=src.fproblem_source;
+		fcomment=src.fcomment;
+		return *this;
+	}
+
+#ifdef XML
+	Exception(
+		ConstStringPtr 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
+	ConstStringPtr problem_source() const;	/// extracts exception comment
+	const char *comment(bool can_be_empty=false) const { 
+		const char *result=fcomment.get()!=0 && *fcomment.get()?fcomment.get():0;
+		if(can_be_empty)
+			return result; 
+		else
+			return result?result:"<no comment>";
+	}
 
 private:
 
-	mutable const String *ftype, *fcode, *fproblem_source;
-	mutable char fcomment[MAX_STRING];
+	const char *ftype;
+	ConstStringPtr fproblem_source;
+	CharPtr fcomment;
+
 };
 
-//#define EXCEPTION_TRY(e) (setjmp((e).mark)==0)
-// usage:
-//   if(EXCEPTION_TRY(e)) { ...; if(?) e.raise(?); ...; } else { catch-code }
+const ConstStringPtr Exception::undefined_source(0);
 
 #endif