--- parser3/src/main/pa_globals.C 2001/04/07 10:34:45 1.47 +++ parser3/src/main/pa_globals.C 2001/04/12 15:02:41 1.55 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_globals.C,v 1.47 2001/04/07 10:34:45 paf Exp $ + $Id: pa_globals.C,v 1.55 2001/04/12 15:02:41 paf Exp $ */ #include "pcre.h" @@ -24,6 +24,8 @@ #include "_random.h" #include "pa_sql_driver_manager.h" #include "_mail.h" +#include "_image.h" +#include "_unknown.h" String *html_typo_name; String *content_type_name; @@ -47,8 +49,12 @@ String *empty_string; String *auto_method_name; String *main_method_name; +String *unknown_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; @@ -58,6 +64,7 @@ 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; @@ -72,6 +79,7 @@ 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; @@ -113,7 +121,6 @@ static void setup_hex_value() { hex_value['f'] = 15; } -/// @test problems with $t[^table:set{}] ^t.menu{^if(){}} if not a field! void pa_globals_init(Pool& pool) { #undef NEW #define NEW new(pool) @@ -144,8 +151,12 @@ void pa_globals_init(Pool& pool) { auto_method_name=NEW String(pool, AUTO_METHOD_NAME); main_method_name=NEW String(pool, MAIN_METHOD_NAME); + unknown_class_name=NEW String(pool, UNKNOWN_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); @@ -155,6 +166,7 @@ void pa_globals_init(Pool& pool) { 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); @@ -170,6 +182,8 @@ void pa_globals_init(Pool& pool) { 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); @@ -249,14 +263,16 @@ void pa_globals_init(Pool& pool) { 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_mail_class(pool, *(mail_class=NEW VStateless_class(pool))); + initialize_unknown_class(pool, *(unknown_class=NEW VStateless_class(pool))); unknown_class->set_name(*unknown_class_name); + 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);