--- parser3/src/include/pa_exception.h	2002/02/08 07:27:43	1.30
+++ parser3/src/include/pa_exception.h	2003/01/23 16:08:01	1.38.2.2
@@ -1,56 +1,76 @@
 /** @file
 	Parser: exception decls.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_exception.h,v 1.30 2002/02/08 07:27:43 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 "pa_types.h"
-#include "pa_string.h"
+static const char* IDENT_EXCEPTION_H="$Date: 2003/01/23 16:08:01 $";
+
+//#include "pa_types.h"
+#include "pa_pool.h"
+
+// forwards
 
-class Pool;
+class String;
 
 // defines
 
-/// Just simple longjump mechanizm dressed in class clothes. use Temp_exception
 class Exception {
 public:
 
+	typedef object_ptr<const String> problem_source_type;
+
+	static problem_source_type undefined_source;
+
 	Exception();
 	Exception(
-		const String *atype, const String *acode,
-		const String *aproblem_source, 
+		const char *atype,
+		problem_source_type aproblem_source, 
 		const char *comment_fmt, ...);
-	Exception(const Exception& src);
-	Exception& operator =(const Exception& src);
-	~Exception();
+	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(
-		const String *atype, const String *acode,
 		const String *aproblem_source, 
 		GdomeException& exc);
 #endif
 
 	/// extracts exception type
-	const String *type() const { return ftype; }
-	/// extracts exception code
-	const String *code() const { return fcode; }
+	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; }
-	/// extracts exception comment
-	const char *comment() const { return fcomment; }
+	object_ptr<const String> problem_source() const;	/// extracts exception comment
+	const char *comment(bool can_be_empty=false) const { 
+		const char *result=fcomment.get()!=0 && *fcomment?fcomment.get():0;
+		if(can_be_empty)
+			return result; 
+		else
+			return result?result:"<no comment>";
+	}
 
 private:
 
-	const String *ftype, *fcode, *fproblem_source;
-	bool owns_comment;
-	char *fcomment;
+	const char *ftype;
+	problem_source_type fproblem_source;
+	smart_ptr<char> fcomment;
 
 };