--- parser3/src/main/pa_globals.C	2001/03/16 12:30:23	1.7
+++ parser3/src/main/pa_globals.C	2001/03/25 09:10:30	1.33
@@ -1,21 +1,34 @@
-/*
-	Parser
+/** @file
+	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.7 2001/03/16 12:30:23 paf Exp $
+	$Id: pa_globals.C,v 1.33 2001/03/25 09:10:30 paf Exp $
 */
 
 #include "pa_globals.h"
+#include "pa_string.h"
+#include "pa_hash.h"
+#include "pa_table.h"
 #include "_string.h"
 #include "_double.h"
 #include "_int.h"
 #include "_table.h"
 #include "_form.h"
-#include "_env.h"
-#include "_request.h"
+#include "_response.h"
+#include "_file.h"
 
-Service_funcs service_funcs;
+String *html_typo_name;
+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;
 
@@ -31,14 +44,20 @@ 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;
 
+Table *default_typo_table;
+
 short hex_value[0x100];
 
 static void setup_hex_value() {
@@ -70,58 +89,93 @@ static void setup_hex_value() {
 	hex_value['f'] = 15;
 }
 
-void globals_init(Pool& pool) {
+void pa_globals_init(Pool& pool) {
+	#undef NEW
+	#define NEW new(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);
+	html_typo_name=NEW String(pool, HTML_TYPO_NAME);
+	content_type_name=NEW String(pool, CONTENT_TYPE_NAME);
+	body_name=NEW String(pool, BODY_NAME);
+	value_name=NEW String(pool, VALUE_NAME);
+	expires_name=NEW String(pool, EXPIRES_NAME);
+	path_name=NEW String(pool, PATH_NAME);
+	name_name=NEW String(pool, NAME_NAME);
+	size_name=NEW String(pool, SIZE_NAME);
+	text_name=NEW String(pool, TEXT_NAME);
+
+	exception_method_name=NEW String(pool, EXCEPTION_METHOD_NAME);
+
+	unnamed_name=NEW String(pool, UNNAMED_NAME);
+	empty_string=NEW String(pool); 
+
+	auto_method_name=NEW String(pool, AUTO_METHOD_NAME);
+	main_method_name=NEW String(pool, MAIN_METHOD_NAME);
+
+	root_class_name=NEW String(pool, ROOT_CLASS_NAME);
+	main_class_name=NEW String(pool, MAIN_CLASS_NAME);
+	table_class_name=NEW String(pool, TABLE_CLASS_NAME);
+	env_class_name=NEW String(pool, ENV_CLASS_NAME);	
+	form_class_name=NEW String(pool, FORM_CLASS_NAME);	
+	request_class_name=NEW String(pool, REQUEST_CLASS_NAME);	
+	response_class_name=NEW String(pool, RESPONSE_CLASS_NAME);
+	cookie_class_name=NEW String(pool, COOKIE_CLASS_NAME);
 
-	NEW_STRING(unnamed_name, UNNAMED_NAME);
-	empty_string=new(pool) String(pool); 
+	result_var_name=NEW String(pool, RESULT_VAR_NAME);
 
-	NEW_STRING(auto_method_name, AUTO_METHOD_NAME);
-	NEW_STRING(main_method_name, MAIN_METHOD_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);	
-	NEW_STRING(request_class_name, REQUEST_CLASS_NAME);	
+	limits_name=NEW String(pool, LIMITS_NAME);
+	post_max_size_name=NEW String(pool, POST_MAX_SIZE_NAME);
 
-	NEW_STRING(result_var_name, RESULT_VAR_NAME);
+	defaults_name=NEW String(pool, DEFAULTS_NAME);
 
+	// hashes
+	untaint_lang_name2enum=NEW Hash(pool);
+	String as_is(pool, "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::UL_HEADER);
+	String uri(pool, "uri");  
+	untaint_lang_name2enum->put(uri, (int)String::UL_URI);
+	String table(pool, "table");
+	untaint_lang_name2enum->put(table, (int)String::UL_TABLE);
+	String sql(pool, "sql");
+	untaint_lang_name2enum->put(sql, (int)String::UL_SQL);
+	String js(pool, "js");
+	untaint_lang_name2enum->put(js, (int)String::UL_JS);
+	String html(pool, "html");
+	untaint_lang_name2enum->put(html, (int)String::UL_HTML);
+	String html_typo(pool, "html-typo");
+	untaint_lang_name2enum->put(html_typo, (int)String::UL_HTML_TYPO);
+
+	// tables
+	default_typo_table=NEW Table(pool, 0, 0);
+	{
+		// \n\n -> <p>
+		Array *row1=NEW Array(pool);
+		*row1+=NEW String(pool, "\\n\\n");	
+		*row1+=NEW String(pool, "<p>");
+		*default_typo_table+=row1;
+		// \n -> <br>
+		Array *row2=NEW Array(pool);
+		*row2+=NEW String(pool, "\\n");	
+		*row2+=NEW String(pool, "<br>");
+		*default_typo_table+=row2;
+	}
 
-	NEW_STRING(limits_name, LIMITS_NAME);
-	NEW_STRING(post_max_size_name, POST_MAX_SIZE_NAME);
+	// stateless classes
+	initialize_string_class(pool, *(string_class=NEW VStateless_class(pool)));
+	initialize_double_class(pool, *(double_class=NEW VStateless_class(pool)));
+	initialize_int_class(pool, *(int_class=NEW VStateless_class(pool)));
+	initialize_table_class(pool, *(table_class=NEW VStateless_class(pool)));
+	initialize_file_class(pool, *(file_class=NEW VStateless_class(pool)));
+	initialize_response_class(pool, *(response_class=NEW VStateless_class(pool)));
 
-	// hashes
-	untaint_lang_name2enum=new(pool) Hash(pool);
-	LOCAL_STRING(as_is, "as-is");  
-	untaint_lang_name2enum->put(as_is, (int)String::Untaint_lang::AS_IS);
-	LOCAL_STRING(table, "table");
-	untaint_lang_name2enum->put(table, (int)String::Untaint_lang::TABLE);
-	LOCAL_STRING(sql, "sql");
-	untaint_lang_name2enum->put(sql, (int)String::Untaint_lang::SQL);
-	LOCAL_STRING(js, "js");
-	untaint_lang_name2enum->put(js, (int)String::Untaint_lang::JS);
-	LOCAL_STRING(html, "html");
-	untaint_lang_name2enum->put(html, (int)String::Untaint_lang::HTML);
-	LOCAL_STRING(html_typo, "html-typo");
-	untaint_lang_name2enum->put(html_typo, (int)String::Untaint_lang::HTML_TYPO);
-
-	// 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();
+	// stateless base classes
+	initialize_form_base_class(pool, *(form_base_class=NEW VStateless_class(pool)));  form_base_class->set_name(*form_class_name);
 }