--- parser3/src/include/pa_exception.h	2001/01/30 13:07:31	1.2
+++ parser3/src/include/pa_exception.h	2015/10/26 01:21:55	1.65
@@ -1,39 +1,83 @@
-/*
-  $Id: pa_exception.h,v 1.2 2001/01/30 13:07:31 paf Exp $
+/** @file
+	Parser: exception decls.
+
+	Copyright (c) 2001-2015 Art. Lebedev Studio (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>
+#define IDENT_PA_EXCEPTION_H "$Id: pa_exception.h,v 1.65 2015/10/26 01:21:55 moko Exp $"
+
+const char* const PARSER_RUNTIME = "parser.runtime";
+const char* const IMAGE_FORMAT = "image.format";
+const char* const PCRE_EXCEPTION_TYPE = "pcre.execute";
+const char* const DATE_RANGE_EXCEPTION_TYPE = "date.range";
+const char* const BASE64_FORMAT = "base64.format";
+
+const char* const NAME_MUST_BE_STRING = "name must be string";
+const char* const FILE_NAME_MUST_BE_STRING = "file name must be string";
+const char* const VALUE_MUST_BE_STRING = "value must be string";
+const char* const PARAMETER_MUST_BE_STRING = "parameter must be string";
+const char* const COLUMN_NAME_MUST_BE_STRING = "column name must be string";
+
+const char* const FILE_NAME_MUST_BE_SPECIFIED = "file name must be specified";
+const char* const FILE_NAME_MUST_NOT_BE_CODE = "file name must not be code";
+const char* const FIRST_ARG_MUST_NOT_BE_CODE = "first argument must not be code";
+const char* const PARAM_MUST_NOT_BE_CODE = "param must not be code";
+const char* const PARAM_MUST_BE_HASH = "param must be hash";
+const char* const MODE_MUST_NOT_BE_CODE = "mode must not be code";
+const char* const OPTIONS_MUST_NOT_BE_CODE = "options must not be code";
+
+const char* const CALLED_WITH_INVALID_OPTION = "called with invalid option";
+
+// includes
 
-#include "pa_types.h"
-#include "pa_string.h"
+#include "pa_memory.h"
+
+// forwards
+
+class String;
+
+// defines
 
 class Exception {
 public:
 
-	// address for long jump to jump to 
-	jmp_buf mark;
-
 	Exception();
-	static void die(char *acomment);
-	void raise(
-		const String *atype, const String *acode,
-		const String *aproblem_source, 
-		const char *comment_fmt, ...);
-
-	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; }
-
-private:
+	Exception(
+		const char* atype,
+		const String* aproblem_source, 
+		const char* comment_fmt, ...);
+	Exception(const Exception& src);
+	operator bool() { return ftype || fproblem_source || fcomment; }
+	Exception& operator =(const Exception& src);
+
+	/// 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;
+	/// 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>";
+	}
+
+protected:
+
+	const char* ftype;
+	const String* fproblem_source;
+	const char* fcomment;
 
-	const String *ftype, *fcode, *fproblem_source;
-	char fcomment[MAX_STRING];
 };
 
-#define EXCEPTION_TRY(e) (setjmp(e.mark)==0)
-
 #endif