--- parser3/src/main/pa_globals.C	2001/04/04 10:50:36	1.42
+++ parser3/src/main/pa_globals.C	2001/04/11 13:03:44	1.54
@@ -5,9 +5,11 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_globals.C,v 1.42 2001/04/04 10:50:36 paf Exp $
+	$Id: pa_globals.C,v 1.54 2001/04/11 13:03:44 paf Exp $
 */
 
+#include "pcre.h"
+
 #include "pa_globals.h"
 #include "pa_string.h"
 #include "pa_hash.h"
@@ -21,6 +23,8 @@
 #include "_file.h"
 #include "_random.h"
 #include "pa_sql_driver_manager.h"
+#include "_mail.h"
+#include "_image.h"
 
 String *html_typo_name;
 String *content_type_name;
@@ -44,8 +48,11 @@ String *empty_string;
 String *auto_method_name;
 String *main_method_name;
 
-String *root_class_name;
+String *op_class_name;
 String *main_class_name;
+String *string_class_name;
+String *double_class_name;
+String *int_class_name;
 String *env_class_name;
 String *table_class_name;
 String *file_class_name;
@@ -54,6 +61,8 @@ String *request_class_name;
 String *response_class_name;
 String *cookie_class_name;
 String *random_class_name;
+String *mail_class_name;
+String *image_class_name;
 
 String *result_var_name;
 String *string_pre_match_name;
@@ -64,8 +73,11 @@ String *limits_name;
 String *post_max_size_name;
 
 String *defaults_name;
+String *locale_name;
+String *locale_ctype_name;
 String *mime_types_name;
 String *vfile_mime_type_name;
+String *mail_name;
 
 String *main_sql_name;
 String *main_sql_drivers_name;
@@ -74,6 +86,8 @@ Hash *untaint_lang_name2enum;
 
 Table *default_typo_table;
 
+const unsigned char *pcre_tables;
+
 short hex_value[0x100];
 
 static void setup_hex_value() {
@@ -135,8 +149,11 @@ void pa_globals_init(Pool& 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);
+	op_class_name=NEW String(pool, OP_CLASS_NAME);
 	main_class_name=NEW String(pool, MAIN_CLASS_NAME);
+	string_class_name=NEW String(pool, STRING_CLASS_NAME);
+	double_class_name=NEW String(pool, DOUBLE_CLASS_NAME);
+	int_class_name=NEW String(pool, INT_CLASS_NAME);
 	table_class_name=NEW String(pool, TABLE_CLASS_NAME);
 	file_class_name=NEW String(pool, FILE_CLASS_NAME);
 	env_class_name=NEW String(pool, ENV_CLASS_NAME);	
@@ -145,6 +162,8 @@ void pa_globals_init(Pool& pool) {
 	response_class_name=NEW String(pool, RESPONSE_CLASS_NAME);
 	cookie_class_name=NEW String(pool, COOKIE_CLASS_NAME);
 	random_class_name=NEW String(pool, RANDOM_CLASS_NAME);
+	mail_class_name=NEW String(pool, MAIL_CLASS_NAME);
+	image_class_name=NEW String(pool, IMAGE_CLASS_NAME);
 
 	result_var_name=NEW String(pool, RESULT_VAR_NAME);
 	string_pre_match_name=NEW String(pool, STRING_PRE_MATCH_NAME);
@@ -156,8 +175,12 @@ void pa_globals_init(Pool& pool) {
 	post_max_size_name=NEW String(pool, POST_MAX_SIZE_NAME);
 
 	defaults_name=NEW String(pool, DEFAULTS_NAME);
+	locale_name=NEW String(pool, LOCALE_NAME);
+	locale_ctype_name=NEW String(pool, LOCALE_CTYPE_NAME);
 	mime_types_name=NEW String(pool, MIME_TYPES_NAME);
 	vfile_mime_type_name=NEW String(pool, VFILE_MIME_TYPE_NAME);
+	mail_name=NEW String(pool, MAIL_NAME);
+	
 
 	main_sql_name=NEW String(pool, MAIN_SQL_NAME);
 	main_sql_drivers_name=NEW String(pool, MAIN_SQL_DRIVERS_NAME);
@@ -168,8 +191,10 @@ void pa_globals_init(Pool& pool) {
 	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 http_header(pool, "http-header");  
+	untaint_lang_name2enum->put(http_header, (int)String::UL_HTTP_HEADER);
+	String mail_header(pool, "mail-header");  
+	untaint_lang_name2enum->put(mail_header, (int)String::UL_MAIL_HEADER);
 	String uri(pool, "uri");  
 	untaint_lang_name2enum->put(uri, (int)String::UL_URI);
 	String table(pool, "table");
@@ -230,14 +255,20 @@ void pa_globals_init(Pool& pool) {
 		}
 	}
 
+
+	// pcre tables
+	pcre_tables=pcre_maketables();
+
 	// 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)));
-	initialize_random_class(pool, *(random_class=NEW VStateless_class(pool)));
+	initialize_string_class(pool, *(string_class=NEW VStateless_class(pool)));  string_class->set_name(*string_class_name);
+	initialize_double_class(pool, *(double_class=NEW VStateless_class(pool)));  double_class->set_name(*double_class_name);
+	initialize_int_class(pool, *(int_class=NEW VStateless_class(pool)));  int_class->set_name(*int_class_name);
+	initialize_table_class(pool, *(table_class=NEW VStateless_class(pool)));  table_class->set_name(*table_class_name);
+	initialize_file_class(pool, *(file_class=NEW VStateless_class(pool)));  file_class->set_name(*file_class_name);
+	initialize_response_class(pool, *(response_class=NEW VStateless_class(pool)));  response_class->set_name(*response_class_name);
+	initialize_random_class(pool, *(random_class=NEW VStateless_class(pool)));  random_class->set_name(*random_class_name);
+	initialize_mail_class(pool, *(mail_class=NEW VStateless_class(pool)));  mail_class->set_name(*mail_class_name);
+	initialize_image_class(pool, *(image_class=NEW VStateless_class(pool)));  image_class->set_name(*image_class_name);
 
 	// stateless base classes
 	initialize_form_base_class(pool, *(form_base_class=NEW VStateless_class(pool)));  form_base_class->set_name(*form_class_name);