--- parser3/src/classes/op.C 2005/11/18 11:44:04 1.152.4.4 +++ parser3/src/classes/op.C 2006/04/09 12:25:03 1.163.12.1 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_OP_C="$Date: 2005/11/18 11:44:04 $"; +static const char * const IDENT_OP_C="$Date: 2006/04/09 12:25:03 $"; #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 @@ -42,6 +42,8 @@ public: #define SWITCH_DATA_NAME "SWITCH-DATA" #define CACHE_DATA_NAME "CACHE-DATA" +#define CYCLE_DATA_NAME "CYCLE-DATA" + #define EXCEPTION_VAR_NAME "exception" // statics @@ -50,6 +52,8 @@ public: static const String switch_data_name(SWITCH_DATA_NAME); //^cache static const String cache_data_name(CACHE_DATA_NAME); +//^for +static const String cycle_data_name(CYCLE_DATA_NAME); static const String exception_var_name(EXCEPTION_VAR_NAME); @@ -76,6 +80,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; @@ -229,10 +234,12 @@ static void _rem(Request&, MethodParams& static void _while(Request& r, MethodParams& params) { 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", @@ -244,8 +251,14 @@ 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); + 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); } } @@ -254,7 +267,31 @@ static void _use(Request& r, MethodParam r.use_file(r.main_class, vfile.as_string()); } +const int BREAK_BREAK=1; +const int BREAK_CONTINUE=2; + +static void set_break(Request& r, int abreak) { + void* data=r.classes_conf.get(cycle_data_name); + if(!data) + throw Exception("parser.runtime", + 0, + "without cycle"); + + r.set_break(abreak); +} + +static void _break(Request& r, MethodParams&) { + set_break(r, BREAK_BREAK); +} + +static void _continue(Request& r, MethodParams&) { + set_break(r, BREAK_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); @@ -268,11 +305,14 @@ 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); StringOrValue sv_processed=r.process(body_code); + int lbreak=r.get_break(); r.set_break(0); 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? @@ -280,6 +320,14 @@ static void _for(Request& r, MethodParam need_delim=true; } r.write_pass_lang(sv_processed); + if(lbreak) { + if(lbreak==BREAK_BREAK) + break; + else { + assert(lbreak==BREAK_CONTINUE); + continue; + } + } } } @@ -376,6 +424,8 @@ static void _case(Request& r, MethodPara 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; isearching.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) @@ -414,7 +464,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) { @@ -434,21 +484,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) { @@ -495,7 +549,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? @@ -506,19 +560,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, @@ -805,11 +857,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);