--- parser3/src/main/pa_request.C 2001/09/18 16:05:42 1.153 +++ parser3/src/main/pa_request.C 2001/10/30 15:08:20 1.173 @@ -2,15 +2,15 @@ Parser: request class main part. @see compile.C and execute.C. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: pa_request.C,v 1.173 2001/10/30 15:08:20 paf Exp $ */ -static const char *RCSId="$Id: pa_request.C,v 1.153 2001/09/18 16:05:42 parser Exp $"; #include "pa_config_includes.h" -#include "pcre.h" -#include "internal.h" +//#include "pcre.h" +//#include "internal.h" extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c #include "pa_sapi.h" @@ -25,6 +25,7 @@ extern "C" unsigned char pcre_default_ta #include "pa_vtable.h" #include "pa_vfile.h" #include "pa_dictionary.h" +#include "pa_charset_manager.h" /// content type of exception response, when no @MAIN:exception handler defined const char *UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; @@ -35,6 +36,17 @@ const char *ORIGINS_CONTENT_TYPE="text/p Methoded *MOP_create(Pool&); +static void load_charset(const Hash::Key& akey, Hash::Val *avalue, + void *info) { + Value& value=*static_cast(avalue); + Hash& CTYPE=*static_cast(info); + + Charset_connection& connection=charset_manager->get_connection(akey, value.as_string()); + + // charset->pcre_tables + CTYPE.put(akey, connection.pcre_tables()); +} + // Request::Request(Pool& apool, Info& ainfo, @@ -48,6 +60,7 @@ Request::Request(Pool& apool, response(apool), cookie(apool), fclasses(apool), + CTYPE(apool), fdefault_lang(adefault_lang), flang(adefault_lang), info(ainfo), post_data(0), post_size(0), @@ -56,9 +69,9 @@ Request::Request(Pool& apool, mime_types(0), main_class(0), connection(0), - pcre_tables(0), classes_conf(apool), - anti_endless_execute_recoursion(0) + anti_endless_execute_recoursion(0), + trace(apool) { /// directly used // operators @@ -86,66 +99,6 @@ Request::Request(Pool& apool, classes().put(math.get_class()->base()->name(), &math); } -static void element2ctypes(unsigned char *tables, - Value& ctype, const String& name, - unsigned char bit, - int group_offset=-1, - bool skip_ws=true) { - Value *value=ctype.get_element(name); - if(!value) - return; - - unsigned char *ctypes_table=tables+ctypes_offset; - const unsigned char *cstr= - (const unsigned char *)value->as_string().cstr(String::UL_AS_IS); - for(; *cstr; cstr++) { - unsigned char c=*cstr; - if(skip_ws && (c=='\n' || c=='\t' || c==' ')) - continue; - ctypes_table[c]|=bit; - - if(group_offset>=0) - tables[cbits_offset+group_offset+c/8] |= 1 << (c%8); - } -} -static void cstr2ctypes(unsigned char *tables, const unsigned char *cstr, - unsigned char bit) { - unsigned char *ctypes_table=tables+ctypes_offset; - ctypes_table[0]=bit; - for(; *cstr; cstr++) { - unsigned char c=*cstr; - ctypes_table[c]|=bit; - } -} -static void prepare_case_tables(unsigned char *tables) { - unsigned char *lcc_table=tables+lcc_offset; - unsigned char *fcc_table=tables+fcc_offset; - for(int i=0; i<0x100; i++) - lcc_table[i]=fcc_table[i]=i; -} -static void element2case(unsigned char *tables, Value& ctype, const String& name) { - Value *value=ctype.get_element(name); - if(!value) - return; - - unsigned char *lcc_table=tables+lcc_offset; - unsigned char *fcc_table=tables+fcc_offset; - const unsigned char *cstr= - (const unsigned char *)value->as_string().cstr(String::UL_AS_IS); - unsigned char from=0; - for(; *cstr; cstr++) { - unsigned char c=*cstr; - if(c=='\n' || c=='\t' || c==' ') - continue; - if(from) { - lcc_table[from]=c; - fcc_table[from]=c; fcc_table[c]=from; - from=0; - } else - from=c; - } -} - /** load MAIN class, execute @main. MAIN class consists of all the auto.p files we'd manage to find @@ -159,8 +112,7 @@ void Request::core( const char *site_config_filespec, bool site_config_fail_on_read_problem, bool header_only) { //_asm { int 3 } - bool need_rethrow=false; Exception rethrow_me; - TRY { + try { char *auto_filespec=(char *)malloc(MAX_STRING); // loading root config @@ -173,6 +125,22 @@ void Request::core( main_class_name, main_class); } + if(main_class) { + /* $MAIN:CHARSETS[ + $.charsetname1[/full/path/to/charset/file.cfg] + ... + ] + */ + if(Value *vcharsets=main_class->get_element(*charsets_name)) { + if(Hash *charsets=vcharsets->get_hash(0)) + charsets->for_each(load_charset, &CTYPE); + else + throw Exception(0, 0, + &vcharsets->name(), + "must be hash"); + } + } + // configure root options // until someone with less privileges have overriden them OP.configure_admin(*this); @@ -233,6 +201,12 @@ void Request::core( // value must be allocated on request's pool for that pool used on // meaning constructing @see attributed_meaning_to_string default_content_type=defaults?defaults->get_element(*content_type_name):0; + // record default charset + if(default_content_type) + if(Hash *hash=default_content_type->get_hash(0)) + if(Value *vcharset=(Value *)hash->get(*charset_name)) + pool().set_charset(vcharset->as_string()); + if(Value *element=main_class->get_element(*user_html_name)) if(Table *table=element->get_table()) pool().set_tag(NEW Dictionary(*table)); @@ -242,39 +216,6 @@ void Request::core( if(Table *table=element->get_table()) mime_types=table; - /* - $MAIN:CTYPE[ - $.white-space[ - ^#09^#0A^#0B^#0C^#0D^#20] - $.digit[ - 0123456789] - $.hex-digit[ - 0123456789ABCDEFabcdef] - $.letter[ - ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz] - $.word[ - 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz] - - $.lowercase[ - AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz] - ] - */ - if(Value *ctype=main_class->get_element(*ctype_name)) { - // lowcase, flipcase, bits digit+word+whitespace, masks - pcre_tables=(unsigned char *)calloc(tables_length); - prepare_case_tables(pcre_tables); - - element2ctypes(pcre_tables, *ctype, *ctype_white_space_name, ctype_space, cbit_space, false); - element2ctypes(pcre_tables, *ctype, *ctype_digit_name, ctype_digit, cbit_digit); - element2ctypes(pcre_tables, *ctype, *ctype_hex_digit_name, ctype_xdigit); - element2ctypes(pcre_tables, *ctype, *ctype_letter_name, ctype_letter); - element2ctypes(pcre_tables, *ctype, *ctype_word_name, ctype_word, cbit_word); - cstr2ctypes(pcre_tables, (const unsigned char *)"*+?{^.$|()[", ctype_meta); - - element2case(pcre_tables, *ctype, *ctype_lowercase_name); - } else - pcre_tables=pcre_default_tables; - // filling form fields form.fill_fields_and_tables(*this); @@ -285,7 +226,7 @@ void Request::core( const String *body_string=execute_virtual_method( *main_class, *main_method_name); if(!body_string) - THROW(0,0, + throw Exception(0,0, 0, "'"MAIN_METHOD_NAME"' method not found"); @@ -323,10 +264,9 @@ void Request::core( // OK. write out the result output_result(*body_file, header_only); - } - CATCH(e) { // request handling problem + } catch(const Exception& e) { // request handling problem // we're returning not result, but error explanation - TRY { + try { // log the beast const String *problem_source=e.problem_source(); if(problem_source && problem_source->size()) @@ -339,19 +279,21 @@ void Request::core( problem_source->origin().file?problem_source->origin().file:"global", problem_source->origin().line, #endif - problem_source->cstr(String::UL_AS_IS), + problem_source->cstr(), e.comment(), - e.type()?e.type()->cstr(String::UL_AS_IS):"-", - e.code()?e.code()->cstr(String::UL_AS_IS):"-" + e.type()?e.type()->cstr():"-", + e.code()?e.code()->cstr():"-" ); else SAPI::log(pool(), "%s [%s %s]", e.comment(), - e.type()?e.type()->cstr(String::UL_AS_IS):"-", - e.code()?e.code()->cstr(String::UL_AS_IS):"-" + e.type()?e.type()->cstr():"-", + e.code()?e.code()->cstr():"-" ); + /// @test log stack trace + // reset language to default flang=fdefault_lang; if(flang==String::UL_USER_HTML) @@ -369,8 +311,8 @@ void Request::core( if(Value *value=main_class->get_element(*exception_method_name)) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) { - // preparing to pass parameters to - // @exception[origin;source;comment;type;code] + // preparing to pass parameters to + // @exception[origin;source;comment;type;code;stack] VMethodFrame frame(pool(), value->name(), *junction); frame.set_self(*main_class); @@ -382,11 +324,10 @@ void Request::core( const Origin& origin=problem_source->origin(); if(origin.file) { char *buf=(char *)malloc(MAX_STRING); - size_t buf_size=snprintf(buf, MAX_STRING, "%s(%d):", + size_t buf_size=snprintf(buf, MAX_STRING, "%s(%d)", origin.file, 1+origin.line); - String *origin_file_line=NEW String(pool(), - buf, buf_size, true); - origin_value=NEW VString(*origin_file_line); + origin_value=NEW VString(*NEW String(pool(), + buf, buf_size, true)); } } #endif @@ -430,8 +371,33 @@ void Request::core( code_value=NEW VVoid(pool()); frame.store_param(method->name, code_value); + // $stack[^table::set{name origin}] + Array& stack_trace_columns=*NEW Array(pool()); + stack_trace_columns+=NEW String(pool(), "name"); + stack_trace_columns+=NEW String(pool(), "origin"); + Table& stack_trace=*NEW Table(pool(), 0, &stack_trace_columns); + Array_iter tracei(trace); + while(tracei.has_next()) { + Array& row=*NEW Array(pool()); + + const String *name=(const String *)tracei.next(); + row+=name; // name column +#ifndef NO_STRING_ORIGIN + const Origin& origin=name->origin(); + if(origin.file) { + char *buf=(char *)malloc(MAX_STRING); + size_t buf_size=snprintf(buf, MAX_STRING, "%s(%d)", + origin.file, 1+origin.line); + row+=NEW String(pool(), buf, buf_size, true); // origin column + } +#endif + stack_trace+=&row; + } + frame.store_param(method->name, + NEW VTable(pool(), &stack_trace)); + // future $response:body= - // execute ^exception[origin;source;comment;type;code] + // execute ^exception[origin;source;comment;type;code;stack] body_string=execute_method(frame, *method); } } @@ -451,18 +417,18 @@ void Request::core( origin.file, 1+origin.line); #endif printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", - problem_source->cstr(String::UL_AS_IS)); + problem_source->cstr()); } printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", e.comment()); const String *type=e.type(); if(type) { printed+=snprintf(buf+printed, MAX_STRING-printed, " type: %s", - type->cstr(String::UL_AS_IS)); + type->cstr()); const String *code=e.code(); if(code) printed+=snprintf(buf+printed, MAX_STRING-printed, ", code: %s", - code->cstr(String::UL_AS_IS)); + code->cstr()); } // future $response:content-type @@ -477,21 +443,10 @@ void Request::core( // ERROR. write it out output_result(*body_file, header_only); + } catch(const Exception& ) { + /*re*/throw; } - CATCH(e) { - // exception in request exception handler - // remember to rethrow it - rethrow_me=e; need_rethrow=true; - } - END_CATCH } - END_CATCH // do not use pool() after this point - no exception handler set - // any throw() would try to use zero exception() pointer - - if(need_rethrow) // were there an exception for us to rethrow? - THROW(rethrow_me.type(), rethrow_me.code(), - rethrow_me.problem_source(), - rethrow_me.comment()); } VStateless_class *Request::use_file(const String& file_name, @@ -522,16 +477,16 @@ VStateless_class *Request::use_file(cons break; // found along class_path } } else - THROW(0, 0, + throw Exception(0, 0, &element->name(), "must be string or table"); if(!file_spec) - THROW(0, 0, + throw Exception(0, 0, &file_name, "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); } if(!file_spec) - THROW(0, 0, + throw Exception(0, 0, &file_name, "usage failed - no " MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); } @@ -585,7 +540,7 @@ static void add_header_attribute(const H Pool& pool=lmeaning.pool(); SAPI::add_header_attribute(pool, - aattribute.cstr(String::UL_AS_IS), + aattribute.cstr(), attributed_meaning_to_string(lmeaning, String::UL_HTTP_HEADER).cstr()); } void Request::output_result(const VFile& body_file, bool header_only) { @@ -642,9 +597,18 @@ const String& Request::mime_type_of(cons if(const String *result=mime_types->item(1)) return *result; else - THROW(0, 0, + throw Exception(0, 0, mime_types->origin_string(), "MIME-TYPE table column elements must not be empty"); } return *NEW String(pool(), "application/octet-stream"); } + +const unsigned char *Request::pcre_tables() { + if(unsigned char *result=(unsigned char *)CTYPE.get(pool().get_charset())) + return result; + + // this is not for pcre itself, + // it can do default, it's for string.lower&co + return pcre_default_tables; +}