--- parser3/src/include/pa_globals.h	2002/02/08 07:27:44	1.77
+++ parser3/src/include/pa_globals.h	2002/04/22 14:11:27	1.84
@@ -2,9 +2,9 @@
 	Parser: global decls.
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_globals.h,v 1.77 2002/02/08 07:27:44 paf Exp $
+	$Id: pa_globals.h,v 1.84 2002/04/22 14:11:27 paf Exp $
 */
 
 #ifndef PA_GLOBALS_H
@@ -16,6 +16,7 @@ class String;
 class Hash;
 class Dictionary;
 class Charset;
+class Table;
 
 //@{
 /// constant string. class name, predefined method & co
@@ -33,11 +34,9 @@ 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"
-
 #define MAIN_METHOD_NAME "main"
 #define AUTO_METHOD_NAME "auto"
 
@@ -52,6 +51,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"
@@ -60,7 +66,8 @@ class Charset;
 #define CONTENT_DISPOSITION_FILENAME_NAME "filename"
 
 #define SWITCH_DATA_NAME "SWITCH-DATA"
-#define CASE_DEFAULT_VALUE "DEFAULT"
+
+#define CACHE_DATA_NAME "CACHE-DATA"
 
 #define CLASS_PATH_NAME "CLASS_PATH"
 
@@ -93,11 +100,9 @@ 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;
-
 extern String *auto_method_name;
 extern String *main_method_name;
 
@@ -112,9 +117,12 @@ extern String *origins_mode_name;
 
 extern String *result_var_name;
 extern String *match_var_name;
-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;
@@ -124,7 +132,8 @@ extern String *limits_name;
 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;
@@ -136,6 +145,10 @@ extern String *hash_default_element_name
 
 //@}
 
+/// String::match uses this as replace & global search table columns
+const int MAX_STRING_MATCH_TABLE_COLUMNS=100;
+extern Table *string_match_table_template;
+
 /// name to enum language table
 extern Hash *untaint_lang_name2enum;