--- parser3/src/include/pa_globals.h	2002/02/08 08:30:13	1.78
+++ parser3/src/include/pa_globals.h	2002/03/28 14:26:48	1.80
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_globals.h,v 1.78 2002/02/08 08:30:13 paf Exp $
+	$Id: pa_globals.h,v 1.80 2002/03/28 14:26:48 paf Exp $
 */
 
 #ifndef PA_GLOBALS_H
@@ -33,7 +33,7 @@ class Charset;
 #define SIZE_NAME "size"
 #define TEXT_NAME "text"
 
-#define EXCEPTION_METHOD_NAME "exception"
+#define UNHANDLED_EXCEPTION_METHOD_NAME "unhandled_exception"
 #define POST_PROCESS_METHOD_NAME "postprocess"
 
 #define UNNAMED_NAME "unnamed"
@@ -52,6 +52,13 @@ class Charset;
 #define RESULT_VAR_NAME "result"
 #define MATCH_VAR_NAME "match"
 
+#define EXCEPTION_VAR_NAME "exception"
+#define EXCEPTION_TYPE_PART_NAME "type"
+#define EXCEPTION_SOURCE_PART_NAME "source"
+#define EXCEPTION_COMMENT_PART_NAME "comment"
+#define EXCEPTION_HANDLED_PART_NAME "handled"
+
+
 #define STRING_PRE_MATCH_NAME "prematch"
 #define STRING_MATCH_NAME "match"
 #define STRING_POST_MATCH_NAME "postmatch"
@@ -62,6 +69,8 @@ class Charset;
 #define SWITCH_DATA_NAME "SWITCH-DATA"
 #define CASE_DEFAULT_VALUE "DEFAULT"
 
+#define CACHE_DATA_NAME "CACHE-DATA"
+
 #define CLASS_PATH_NAME "CLASS_PATH"
 
 #define SQL_LIMIT_NAME "limit"
@@ -93,7 +102,7 @@ extern String *name_name;
 extern String *size_name;
 extern String *text_name;
 
-extern String *exception_method_name;
+extern String *unhandled_exception_method_name;
 extern String *post_process_method_name;
 
 extern String *unnamed_name;
@@ -116,6 +125,12 @@ extern String *string_pre_match_name;
 extern String *string_match_name;
 extern String *string_post_match_name;
 
+extern String *exception_var_name;
+extern String *exception_type_part_name;
+extern String *exception_source_part_name;
+extern String *exception_comment_part_name;
+extern String *exception_handled_part_name;
+
 extern String *content_disposition_name;
 extern String *content_disposition_filename_name;
 
@@ -126,6 +141,8 @@ extern String *class_path_name;
 extern String *switch_data_name;
 extern String *case_default_value;
 
+extern String *cache_data_name;
+
 extern String *sql_limit_name;
 extern String *sql_offset_name;
 extern String *sql_default_name;