--- parser3/src/classes/op.C 2005/02/17 14:56:54 1.151 +++ parser3/src/classes/op.C 2005/11/22 15:40:17 1.161 @@ -1,11 +1,11 @@ /** @file Parser: parser @b operators. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_OP_C="$Date: 2005/02/17 14:56:54 $"; +static const char * const IDENT_OP_C="$Date: 2005/11/22 15:40:17 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -76,6 +76,7 @@ public: ULN("optimized-xml", XML|String::L_OPTIMIZE_BIT); ULN("html", HTML); ULN("optimized-html", HTML|String::L_OPTIMIZE_BIT); + ULN("regex", REGEX); #undef ULN } } untaint_lang_name2enum; @@ -83,14 +84,11 @@ public: // methods static void _if(Request& r, MethodParams& params) { - Value& condition_code=params.as_junction(0, "condition must be expression"); - - bool condition=r.process_to_value(condition_code, - false/*don't intercept string*/).as_bool(); + bool condition=params.as_bool(0, "condition must be expression", r); if(condition) - r.write_pass_lang(r.process(params.as_junction(1, "'then' parameter must be code"))); + r.write_pass_lang(r.process(*params.get(1))); else if(params.count()>2) - r.write_pass_lang(r.process(params.as_junction(2, "'else' parameter must be code"))); + r.write_pass_lang(r.process(*params.get(2))); } static void _untaint(Request& r, MethodParams& params) { @@ -271,7 +269,9 @@ static void _for(Request& r, MethodParam bool need_delim=false; VInt* vint=new VInt(0); - r.get_method_frame()->caller()->put_element(var_name, vint, false); + + VMethodFrame& caller=*r.get_method_frame()->caller(); + caller.put_element(caller, var_name, vint, false); for(int i=from; i<=to; i++) { vint->set_int(i); @@ -382,7 +382,7 @@ static void _case(Request& r, MethodPara for(int i=0; i_default=&code; break; } @@ -417,7 +417,7 @@ struct Try_catch_result { template static Try_catch_result try_catch(Request& r, StringOrValue body_code(Request&, I), I info, - Value* catch_code) + Value* catch_code, bool could_be_handled_by_caller=false) { Try_catch_result result; if(!catch_code) { @@ -437,21 +437,25 @@ static Try_catch_result try_catch(Reques 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); - junction->method_frame->put_element(exception_var_name, &details.vhash, false); + VMethodFrame& frame=*junction->method_frame; + frame.put_element(frame, exception_var_name, &details.vhash, false); result.processed_code=r.process(*catch_code); // retriving $exception.handled, restoring $exception var Value* vhandled=details.vhash.hash().get(exception_handled_part_name); - junction->method_frame->put_element(exception_var_name, saved_exception_var_value, false); + frame.put_element(frame, exception_var_name, saved_exception_var_value, false); bool bhandled=false; if(vhandled) { if(vhandled->is_string()) { // not simple $exception.handled(1/0)? - result.exception_should_be_handled=vhandled->get_string(); // considering 'recovered' and let the caller recover - return result; - } - - bhandled=vhandled->as_bool(); + if(could_be_handled_by_caller) { // and we can possibly handle it + result.exception_should_be_handled=vhandled->get_string(); // considering 'recovered' and let the caller recover + return result; + } + + bhandled=false; + } else + bhandled=vhandled->as_bool(); } if(!bhandled) { @@ -466,7 +470,7 @@ static Try_catch_result try_catch(Reques // consts -const int DATA_STRING_SERIALIZED_VERSION=0x0005; +const int DATA_STRING_SERIALIZED_VERSION=0x0006; // helper types @@ -498,7 +502,7 @@ struct Locked_process_and_cache_put_acti static StringOrValue process_cache_body_code(Request& r, Value* body_code) { - return StringOrValue(&r.process_to_string(*body_code), 0); + return StringOrValue(r.process_to_string(*body_code)); } /* @todo maybe network order worth spending some effort? @@ -509,19 +513,17 @@ static void locked_process_and_cache_put Locked_process_and_cache_put_action_info& info= *static_cast(context); + + const String* body_from_disk=info.scope->body_from_disk; // body->process Try_catch_result result=try_catch(*info.r, process_cache_body_code, info.body_code, - info.catch_code); + info.catch_code, body_from_disk!=0 /*we have something old=we can handle=recover later*/); if(result.exception_should_be_handled) { if(*result.exception_should_be_handled==CACHE_EXCEPTION_HANDLED_CACHE_NAME) { - if(const String* body_from_disk=info.scope->body_from_disk) // we have something old? - info.processed_code=body_from_disk; - else - throw Exception(0, - new String("$"EXCEPTION_VAR_NAME"."EXCEPTION_HANDLED_PART_NAME"["CACHE_EXCEPTION_HANDLED_CACHE_NAME"]"), - "fallback failed - there is no old cached body"); + assert(body_from_disk); + info.processed_code=body_from_disk; } else throw Exception("parser.runtime", result.exception_should_be_handled, @@ -611,6 +613,18 @@ static const String& as_file_spec(Reques return r.absolute(params.as_string(index, "filespec must be string")); } static void _cache(Request& r, MethodParams& params) { + if(params.count()==0) + { + // return current expiration time + Cache_scope* scope=static_cast(r.classes_conf.get(cache_data_name)); + if(!scope) + throw Exception("parser.runtime", + 0, + "expire-time get without cache"); + r.write_no_lang(*new VDate(scope->expires)); + return; + } + time_t now=time(0); // ^cache[filename] ^cache(seconds) ^cache[expires date] @@ -814,7 +828,8 @@ VClassMAIN::VClassMAIN(): VClass() { // ^cache[file_spec](time){code}[{catch code}] time=0 no cache // ^cache[file_spec] delete cache - add_native_method("cache", Method::CT_ANY, _cache, 1, 4); + // ^cache[] get current expiration time + add_native_method("cache", Method::CT_ANY, _cache, 0, 4); // switch