--- parser3/src/include/pa_globals.h	2001/03/16 12:30:22	1.7
+++ parser3/src/include/pa_globals.h	2001/04/02 08:44:24	1.31
@@ -1,19 +1,37 @@
-/*
-	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.7 2001/03/16 12:30:22 paf Exp $
+	$Id: pa_globals.h,v 1.31 2001/04/02 08:44:24 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 HTML_TYPO_NAME "html-typo"
+
+#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 SIZE_NAME "size"
+#define TEXT_NAME "text"
+
 #define EXCEPTION_METHOD_NAME "exception"
 
 #define UNNAMED_NAME "unnamed"
@@ -24,30 +42,41 @@
 #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 MIME_TYPES_NAME "MIME_TYPES"
+#define VFILE_MIME_TYPE_NAME "mime-type"
 
 #define RESULT_VAR_NAME "result"
+//@}
 
-struct Service_funcs {
-	int (*read_post)(char *buf, int max_bytes);
-};
+/// core func
+void pa_globals_init(Pool& pool);
 
-
-// core func
-void globals_init(Pool& pool);
-
-// hex_value[c] = hex value of c
+/// hex_value[c] = hex value of c
 extern short hex_value[0x100];
 
-//
-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;
+extern String *expires_name;
+extern String *path_name;
+extern String *name_name;
+extern String *size_name;
+extern String *text_name;
 
-// global strings
 extern String *exception_method_name;
 
 extern String *unnamed_name;
@@ -60,15 +89,27 @@ 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;
+//@}
 
-// global hashes
+/// global hash
 extern Hash *untaint_lang_name2enum;
 
+/// global table
+extern Table *default_typo_table;
+
 #endif