--- parser3/src/main/pa_globals.C 2001/07/25 09:57:33 1.64 +++ parser3/src/main/pa_globals.C 2001/09/11 09:20:57 1.72 @@ -5,12 +5,13 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -static const char *RCSId="$Id: pa_globals.C,v 1.64 2001/07/25 09:57:33 parser Exp $"; +static const char *RCSId="$Id: pa_globals.C,v 1.72 2001/09/11 09:20:57 parser Exp $"; #include "pa_globals.h" #include "pa_string.h" #include "pa_hash.h" #include "pa_sql_driver_manager.h" +#include "pa_dictionary.h" String *user_html_name; String *content_type_name; @@ -54,17 +55,25 @@ String *mime_types_name; String *vfile_mime_type_name; String *origins_mode_name; +String *class_path_name; + +String *switch_data_name; +String *case_default_value; + +String *sql_limit_name; +String *sql_offset_name; +String *sql_default_name; + +String *hash_default_element_name; + Hash *untaint_lang_name2enum; -Table *default_typo_table; +Dictionary *default_typo_dict; short hex_value[0x100]; static void setup_hex_value() { - int i; - for (i=0; (i < 0x100); i++) { - hex_value[i] = 0; - } + memset(hex_value, 0, sizeof(hex_value)); hex_value['0'] = 0; hex_value['1'] = 1; hex_value['2'] = 2; @@ -139,7 +148,22 @@ void pa_globals_init(Pool& pool) { mime_types_name=NEW String(pool, MIME_TYPES_NAME); vfile_mime_type_name=NEW String(pool, VFILE_MIME_TYPE_NAME); origins_mode_name=NEW String(pool, ORIGINS_MODE_NAME); - + + class_path_name=NEW String(pool, CLASS_PATH_NAME); + + //^switch ^case + switch_data_name=NEW String(pool, SWITCH_DATA_NAME); + case_default_value=NEW String(pool, CASE_DEFAULT_VALUE); + + // sql + sql_limit_name=NEW String(pool, SQL_LIMIT_NAME); + sql_offset_name=NEW String(pool, SQL_OFFSET_NAME); + sql_default_name=NEW String(pool, SQL_DEFAULT_NAME); + + // hash + hash_default_element_name=NEW String(pool, HASH_DEFAULT_ELEMENT_NAME); + + // hashes untaint_lang_name2enum=NEW Hash(pool); #define ULN(var, cstr, LANG) \ @@ -153,11 +177,12 @@ void pa_globals_init(Pool& pool) { ULN(table, "table", TABLE); ULN(sql, "sql", SQL); ULN(js, "js", JS); + ULN(xml, "xml", XML); ULN(html, "html", HTML); ULN(user_html, "user-html", USER_HTML); // tables - default_typo_table=NEW Table(pool, 0, 0); + Table *default_typo_table=NEW Table(pool, 0, 0); #define DT_ROW(from, to) { \ Array *row=NEW Array(pool); \ *row+=NEW String(pool, from); \ @@ -170,6 +195,7 @@ void pa_globals_init(Pool& pool) { DT_ROW("&", "&"); DT_ROW("\\n\\n", "

"); DT_ROW("\\n", "
"); + default_typo_dict=NEW Dictionary(*default_typo_table); // SQL_Driver_manager SQL_driver_manager=NEW SQL_Driver_manager(pool);