--- parser3/src/classes/op.C 2002/10/17 09:04:53 1.123 +++ parser3/src/classes/op.C 2003/02/04 14:04:46 1.127.2.7 @@ -1,11 +1,11 @@ /** @file Parser: parser @b operators. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_OP_C="$Date: 2002/10/17 09:04:53 $"; +static const char* IDENT_OP_C="$Date: 2003/02/04 14:04:46 $"; #include "classes.h" #include "pa_common.h" @@ -30,28 +30,32 @@ public: VClassMAIN(Pool& apool); }; +// helpers + +Hash Hash untaint_lang_name2enum; + // methods -static void _if(Request& r, const String&, MethodParams *params) { - Value& condition_code=params->as_junction(0, "condition must be expression"); +static void _if(Request& r, StringPtr /*method_name*/, MethodParams& params) { + Value& condition_code=params.as_junction(0, "condition must be expression"); bool condition=r.process_to_value(condition_code, /*0/*no name* /,*/ false/*don't intercept string*/).as_bool(); if(condition) - r.write_pass_lang(r.process(params->as_junction(1, "'then' parameter must be code"))); - else if(params->size()>2) - r.write_pass_lang(r.process(params->as_junction(2, "'else' parameter must be code"))); + r.write_pass_lang(r.process(params.as_junction(1, "'then' parameter must be code"))); + else if(params.count()>2) + r.write_pass_lang(r.process(params.as_junction(2, "'else' parameter must be code"))); } -static void _untaint(Request& r, const String& method_name, MethodParams *params) { +static void _untaint(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); uchar lang; - if(params->size()==1) + if(params.count()==1) lang=String::UL_AS_IS; // mark as simply 'tainted'. useful in html from sql else { - const String& lang_name=params->as_string(0, "lang must be string"); + const String& lang_name=params.as_string(0, "lang must be string"); lang=untaint_lang_name2enum->get_int(lang_name); if(!lang) throw Exception(0, @@ -60,21 +64,21 @@ static void _untaint(Request& r, const S } { - Value& vbody=params->as_junction(params->size()-1, "body must be code"); + Value& vbody=params.as_junction(params.count()-1, "body must be code"); Temp_lang temp_lang(r, lang); // set temporarily specified ^untaint[language; r.write_pass_lang(r.process(vbody)); // process marking tainted with that lang } } -static void _taint(Request& r, const String&, MethodParams *params) { +static void _taint(Request& r, StringPtr /*method_name*/, MethodParams& params) { Pool& pool=r.pool(); uchar lang; - if(params->size()==1) + if(params.count()==1) lang=String::UL_TAINTED; // mark as simply 'tainted'. useful in table:set else { - const String& lang_name=params->as_string(0, "lang must be string"); + const String& lang_name=params.as_string(0, "lang must be string"); lang=untaint_lang_name2enum->get_int(lang_name); if(!lang) throw Exception(0, @@ -83,7 +87,7 @@ static void _taint(Request& r, const Str } { - Value& vbody=params->as_no_junction(params->size()-1, "body must not be code"); + Value& vbody=params.as_no_junction(params.count()-1, "body must not be code"); String& result=*new(pool) String(pool); result.append( @@ -93,16 +97,16 @@ static void _taint(Request& r, const Str } } -static void _process(Request& r, const String& method_name, MethodParams *params) { +static void _process(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); const Method *main_method; - Value& target_self=params->size()>1? - params->as_no_junction(0, "target must not be code") + Value& target_self=params.count()>1? + params.as_no_junction(0, "target must not be code") :r.get_method_frame()->caller()->self(); { - Value& vjunction=params->as_junction(params->size()-1, "body must be code"); + Value& vjunction=params.as_junction(params.count()-1, "body must be code"); - VStateless_class *target_class=target_self.get_class(); + VStateless_class *target_class=target_self.get_last_derived_class(); if(!target_class) throw Exception("parser.runtime", &method_name, @@ -159,15 +163,15 @@ static void _process(Request& r, const S } } -static void _rem(Request& r, const String&, MethodParams *params) { - params->as_junction(0, "body must be code"); +static void _rem(Request& r, StringPtr /*method_name*/, MethodParams& params) { + params.as_junction(0, "body must be code"); } -static void _while(Request& r, const String& method_name, MethodParams *params) { +static void _while(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - Value& vcondition=params->as_junction(0, "condition must be expression"); - Value& body=params->as_junction(1, "body must be code"); + Value& vcondition=params.as_junction(0, "condition must be expression"); + Value& body=params.as_junction(1, "body must be code"); // while... int endless_loop_count=0; @@ -188,18 +192,18 @@ static void _while(Request& r, const Str } } -static void _use(Request& r, const String& method_name, MethodParams *params) { - Value& vfile=params->as_no_junction(0, "file name must not be code"); +static void _use(Request& r, StringPtr method_name, MethodParams& params) { + Value& vfile=params.as_no_junction(0, "file name must not be code"); r.use_file(r.main_class, vfile.as_string()); } -static void _for(Request& r, const String& method_name, MethodParams *params) { +static void _for(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - const String& var_name=params->as_string(0, "var name must be string"); - int from=params->as_int(1, "from must be int", r); - int to=params->as_int(2, "to must be int", r); - Value& body_code=params->as_junction(3, "body must be code"); - Value *delim_maybe_code=params->size()>4?¶ms->get(4):0; + const String& var_name=params.as_string(0, "var name must be string"); + int from=params.as_int(1, "from must be int", r); + int to=params.as_int(2, "to must be int", r); + Value& body_code=params.as_junction(3, "body must be code"); + Value *delim_maybe_code=params.count()>4?¶ms.get(4):0; if(to-from>=MAX_LOOPS) // too long loop? throw Exception("parser.runtime", @@ -223,14 +227,14 @@ static void _for(Request& r, const Strin } } -static void _eval(Request& r, const String& method_name, MethodParams *params) { - Value& expr=params->as_junction(0, "need expression"); +static void _eval(Request& r, StringPtr method_name, MethodParams& params) { + Value& expr=params.as_junction(0, "need expression"); // evaluate expresion Value *value_result=r.process_to_value(expr, /*0/*no name YET* /,*/ true/*don't intercept string*/).as_expr_result(); - if(params->size()>1) { - Value& fmt=params->as_no_junction(1, "fmt must not be code"); + if(params.count()>1) { + Value& fmt=params.as_no_junction(1, "fmt must not be code"); Pool& pool=r.pool(); String& string=*new(pool) String(pool); @@ -240,17 +244,17 @@ static void _eval(Request& r, const Stri r.write_no_lang(*value_result); } -static void _connect(Request& r, const String& method_name, MethodParams *params) { +static void _connect(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); #ifdef RESOURCES_DEBUG struct timeval mt[2]; #endif - Value& url=params->as_no_junction(0, "url must not be code"); - Value& body_code=params->as_junction(1, "body must be code"); + Value& url=params.as_no_junction(0, "url must not be code"); + Value& body_code=params.as_junction(1, "body must be code"); Table *protocol2driver_and_client=0; - if(Value *sql=r.main_class.get_element(*new(pool) String(pool, MAIN_SQL_NAME), &r.main_class, false)) { - if(Value *element=sql->get_element(*new(pool) String(pool, MAIN_SQL_DRIVERS_NAME), sql, false)) { + if(Value *sql=r.main_class.get_element(*new(pool) String(pool, MAIN_SQL_NAME), r.main_class, false)) { + if(Value *element=sql->get_element(*new(pool) String(pool, MAIN_SQL_DRIVERS_NAME), *sql, false)) { protocol2driver_and_client=element->get_table(); } } @@ -279,7 +283,7 @@ r.sql_connect_time+=t[1]-t[0]; r.write_assign_lang(r.process(body_code)); } catch(...) { // process problem connection->mark_to_rollback(); - /*re*/throw; + rethrow; } } @@ -291,11 +295,11 @@ struct Switch_data { Value *_default; }; #endif -static void _switch(Request& r, const String&, MethodParams *params) { - Switch_data data={&r, &r.process_to_value(params->get(0))}; +static void _switch(Request& r, StringPtr /*method_name*/, MethodParams& params) { + Switch_data data={&r, &r.process_to_value(params.get(0))}; Temp_hash_value switch_data_setter(r.classes_conf, *switch_data_name, &data); - Value& cases_code=params->as_junction(1, "switch cases must be code"); + Value& cases_code=params.as_junction(1, "switch cases must be code"); // execution of found ^case[...]{code} must be in context of ^switch[...]{code} // because of stacked WWrapper used there as wcontext r.process(cases_code, true/*intercept_string*/); @@ -306,7 +310,7 @@ static void _switch(Request& r, const St } } -static void _case(Request& r, const String& method_name, MethodParams *params) { +static void _case(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); Switch_data *data=static_cast(r.classes_conf.get(*switch_data_name)); @@ -315,15 +319,15 @@ static void _case(Request& r, const Stri &method_name, "without switch"); - int count=params->size(); - Value *code=¶ms->as_junction(--count, "case result must be code"); + int count=params.count(); + Value *code=¶ms.as_junction(--count, "case result must be code"); // killing context for safety, would execute in ^switch[...]{>>context<<} // reason: context is stacked, and it would become invalid afterwards //code->get_junction()->change_context(0); for(int i=0; iget(i)); + Value& value=r.process_to_value(params.get(i)); if(value.as_string() == CASE_DEFAULT_VALUE) { data->_default=code; @@ -352,7 +356,7 @@ static void _case(Request& r, const Stri // consts -const int DATA_STRING_SERIALIZED_VERSION=0x0002; +const int DATA_STRING_SERIALIZED_VERSION=0x0003; // helper types @@ -377,6 +381,10 @@ struct Locked_process_and_cache_put_acti Value *body_code; const String *evaluated_body; }; #endif +/* @todo maybe network order worth spending some effort? + don't bothering myself with network byte order, + am not planning to be able to move resulting file across platforms +*/ static void locked_process_and_cache_put_action(int f, void *context) { Locked_process_and_cache_put_action_info& info= *static_cast(context); @@ -428,6 +436,7 @@ String *cache_get(Pool& pool, const Stri if(file_read(pool, file_spec, data, data_size, false/*as_text*/, + 0, 0, //no params&out_fields false/*fail_on_read_problem*/) && data_size/* ignore reads which are empty due to non-unary open+lockEX conflict with lockSH */) { @@ -447,27 +456,27 @@ String *cache_get(Pool& pool, const Stri return 0; } -static time_t as_expires(Request& r, const String& method_name, MethodParams *params, +static time_t as_expires(Request& r, StringPtr method_name, MethodParams& params, int index, time_t now) { time_t result; - Value& vlifespan_or_expires=params->get(index); + Value& vlifespan_or_expires=params.get(index); if(Value *vdate=vlifespan_or_expires.as(VDATE_TYPE, false)) result=static_cast(vdate)->get_time(); else - result=now+(time_t)params->as_double(index, "lifespan must be date or number", r); + result=now+(time_t)params.as_double(index, "lifespan must be date or number", r); return result; } static const String as_file_spec(Request&r, MethodParams *params, int index) { - return r.absolute(params->as_string(index, "filespec must be string")); + return r.absolute(params.as_string(index, "filespec must be string")); } -static void _cache(Request& r, const String& method_name, MethodParams *params) { +static void _cache(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); time_t now=time(0); // ^cache[filename] ^cache(seconds) ^cache[expires date] - if(params->size()==1) { - if(params->get(0).is_string()) { // filename? + if(params.count()==1) { + if(params.get(0).is_string()) { // filename? cache_delete(as_file_spec(r, params, 0)); return; } @@ -487,12 +496,12 @@ static void _cache(Request& r, const Str } // file_spec, expires, body code - const String &file_spec=r.absolute(params->as_string(0, "filespec must be string")); + const String &file_spec=r.absolute(params.as_string(0, "filespec must be string")); Cache_data data; Temp_hash_value cache_data_setter(r.classes_conf, *cache_data_name, &data); data.expires=as_expires(r, method_name, params, 1, now); - Value& body_code=params->as_junction(2, "body must be code"); + Value& body_code=params.as_junction(2, "body must be code"); if(data.expires>now) { // valid 'expires' specified? try cached copy... // hence we don't hope to have unary create/lockEX @@ -548,10 +557,10 @@ static void _cache(Request& r, const Str } // also used in pa_request.C to pass param to @unhandled_exception -VHash& exception2vhash(Pool& pool, const Exception& e) { - VHash& result=*new(pool) VHash(pool); +VHashPtr exception2vhash(const Exception& e) { + VHashPtr result(new VHash)); Hash& hash=result.hash(0); - if(const char *type=e.type(true)) + if(const char* type=e.type(true)) hash.put(*exception_type_part_name, new(pool) VString(*new(pool) String(pool, type))); if(const String *asource=e.problem_source()) { String& source=*new(pool) String(pool); @@ -566,7 +575,7 @@ VHash& exception2vhash(Pool& pool, const new(pool) VInt(pool, 1+origin.line)); #endif } - if(const char *ecomment=e.comment(true)) { + if(const char* ecomment=e.comment(true)) { int comment_size=strlen(ecomment); char *pcomment=(char *)pool.malloc(comment_size); memcpy(pcomment, ecomment, comment_size); @@ -579,11 +588,11 @@ VHash& exception2vhash(Pool& pool, const return result; } -static void _try_operator(Request& r, const String& method_name, MethodParams *params) { +static void _try_operator(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - Value& body_code=params->as_junction(0, "body_code must be code"); - Value& catch_code=params->as_junction(1, "catch_code must be code"); + Value& body_code=params.as_junction(0, "body_code must be code"); + Value& catch_code=params.as_junction(1, "catch_code must be code"); StringOrValue result; // taking snapshot of try-context @@ -594,11 +603,11 @@ static void _try_operator(Request& r, co Request_context_saver throw_context(r); // taking snapshot of throw-context [stack trace contains error] try_context.restore(); // restoring try-context to perform catch-code - VHash& vhash=exception2vhash(pool, e); + VHashPtr vhash=exception2vhash(pool, e); Junction *junction=catch_code.get_junction(); Value *method_frame=junction->method_frame; - Value *saved_exception_var_value=method_frame->get_element(*exception_var_name, method_frame, false); + Value *saved_exception_var_value=method_frame->get_element(*exception_var_name, *method_frame, false); junction->method_frame->put_element(*exception_var_name, &vhash, false); result=r.process(catch_code); bool handled=false; @@ -615,19 +624,19 @@ static void _try_operator(Request& r, co r.write_pass_lang(result); } -static void _throw_operator(Request& r, const String& method_name, MethodParams *params) { +static void _throw_operator(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - if(params->size()==1) { - Value& param0=params->get(0); + if(params.count()==1) { + Value& param0=params.get(0); if(Hash *hash=param0.get_hash(&method_name)) { - const char *type=0; + const char* type=0; if(Value *value=static_cast(hash->get(*exception_type_part_name))) type=value->as_string().cstr(); const String *source=0; if(Value *value=static_cast(hash->get(*exception_source_part_name))) source=&value->as_string(); - const char *comment=0; + const char* comment=0; if(Value *value= static_cast(hash->get(*exception_comment_part_name))) comment=value->as_string().cstr(); @@ -640,9 +649,9 @@ static void _throw_operator(Request& r, &method_name, "one-param version has hash param"); } else { - const char *type=params->as_string(0, "type must be string").cstr(); - const String& source=params->as_string(1, "source must be string"); - const char *comment=params->size()>2?params->as_string(2, "comment must be string").cstr():0; + const char* type=params.as_string(0, "type must be string").cstr(); + const String& source=params.as_string(1, "source must be string"); + const char* comment=params.count()>2?params.as_string(2, "comment must be string").cstr():0; throw Exception(type, &source, "%s", comment?comment:""); } } @@ -709,6 +718,23 @@ VClassMAIN::VClassMAIN(Pool& apool): VCl // constructor & configurator -VClass& VClassMAIN_create(Pool& pool) { - return *new(pool) VClassMAIN(pool); +VStateless_classPtr VClassMAIN_create() { + #define ULN(name, LANG) \ + untaint_lang_name2enum.put(StringPtr(new String(name)), (int)String::UL_##LANG); + ULN("as-is", AS_IS); + ULN("optimized-as-is", AS_IS|String::UL_OPTIMIZE_BIT); + ULN("file-spec", FILE_SPEC); + ULN("http-header", HTTP_HEADER); + ULN("mail-header", MAIL_HEADER); + ULN("uri", URI); + ULN("table", TABLE); + ULN("sql", SQL); + ULN("js", JS); + ULN("xml", XML); + ULN("optimized-xml", XML|String::UL_OPTIMIZE_BIT); + ULN("html", HTML); + ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT); + #undef ULN + + return VStateless_classPtr(new VClassMAIN); }