--- parser3/src/main/pa_globals.C	2001/03/19 16:44:02	1.15
+++ parser3/src/main/pa_globals.C	2001/03/24 09:44:19	1.28
@@ -1,9 +1,11 @@
 /** @file
-	Parser
+	Parser: globals.
+
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_globals.C,v 1.15 2001/03/19 16:44:02 paf Exp $
+	$Id: pa_globals.C,v 1.28 2001/03/24 09:44:19 paf Exp $
 */
 
 #include "pa_globals.h"
@@ -12,18 +14,17 @@
 #include "_int.h"
 #include "_table.h"
 #include "_form.h"
-#include "_env.h"
-#include "_request.h"
 #include "_response.h"
-#include "_cookie.h"
-
-Service_funcs service_funcs;
+#include "_file.h"
 
 String *content_type_name;
 String *body_name;
 String *value_name;
 String *expires_name;
 String *path_name;
+String *name_name;
+String *size_name;
+String *text_name;
 
 String *exception_method_name;
 
@@ -82,7 +83,7 @@ static void setup_hex_value() {
 	hex_value['f'] = 15;
 }
 
-void globals_init(Pool& pool) {
+void pa_globals_init(Pool& pool) {
 	// hex value
 	setup_hex_value();
 
@@ -92,6 +93,9 @@ void globals_init(Pool& pool) {
 	value_name=new(pool) String(pool, VALUE_NAME);
 	expires_name=new(pool) String(pool, EXPIRES_NAME);
 	path_name=new(pool) String(pool, PATH_NAME);
+	name_name=new(pool) String(pool, NAME_NAME);
+	size_name=new(pool) String(pool, SIZE_NAME);
+	text_name=new(pool) String(pool, TEXT_NAME);
 
 	exception_method_name=new(pool) String(pool, EXCEPTION_METHOD_NAME);
 
@@ -121,32 +125,32 @@ void globals_init(Pool& pool) {
 	// hashes
 	untaint_lang_name2enum=new(pool) Hash(pool);
 	String as_is(pool, "as-is");  
-	untaint_lang_name2enum->put(as_is, (int)String::Untaint_lang::AS_IS);
+	untaint_lang_name2enum->put(as_is, (int)String::UL_AS_IS);
+	String file_name(pool, "file-name");  
+	untaint_lang_name2enum->put(file_name, (int)String::UL_FILE_NAME);
 	String header(pool, "header");  
-	untaint_lang_name2enum->put(header, (int)String::Untaint_lang::HEADER);
+	untaint_lang_name2enum->put(header, (int)String::UL_HEADER);
 	String uri(pool, "uri");  
-	untaint_lang_name2enum->put(uri, (int)String::Untaint_lang::URI);
+	untaint_lang_name2enum->put(uri, (int)String::UL_URI);
 	String table(pool, "table");
-	untaint_lang_name2enum->put(table, (int)String::Untaint_lang::TABLE);
+	untaint_lang_name2enum->put(table, (int)String::UL_TABLE);
 	String sql(pool, "sql");
-	untaint_lang_name2enum->put(sql, (int)String::Untaint_lang::SQL);
+	untaint_lang_name2enum->put(sql, (int)String::UL_SQL);
 	String js(pool, "js");
-	untaint_lang_name2enum->put(js, (int)String::Untaint_lang::JS);
+	untaint_lang_name2enum->put(js, (int)String::UL_JS);
 	String html(pool, "html");
-	untaint_lang_name2enum->put(html, (int)String::Untaint_lang::HTML);
+	untaint_lang_name2enum->put(html, (int)String::UL_HTML);
 	String html_typo(pool, "html-typo");
-	untaint_lang_name2enum->put(html_typo, (int)String::Untaint_lang::HTML_TYPO);
+	untaint_lang_name2enum->put(html_typo, (int)String::UL_HTML_TYPO);
+
+	// stateless classes
+	initialize_string_class(pool, *(string_class=new(pool) VStateless_class(pool)));
+	initialize_double_class(pool, *(double_class=new(pool) VStateless_class(pool)));
+	initialize_int_class(pool, *(int_class=new(pool) VStateless_class(pool)));
+	initialize_table_class(pool, *(table_class=new(pool) VStateless_class(pool)));
+	initialize_file_class(pool, *(file_class=new(pool) VStateless_class(pool)));
+	initialize_response_class(pool, *(response_class=new(pool) VStateless_class(pool)));
 
-	// read-only stateless classes
-	initialize_string_class(pool, *(string_class=new(pool) VStateless_class(pool)));  string_class->freeze();
-	initialize_double_class(pool, *(double_class=new(pool) VStateless_class(pool)));  double_class->freeze();
-	initialize_int_class(pool, *(int_class=new(pool) VStateless_class(pool)));  int_class->freeze();
-	initialize_table_class(pool, *(table_class=new(pool) VStateless_class(pool)));  table_class->freeze();
-
-	// read-only stateless base classes
-	initialize_env_base_class(pool, *(env_base_class=new(pool) VStateless_class(pool)));  env_base_class->set_name(*env_class_name);  env_base_class->freeze();
-	initialize_form_base_class(pool, *(form_base_class=new(pool) VStateless_class(pool)));  form_base_class->set_name(*form_class_name);  form_base_class->freeze();
-	initialize_request_base_class(pool, *(request_base_class=new(pool) VStateless_class(pool)));  request_base_class->set_name(*request_class_name);  request_base_class->freeze();
-	initialize_response_base_class(pool, *(response_base_class=new(pool) VStateless_class(pool)));  response_base_class->set_name(*response_class_name);  response_base_class->freeze();
-	initialize_cookie_base_class(pool, *(cookie_base_class=new(pool) VStateless_class(pool)));  cookie_base_class->set_name(*cookie_class_name);  cookie_base_class->freeze();
+	// stateless base classes
+	initialize_form_base_class(pool, *(form_base_class=new(pool) VStateless_class(pool)));  form_base_class->set_name(*form_class_name);
 }