--- parser3/src/main/pa_globals.C	2001/03/15 09:04:06	1.5
+++ parser3/src/main/pa_globals.C	2001/03/19 16:44:02	1.15
@@ -1,9 +1,9 @@
-/*
+/** @file
 	Parser
 	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.5 2001/03/15 09:04:06 paf Exp $
+	$Id: pa_globals.C,v 1.15 2001/03/19 16:44:02 paf Exp $
 */
 
 #include "pa_globals.h"
@@ -13,9 +13,18 @@
 #include "_table.h"
 #include "_form.h"
 #include "_env.h"
+#include "_request.h"
+#include "_response.h"
+#include "_cookie.h"
 
 Service_funcs service_funcs;
 
+String *content_type_name;
+String *body_name;
+String *value_name;
+String *expires_name;
+String *path_name;
+
 String *exception_method_name;
 
 String *unnamed_name;
@@ -29,10 +38,17 @@ String *main_class_name;
 String *env_class_name;
 String *table_class_name;
 String *form_class_name;
+String *request_class_name;
+String *response_class_name;
+String *cookie_class_name;
+
+String *result_var_name;
 
 String *limits_name;
 String *post_max_size_name;
 
+String *defaults_name;
+
 Hash *untaint_lang_name2enum;
 
 short hex_value[0x100];
@@ -70,40 +86,55 @@ void globals_init(Pool& pool) {
 	// hex value
 	setup_hex_value();
 
-	#define NEW_STRING(name, value)  name=new(pool) String(pool); name->APPEND_CONST(value)
-	#define LOCAL_STRING(name, value)  String name(pool); name.APPEND_CONST(value)
-
 	// names
-	NEW_STRING(exception_method_name, EXCEPTION_METHOD_NAME);
+	content_type_name=new(pool) String(pool, CONTENT_TYPE_NAME);
+	body_name=new(pool) String(pool, BODY_NAME);
+	value_name=new(pool) String(pool, VALUE_NAME);
+	expires_name=new(pool) String(pool, EXPIRES_NAME);
+	path_name=new(pool) String(pool, PATH_NAME);
 
-	NEW_STRING(unnamed_name, UNNAMED_NAME);
+	exception_method_name=new(pool) String(pool, EXCEPTION_METHOD_NAME);
+
+	unnamed_name=new(pool) String(pool, UNNAMED_NAME);
 	empty_string=new(pool) String(pool); 
 
-	NEW_STRING(auto_method_name, AUTO_METHOD_NAME);
-	NEW_STRING(main_method_name, MAIN_METHOD_NAME);
+	auto_method_name=new(pool) String(pool, AUTO_METHOD_NAME);
+	main_method_name=new(pool) String(pool, MAIN_METHOD_NAME);
+
+	root_class_name=new(pool) String(pool, ROOT_CLASS_NAME);
+	main_class_name=new(pool) String(pool, MAIN_CLASS_NAME);
+	table_class_name=new(pool) String(pool, TABLE_CLASS_NAME);
+	env_class_name=new(pool) String(pool, ENV_CLASS_NAME);	
+	form_class_name=new(pool) String(pool, FORM_CLASS_NAME);	
+	request_class_name=new(pool) String(pool, REQUEST_CLASS_NAME);	
+	response_class_name=new(pool) String(pool, RESPONSE_CLASS_NAME);
+	cookie_class_name=new(pool) String(pool, COOKIE_CLASS_NAME);
+
+	result_var_name=new(pool) String(pool, RESULT_VAR_NAME);
+
 
-	NEW_STRING(root_class_name, ROOT_CLASS_NAME);
-	NEW_STRING(main_class_name, MAIN_CLASS_NAME);
-	NEW_STRING(table_class_name, TABLE_CLASS_NAME);
-	NEW_STRING(env_class_name, ENV_CLASS_NAME);	
-	NEW_STRING(form_class_name, FORM_CLASS_NAME);	
+	limits_name=new(pool) String(pool, LIMITS_NAME);
+	post_max_size_name=new(pool) String(pool, POST_MAX_SIZE_NAME);
 
-	NEW_STRING(limits_name, LIMITS_NAME);
-	NEW_STRING(post_max_size_name, POST_MAX_SIZE_NAME);
+	defaults_name=new(pool) String(pool, DEFAULTS_NAME);
 
 	// hashes
 	untaint_lang_name2enum=new(pool) Hash(pool);
-	LOCAL_STRING(as_is, "as-is");  
+	String as_is(pool, "as-is");  
 	untaint_lang_name2enum->put(as_is, (int)String::Untaint_lang::AS_IS);
-	LOCAL_STRING(table, "table");
+	String header(pool, "header");  
+	untaint_lang_name2enum->put(header, (int)String::Untaint_lang::HEADER);
+	String uri(pool, "uri");  
+	untaint_lang_name2enum->put(uri, (int)String::Untaint_lang::URI);
+	String table(pool, "table");
 	untaint_lang_name2enum->put(table, (int)String::Untaint_lang::TABLE);
-	LOCAL_STRING(sql, "sql");
+	String sql(pool, "sql");
 	untaint_lang_name2enum->put(sql, (int)String::Untaint_lang::SQL);
-	LOCAL_STRING(js, "js");
+	String js(pool, "js");
 	untaint_lang_name2enum->put(js, (int)String::Untaint_lang::JS);
-	LOCAL_STRING(html, "html");
+	String html(pool, "html");
 	untaint_lang_name2enum->put(html, (int)String::Untaint_lang::HTML);
-	LOCAL_STRING(html_typo, "html-typo");
+	String html_typo(pool, "html-typo");
 	untaint_lang_name2enum->put(html_typo, (int)String::Untaint_lang::HTML_TYPO);
 
 	// read-only stateless classes
@@ -115,4 +146,7 @@ void globals_init(Pool& pool) {
 	// 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();
 }