--- parser3/src/include/pa_exception.h	2001/01/30 13:07:31	1.2
+++ parser3/src/include/pa_exception.h	2003/01/24 11:33:02	1.38.2.5
@@ -1,39 +1,78 @@
-/*
-  $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/01/24 11:33:02 $";
+
+//#include "pa_types.h"
+#include "pa_pool.h"
+
+// forwards
 
-#include "pa_types.h"
-#include "pa_string.h"
+class String;
+typedef object_ptr<const String> ConstStringPtr;
+
+// defines
 
 class Exception {
 public:
 
-	// address for long jump to jump to 
-	jmp_buf mark;
+	static const ConstStringPtr undefined_source;
 
 	Exception();
-	static void die(char *acomment);
-	void raise(
-		const String *atype, const String *acode,
-		const String *aproblem_source, 
+	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;
+	}
 
-	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
+	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:
 
-	const String *ftype, *fcode, *fproblem_source;
-	char fcomment[MAX_STRING];
+	const char *ftype;
+	ConstStringPtr fproblem_source;
+	CharPtr fcomment;
+
 };
 
-#define EXCEPTION_TRY(e) (setjmp(e.mark)==0)
+const ConstStringPtr Exception::undefined_source(0);
 
 #endif