--- parser3/src/include/pa_exception.h	2001/01/30 13:07:31	1.2
+++ parser3/src/include/pa_exception.h	2001/03/13 11:15:03	1.8
@@ -1,5 +1,9 @@
 /*
-  $Id: pa_exception.h,v 1.2 2001/01/30 13:07:31 paf Exp $
+	Parser
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: pa_exception.h,v 1.8 2001/03/13 11:15:03 paf Exp $
 */
 
 #ifndef PA_EXCEPTION_H
@@ -13,27 +17,37 @@
 class Exception {
 public:
 
+	Exception() : fhandled(false) {
+	}
+
 	// address for long jump to jump to 
-	jmp_buf mark;
+	// regretfully public:
+	//   can't make local unless sure of inlining
+	//   for to-die stack frame ruins it all
+	mutable jmp_buf mark;
 
-	Exception();
-	static void die(char *acomment);
-	void raise(
+	void _throw(
 		const String *atype, const String *acode,
 		const String *aproblem_source, 
-		const char *comment_fmt, ...);
+		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; }
 
-	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; }
+	bool is_handled() { return fhandled; }
+	void set_handled() { fhandled=true; }
 
 private:
 
-	const String *ftype, *fcode, *fproblem_source;
-	char fcomment[MAX_STRING];
+	bool fhandled;
+	mutable const String *ftype, *fcode, *fproblem_source;
+	mutable char fcomment[MAX_STRING];
 };
 
-#define EXCEPTION_TRY(e) (setjmp(e.mark)==0)
+//#define EXCEPTION_TRY(e) (setjmp((e).mark)==0)
+// usage:
+//   if(EXCEPTION_TRY(e)) { ...; if(?) e.raise(?); ...; } else { catch-code }
 
 #endif