--- parser3/src/include/pa_globals.h	2001/03/28 14:07:15	1.29
+++ parser3/src/include/pa_globals.h	2001/11/05 11:46:24	1.68
@@ -2,61 +2,76 @@
 	Parser: global decls.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_globals.h,v 1.29 2001/03/28 14:07:15 paf Exp $
+	$Id: pa_globals.h,v 1.68 2001/11/05 11:46:24 paf 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
+#define CONFIG_FILE_NAME "parser3.conf"
 #define AUTO_FILE_NAME "auto.p"
 
-#define HTML_TYPO_NAME "html-typo"
+#define USER_HTML_NAME "user-html"
 
 #define CONTENT_TYPE_NAME "content-type"
+#define CHARSET_NAME "charset"
 #define BODY_NAME "body"
 #define VALUE_NAME "value"
 #define EXPIRES_NAME "expires"
 #define PATH_NAME "path"
 #define NAME_NAME "name"
+#define NONAME_DAT "noname.dat"
 #define SIZE_NAME "size"
 #define TEXT_NAME "text"
 
 #define EXCEPTION_METHOD_NAME "exception"
+#define POST_PROCESS_METHOD_NAME "postprocess"
 
 #define UNNAMED_NAME "unnamed"
 
 #define MAIN_METHOD_NAME "main"
 #define AUTO_METHOD_NAME "auto"
 
-#define ROOT_CLASS_NAME "ROOT"
 #define MAIN_CLASS_NAME "MAIN"
-#define TABLE_CLASS_NAME "table"
-#define FILE_CLASS_NAME "file"
-#define ENV_CLASS_NAME "env"
-#define FORM_CLASS_NAME "form"
-#define REQUEST_CLASS_NAME "request"
-#define RESPONSE_CLASS_NAME "response"
-#define COOKIE_CLASS_NAME "cookie"
 
-#define LIMITS_NAME "LIMITS"
-#define POST_MAX_SIZE_NAME "post_max_size"
 #define DEFAULTS_NAME "DEFAULTS"
-#define MIME_TYPES_NAME "MIME_TYPES"
+#define CHARSETS_NAME "CHARSETS"
+#define MIME_TYPES_NAME "MIME-TYPES"
 #define VFILE_MIME_TYPE_NAME "mime-type"
-
+#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"
+
+#define SQL_LIMIT_NAME "limit"
+#define SQL_OFFSET_NAME "offset"
+#define SQL_DEFAULT_NAME "default"
+
+#define HASH_DEFAULT_ELEMENT_NAME "_default"
+
 //@}
 
 /// core func
@@ -67,8 +82,9 @@ extern short hex_value[0x100];
 
 //@{
 /// global string
-extern String *html_typo_name;
+extern String *user_html_name;
 extern String *content_type_name;
+extern String *charset_name;
 extern String *body_name;
 extern String *value_name;
 extern String *expires_name;
@@ -78,37 +94,51 @@ extern String *size_name;
 extern String *text_name;
 
 extern String *exception_method_name;
+extern String *post_process_method_name;
 
 extern String *unnamed_name;
-extern String *empty_string;
 
 extern String *auto_method_name;
 extern String *main_method_name;
 
-extern String *root_class_name;
 extern String *main_class_name;
-extern String *env_class_name;
-extern String *table_class_name;
-extern String *file_class_name;
-extern String *form_class_name;
-extern String *request_class_name;
-extern String *response_class_name;
-extern String *cookie_class_name;
 
-extern String *limits_name;
-extern String *post_max_size_name;
 
 extern String *defaults_name;
+extern String *charsets_name;
+
 extern String *mime_types_name;
 extern String *vfile_mime_type_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;
+
+extern String *sql_limit_name;
+extern String *sql_offset_name;
+extern String *sql_default_name;
+
+extern String *hash_default_element_name;
+
 //@}
 
 /// global hash
 extern Hash *untaint_lang_name2enum;
 
 /// global table
-extern Table *default_typo_table;
+extern Dictionary *default_typo_dict;
 
 #endif