--- parser3/src/classes/op.C 2005/02/17 14:56:54 1.151 +++ parser3/src/classes/op.C 2007/04/23 10:30:09 1.166 @@ -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: 2007/04/23 10:30:09 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -22,7 +22,7 @@ static const char * const IDENT_OP_C="$D // limits -#define MAX_LOOPS 10000 +#define MAX_LOOPS 20000 // defines @@ -38,10 +38,20 @@ public: VClassMAIN(); }; +// defines for globals + +#define CYCLE_DATA_NAME "CYCLE-DATA" + +// globals + +//^for & co +String cycle_data_name(CYCLE_DATA_NAME); + // defines for statics #define SWITCH_DATA_NAME "SWITCH-DATA" #define CACHE_DATA_NAME "CACHE-DATA" + #define EXCEPTION_VAR_NAME "exception" // statics @@ -53,6 +63,7 @@ static const String cache_data_name(CACH static const String exception_var_name(EXCEPTION_VAR_NAME); + // local defines #define CACHE_EXCEPTION_HANDLED_CACHE_NAME "cache" @@ -76,6 +87,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 +95,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) { @@ -154,7 +163,7 @@ static void _process(Request& r, MethodP { VStateless_class *target_class=target_self->get_last_derived_class(); if(!target_class) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "no target class"); @@ -171,7 +180,7 @@ static void _process(Request& r, MethodP Value& voptions=params.as_no_junction(options_index, "options must not be code"); options=voptions.get_hash(); if(!options) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "options must be hash"); } @@ -195,7 +204,7 @@ static void _process(Request& r, MethodP } if(valid_options!=options->count()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "called with invalid option"); } @@ -231,14 +240,19 @@ static void _rem(Request&, MethodParams& } static void _while(Request& r, MethodParams& params) { + Temp_hash_value + cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); + Value& vcondition=params.as_junction(0, "condition must be expression"); - Value& body=params.as_junction(1, "body must be code"); + Value& body_code=params.as_junction(1, "body must be code"); + Value* delim_maybe_code=params.count()>2?¶ms[2]:0; // while... int endless_loop_count=0; + bool need_delim=false; while(true) { if(++endless_loop_count>=MAX_LOOPS) // endless loop? - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "endless loop detected"); @@ -247,8 +261,18 @@ static void _while(Request& r, MethodPar if(!condition) // ...condition is true break; - // write processed body - r.write_pass_lang(r.process(body)); + StringOrValue sv_processed=r.process(body_code); + Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + const String* s_processed=sv_processed.get_string(); + if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body + if(need_delim) // need delim & iteration produced string? + r.write_pass_lang(r.process(*delim_maybe_code)); + need_delim=true; + } + r.write_pass_lang(sv_processed); + + if(lskip==Request::SKIP_BREAK) + break; } } @@ -257,7 +281,28 @@ static void _use(Request& r, MethodParam r.use_file(r.main_class, vfile.as_string()); } +static void set_skip(Request& r, Request::Skip askip) { + void* data=r.classes_conf.get(cycle_data_name); + if(!data) + throw Exception(PARSER_RUNTIME, + 0, + "without cycle"); + + r.set_skip(askip); +} + +static void _break(Request& r, MethodParams&) { + set_skip(r, Request::SKIP_BREAK); +} + +static void _continue(Request& r, MethodParams&) { + set_skip(r, Request::SKIP_CONTINUE); +} + static void _for(Request& r, MethodParams& params) { + Temp_hash_value + cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); + 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); @@ -265,17 +310,20 @@ static void _for(Request& r, MethodParam Value* delim_maybe_code=params.count()>4?¶ms[4]:0; if(to-from>=MAX_LOOPS) // too long loop? - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "endless loop detected"); 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); StringOrValue sv_processed=r.process(body_code); + Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); const String* s_processed=sv_processed.get_string(); if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body if(need_delim) // need delim & iteration produced string? @@ -283,6 +331,9 @@ static void _for(Request& r, MethodParam need_delim=true; } r.write_pass_lang(sv_processed); + + if(lskip==Request::SKIP_BREAK) + break; } } @@ -290,7 +341,7 @@ static void _eval(Request& r, MethodPara Value& expr=params.as_junction(0, "need expression"); // evaluate expresion Value& value_result=r.process_to_value(expr, - true/*don't intercept string*/).as_expr_result(); + false/*don't intercept string*/).as_expr_result(); if(params.count()>1) { Value& fmt=params.as_no_junction(1, "fmt must not be code"); r.write_no_lang(String(format(value_result.as_double(), fmt.as_string().cstrm()))); @@ -372,30 +423,32 @@ static void _switch(Request& r, MethodPa static void _case(Request& r, MethodParams& params) { Switch_data* data=static_cast(r.classes_conf.get(switch_data_name)); if(!data) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "without switch"); int count=params.count(); Value& code=params.as_junction(--count, "case result must be code"); + Value& searching=data->searching; + bool we_are_searching_string_or_void=searching.is_string() || searching.is_void(); for(int i=0; i_default=&code; break; } bool matches; - if(data->searching.is_string()) - matches=data->searching.as_string() == value.as_string(); + if(we_are_searching_string_or_void) + matches=searching.as_string() == value.as_string(); else - matches=data->searching.as_double() == value.as_double(); + matches=searching.as_double() == value.as_double(); if(matches) { if(data->found) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "duplicate found"); @@ -417,7 +470,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 +490,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 +523,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 +555,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,21 +566,19 @@ 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", + throw Exception(PARSER_RUNTIME, result.exception_should_be_handled, "$"EXCEPTION_VAR_NAME"."EXCEPTION_HANDLED_PART_NAME" value must be " "either boolean or string '"CACHE_EXCEPTION_HANDLED_CACHE_NAME"'"); @@ -611,6 +666,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] @@ -623,7 +690,7 @@ static void _cache(Request& r, MethodPar // secods|expires date Cache_scope* scope=static_cast(r.classes_conf.get(cache_data_name)); if(!scope) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "expire-time reducing instruction without cache"); @@ -633,7 +700,7 @@ static void _cache(Request& r, MethodPar return; } else if(params.count()<3) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "invalid number of parameters"); @@ -720,7 +787,7 @@ static void _try_operator(Request& r, Me &catch_code); if(result.exception_should_be_handled) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, result.exception_should_be_handled, "catch block must set $exception.handled to some boolean value, not string"); @@ -745,7 +812,7 @@ static void _throw_operator(Request&, Me source?source:0, "%s", comment?comment:""); } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "one-param version has hash param"); } else { @@ -796,11 +863,15 @@ VClassMAIN::VClassMAIN(): VClass() { add_native_method("rem", Method::CT_ANY, _rem, 1, 10000); // ^while(condition){code} - add_native_method("while", Method::CT_ANY, _while, 2, 2); + add_native_method("while", Method::CT_ANY, _while, 2, 3); // ^use[file] add_native_method("use", Method::CT_ANY, _use, 1, 1); + // ^break[] + add_native_method("break", Method::CT_ANY, _break, 0, 0); + // ^continue[] + add_native_method("continue", Method::CT_ANY, _continue, 0, 0); // ^for[i](from-number;to-number-inclusive){code}[delim] add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1); @@ -814,7 +885,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