--- parser3/src/include/pa_globals.h	2001/03/18 20:31:25	1.12
+++ parser3/src/include/pa_globals.h	2001/07/18 10:06:04	1.55
@@ -1,71 +1,92 @@
-/*
-	Parser
+/** @file
+	Parser: global decls.
+
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_globals.h,v 1.12 2001/03/18 20:31:25 paf Exp $
+	$Id: pa_globals.h,v 1.55 2001/07/18 10:06:04 parser Exp $
 */
 
 #ifndef PA_GLOBALS_H
 #define PA_GLOBALS_H
 
-#include "pa_string.h"
-#include "pa_hash.h"
+#include "pa_config_includes.h"
+#include "pa_pool.h"
+
+class String;
+class Hash;
+class Table;
 
+//@{
+/// constant string. class name, predefined method & co
 #define AUTO_FILE_NAME "auto.p"
 
+#define USER_HTML_NAME "user-html"
+
 #define CONTENT_TYPE_NAME "content-type"
 #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 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 DEFAULTS_NAME "DEFAULTS"
+#define CTYPE_NAME "CTYPE"
+#	define CTYPE_WHITE_SPACE_NAME "white-space"
+#	define CTYPE_DIGIT_NAME "digit"
+#	define CTYPE_HEX_DIGIT_NAME "hex-digit"
+#	define CTYPE_LETTER_NAME "letter"
+#	define CTYPE_WORD_NAME "word"
+#	define CTYPE_LOWERCASE_NAME "lowercase"
+#define MIME_TYPES_NAME "MIME-TYPES"
+#define VFILE_MIME_TYPE_NAME "mime-type"
+#define ORIGINS_MODE_NAME "ORIGINS"
 
 #define RESULT_VAR_NAME "result"
 
-struct Service_funcs {
-	int (*read_post)(char *buf, int max_bytes);
-	void (*output_header_attribute)(const char *key, const char *value);
-	void (*output_body)(const char *buf, size_t size);
-};
+#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"
 
-// core func
-void globals_init(Pool& pool);
+//@}
 
-// hex_value[c] = hex value of c
-extern short hex_value[0x100];
+/// core func
+void pa_globals_init(Pool& pool);
 
-//
-extern Service_funcs service_funcs;
+/// hex_value[c] = hex value of c
+extern short hex_value[0x100];
 
-// global strings
+//@{
+/// global string
+extern String *user_html_name;
 extern String *content_type_name;
 extern String *body_name;
 extern String *value_name;
 extern String *expires_name;
 extern String *path_name;
+extern String *name_name;
+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;
@@ -73,23 +94,37 @@ 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 *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 *ctype_name;
+extern String *ctype_white_space_name;
+extern String *ctype_digit_name;
+extern String *ctype_hex_digit_name;
+extern String *ctype_letter_name;
+extern String *ctype_word_name;
+extern String *ctype_lowercase_name;
+
+extern String *mime_types_name;
+extern String *vfile_mime_type_name;
+extern String *origins_mode_name;
 
 extern String *result_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;
 
-// global hashes
+extern String *limits_name;
+//@}
+
+/// global hash
 extern Hash *untaint_lang_name2enum;
 
+/// global table
+extern Table *default_typo_table;
+
 #endif