--- parser3/src/include/pa_globals.h	2001/03/22 11:19:10	1.20
+++ parser3/src/include/pa_globals.h	2001/04/04 06:16:19	1.36
@@ -5,18 +5,23 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_globals.h,v 1.20 2001/03/22 11:19:10 paf Exp $
+	$Id: pa_globals.h,v 1.36 2001/04/04 06:16:19 paf Exp $
 */
 
 #ifndef PA_GLOBALS_H
 #define PA_GLOBALS_H
 
-#include "pa_string.h"
-#include "pa_hash.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 AUTO_FILE_NAME "auto.p"
+
+#define HTML_TYPO_NAME "html-typo"
 
 #define CONTENT_TYPE_NAME "content-type"
 #define BODY_NAME "body"
@@ -28,6 +33,10 @@
 #define TEXT_NAME "text"
 
 #define EXCEPTION_METHOD_NAME "exception"
+#define POST_PROCESS_METHOD_NAME "post-process"
+
+#define CONTENT_DISPOSITION_NAME "content-disposition"
+#define CONTENT_DISPOSITION_FILENAME_NAME "filename"
 
 #define UNNAMED_NAME "unnamed"
 
@@ -37,45 +46,36 @@
 #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 RANDOM_CLASS_NAME "random"
 
-#define LIMITS_NAME "limits"
+#define LIMITS_NAME "LIMITS"
 #define POST_MAX_SIZE_NAME "post_max_size"
-#define DEFAULTS_NAME "defaults"
+#define DEFAULTS_NAME "DEFAULTS"
+#define MIME_TYPES_NAME "MIME-TYPES"
+#define VFILE_MIME_TYPE_NAME "mime-type"
 
 #define RESULT_VAR_NAME "result"
-//@}
-
-/// target-specific service functions
-struct Service_funcs {
-	/// get env
-	const char *(*get_env)(Pool& pool, const char *name);
-	/// read POST request bytes
-	uint (*read_post)(Pool& pool, char *buf, uint max_bytes);
-	/// add response header attribute
-	void (*add_header_attribute)(Pool& pool, const char *key, const char *value);
-	/// add response header attribute
-	void (*send_header)(Pool& pool);
-	/// output body bytes
-	void (*send_body)(Pool& pool, const char *buf, size_t size);
-};
 
+#define STRING_PRE_MATCH_NAME "pre-match"
+#define STRING_MATCH_NAME "match"
+#define STRING_POST_MATCH_NAME "post-match"
+//@}
 
 /// core func
-void globals_init(Pool& pool);
+void pa_globals_init(Pool& pool);
 
 /// hex_value[c] = hex value of c
 extern short hex_value[0x100];
 
-/// target-specific service functions
-extern Service_funcs service_funcs;
-
 //@{
 /// global string
+extern String *html_typo_name;
 extern String *content_type_name;
 extern String *body_name;
 extern String *value_name;
@@ -86,6 +86,10 @@ extern String *size_name;
 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;
@@ -97,20 +101,30 @@ 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 *random_class_name;
 
 extern String *limits_name;
 extern String *post_max_size_name;
 
 extern String *defaults_name;
+extern String *mime_types_name;
+extern String *vfile_mime_type_name;
 
 extern String *result_var_name;
+extern String *string_pre_match_name;
+extern String *string_match_name;
+extern String *string_post_match_name;
 //@}
 
 /// global hash
 extern Hash *untaint_lang_name2enum;
 
+/// global table
+extern Table *default_typo_table;
+
 #endif