--- parser3/src/include/pa_exception.h	2003/11/06 08:22:48	1.40
+++ parser3/src/include/pa_exception.h	2012/06/08 11:44:02	1.63
@@ -1,23 +1,41 @@
 /** @file
 	Parser: exception decls.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 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
 
-static const char* IDENT_EXCEPTION_H="$Date: 2003/11/06 08:22:48 $";
+#define IDENT_PA_EXCEPTION_H "$Id: pa_exception.h,v 1.63 2012/06/08 11:44:02 misha 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_memory.h"
 
-#ifdef XML
-#	include "gdome.h"
-#endif
-
 // forwards
 
 class String;
@@ -33,14 +51,9 @@ public:
 		const String* aproblem_source, 
 		const char* comment_fmt, ...);
 	Exception(const Exception& src);
+	operator bool() { return ftype || fproblem_source || fcomment; }
 	Exception& operator =(const Exception& src);
 
-#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)