--- parser3/src/main/pa_globals.C 2001/04/28 08:43:57 1.57 +++ parser3/src/main/pa_globals.C 2001/10/12 12:15:32 1.82 @@ -2,19 +2,22 @@ Parser: globals. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_globals.C,v 1.57 2001/04/28 08:43:57 paf Exp $ + $Id: pa_globals.C,v 1.82 2001/10/12 12:15:32 parser Exp $ */ #include "pa_globals.h" #include "pa_string.h" #include "pa_hash.h" #include "pa_sql_driver_manager.h" +#include "pa_dictionary.h" +#include "pa_xslt_stylesheet_manager.h" +#include "pa_charset_manager.h" String *user_html_name; String *content_type_name; +String *charset_name; String *body_name; String *value_name; String *expires_name; @@ -30,7 +33,6 @@ String *content_disposition_name; String *content_disposition_filename_name; String *unnamed_name; -String *empty_string; String *auto_method_name; String *main_method_name; @@ -38,39 +40,36 @@ String *main_method_name; String *main_class_name; String *result_var_name; +String *match_var_name; String *string_pre_match_name; String *string_match_name; String *string_post_match_name; -String *limits_name; -String *post_max_size_name; - String *defaults_name; -String *ctype_name; -String *ctype_white_space_name; -String *ctype_digit_name; -String *ctype_hex_digit_name; -String *ctype_letter_name; -String *ctype_word_name; -String *ctype_lowercase_name; +String *charsets_name; String *mime_types_name; String *vfile_mime_type_name; -String *mail_name; +String *origins_mode_name; + +String *class_path_name; + +String *switch_data_name; +String *case_default_value; -String *main_sql_name; -String *main_sql_drivers_name; +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; @@ -105,6 +104,7 @@ void pa_globals_init(Pool& pool) { // names user_html_name=NEW String(pool, USER_HTML_NAME); content_type_name=NEW String(pool, CONTENT_TYPE_NAME); + charset_name=NEW String(pool, CHARSET_NAME); body_name=NEW String(pool, BODY_NAME); value_name=NEW String(pool, VALUE_NAME); expires_name=NEW String(pool, EXPIRES_NAME); @@ -120,7 +120,6 @@ void pa_globals_init(Pool& pool) { content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_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); @@ -128,55 +127,52 @@ void pa_globals_init(Pool& pool) { main_class_name=NEW String(pool, MAIN_CLASS_NAME); result_var_name=NEW String(pool, RESULT_VAR_NAME); + match_var_name=NEW String(pool, MATCH_VAR_NAME); string_pre_match_name=NEW String(pool, STRING_PRE_MATCH_NAME); string_match_name=NEW String(pool, STRING_MATCH_NAME); string_post_match_name=NEW String(pool, STRING_POST_MATCH_NAME); - limits_name=NEW String(pool, LIMITS_NAME); - post_max_size_name=NEW String(pool, POST_MAX_SIZE_NAME); - defaults_name=NEW String(pool, DEFAULTS_NAME); - ctype_name=NEW String(pool, CTYPE_NAME); - ctype_white_space_name=NEW String(pool, CTYPE_WHITE_SPACE_NAME); - ctype_digit_name=NEW String(pool, CTYPE_DIGIT_NAME); - ctype_hex_digit_name=NEW String(pool, CTYPE_HEX_DIGIT_NAME); - ctype_letter_name=NEW String(pool, CTYPE_LETTER_NAME); - ctype_word_name=NEW String(pool, CTYPE_WORD_NAME); - ctype_lowercase_name=NEW String(pool, CTYPE_LOWERCASE_NAME); + charsets_name=NEW String(pool, CHARSETS_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); - + 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); - main_sql_name=NEW String(pool, MAIN_SQL_NAME); - main_sql_drivers_name=NEW String(pool, MAIN_SQL_DRIVERS_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 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"); - 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); + #define ULN(var, cstr, LANG) \ + String var(pool, cstr); \ + untaint_lang_name2enum->put(var, (int)String::UL_##LANG); + ULN(as_is, "as-is", AS_IS); + ULN(file_name, "file-spec", FILE_SPEC); + ULN(http_header, "http-header", HTTP_HEADER); + ULN(mail_header, "mail-header", MAIL_HEADER); + ULN(uri, "uri", URI); + 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); \ @@ -189,7 +185,44 @@ 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 SQL_driver_manager=NEW SQL_Driver_manager(pool); + +#ifdef XML + // XSLT stylesheet driver manager + XSLT_stylesheet_manager=NEW XSLT_Stylesheet_manager(pool); +#endif + + // Charset manager + charset_manager=NEW Charset_manager(pool); } + +#if defined(XML) && defined(_MSC_VER) +# define XERCES_BUILD_WIN32_BUILD "/parser3project/win32xml/xml-xerces/c/Build/Win32/VC6" +# define XALAN_BUILD_WIN32_BUILD "/parser3project/win32xml/xml-xalan/c/Build/Win32/VC6" +# ifdef _DEBUG +# pragma comment(lib, XERCES_BUILD_WIN32_BUILD "/Debug/xerces-c_1D.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XSLTD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XPathD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XalanTransformerD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XalanDOMD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/DOMSupportD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/PlatformSupportD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XMLSupportD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XercesParserLiaisonD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XalanSourceTreeD.lib") +# else +# pragma comment(lib, XERCES_BUILD_WIN32_BUILD "/Release/xerces-c_1.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XalanSourceTree.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/PlatformSupport.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XalanDOM.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/DOMSupport.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XalanTransformer.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XercesParserLiaison.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XMLSupport.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XPath.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XSLT.lib") +# endif +#endif