--- parser3/src/include/pa_globals.h	2001/04/27 16:48:25	1.50.2.2
+++ parser3/src/include/pa_globals.h	2001/08/06 16:18:26	1.59
@@ -5,17 +5,18 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_globals.h,v 1.50.2.2 2001/04/27 16:48:25 paf Exp $
+	$Id: pa_globals.h,v 1.59 2001/08/06 16:18:26 parser Exp $
 */
 
 #ifndef PA_GLOBALS_H
 #define PA_GLOBALS_H
 
+#include "pa_config_includes.h"
 #include "pa_pool.h"
 
 class String;
 class Hash;
-class Table;
+class Dictionary;
 
 //@{
 /// constant string. class name, predefined method & co
@@ -36,9 +37,6 @@ class Table;
 #define EXCEPTION_METHOD_NAME "exception"
 #define POST_PROCESS_METHOD_NAME "postprocess"
 
-#define CONTENT_DISPOSITION_NAME "content-disposition"
-#define CONTENT_DISPOSITION_FILENAME_NAME "filename"
-
 #define UNNAMED_NAME "unnamed"
 
 #define MAIN_METHOD_NAME "main"
@@ -46,8 +44,6 @@ class Table;
 
 #define MAIN_CLASS_NAME "MAIN"
 
-#define LIMITS_NAME "LIMITS"
-#define POST_MAX_SIZE_NAME "post_max_size"
 #define DEFAULTS_NAME "DEFAULTS"
 #define CTYPE_NAME "CTYPE"
 #	define CTYPE_WHITE_SPACE_NAME "white-space"
@@ -58,16 +54,23 @@ class Table;
 #	define CTYPE_LOWERCASE_NAME "lowercase"
 #define MIME_TYPES_NAME "MIME-TYPES"
 #define VFILE_MIME_TYPE_NAME "mime-type"
-#define MAIL_NAME "MAIL"
-
-#define MAIN_SQL_NAME "SQL"
-#define MAIN_SQL_DRIVERS_NAME "drivers"
+#define ORIGINS_MODE_NAME "ORIGINS"
 
 #define RESULT_VAR_NAME "result"
+#define MATCH_VAR_NAME "match"
 
 #define STRING_PRE_MATCH_NAME "prematch"
 #define STRING_MATCH_NAME "match"
 #define STRING_POST_MATCH_NAME "postmatch"
+
+#define CONTENT_DISPOSITION_NAME "content-disposition"
+#define CONTENT_DISPOSITION_FILENAME_NAME "filename"
+
+#define SWITCH_DATA_NAME "SWITCH-DATA"
+#define CASE_DEFAULT_VALUE "DEFAULT"
+
+#define CLASS_PATH_NAME "class_path"
+
 //@}
 
 /// core func
@@ -91,9 +94,6 @@ extern String *text_name;
 extern String *exception_method_name;
 extern String *post_process_method_name;
 
-extern String *content_disposition_name;
-extern String *content_disposition_filename_name;
-
 extern String *unnamed_name;
 extern String *empty_string;
 
@@ -102,8 +102,6 @@ extern String *main_method_name;
 
 extern String *main_class_name;
 
-extern String *limits_name;
-extern String *post_max_size_name;
 
 extern String *defaults_name;
 extern String *ctype_name;
@@ -116,21 +114,30 @@ extern String *ctype_lowercase_name;
 
 extern String *mime_types_name;
 extern String *vfile_mime_type_name;
-extern String *mail_name;
-
-extern String *main_sql_name;
-extern String *main_sql_drivers_name;
+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 *content_disposition_name;
+extern String *content_disposition_filename_name;
+
+extern String *limits_name;
+
+extern String *class_path_name;
+
+extern String *switch_data_name;
+extern String *case_default_value;
+
 //@}
 
 /// global hash
 extern Hash *untaint_lang_name2enum;
 
 /// global table
-extern Table *default_typo_table;
+extern Dictionary *default_typo_dict;
 
 #endif