--- parser3/src/classes/op.C 2016/05/11 16:41:55 1.228 +++ parser3/src/classes/op.C 2016/10/11 19:56:41 1.239 @@ -18,11 +18,7 @@ #include "pa_vclass.h" #include "pa_charset.h" -volatile const char * IDENT_OP_C="$Id: op.C,v 1.228 2016/05/11 16:41:55 moko Exp $"; - -// limits - -#define MAX_LOOPS 20000 +volatile const char * IDENT_OP_C="$Id: op.C,v 1.239 2016/10/11 19:56:41 moko Exp $"; // defines @@ -90,14 +86,14 @@ static void _if(Request& r, MethodParams do { bool condition=params.as_bool(i, "condition must be expression", r); if(condition) { - r.process_write(*params.get(i+1)); + r.process_write(params[i+1]); return; } i+=2; } while (i < max_param); if(i == max_param) - r.process_write(*params.get(i)); + r.process_write(params[i]); } String::Language get_untaint_lang(const String& lang_name){ @@ -118,7 +114,7 @@ static void _untaint(Request& r, MethodP Value& vbody=params.as_junction(params.count()-1, "body must be code"); Temp_lang temp_lang(r, lang); // set temporarily specified ^untaint[language; - StringOrValue result=r.process(vbody); // process marking tainted with that lang + Value& result=r.process(vbody); // process marking tainted with that lang r.write_assign_lang(result); } } @@ -154,22 +150,21 @@ static void _process(Request& r, MethodP if(maybe_target_self.get_string() || maybe_target_self.get_junction()) target_self=&r.get_method_frame()->caller()->self(); else { - target_self=&maybe_target_self; index++; + target_self=&maybe_target_self; + if(params.count()==1) + throw Exception(PARSER_RUNTIME, 0, "no body specified"); + index++; } { VStateless_class *target_class=target_self->get_class(); if(!target_class) - throw Exception(PARSER_RUNTIME, - 0, - "no target class"); + throw Exception(PARSER_RUNTIME, 0, "no target class"); // temporary remove language change Temp_lang temp_lang(r, String::L_PARSER_CODE); // temporary zero @main so to maybe-replace it in processed code Temp_method temp_method_main(*target_class, main_method_name, 0); - // temporary zero @auto so it wouldn't be auto-called in Request::use_buf - Temp_method temp_method_auto(*target_class, auto_method_name, 0); const String* main_alias=0; const String* file_alias=0; @@ -197,7 +192,7 @@ static void _process(Request& r, MethodP line_no_alias_offset=value->as_int(); } else if(key == "replace") { valid_options++; - allow_class_replace=r.process_to_value(*value).as_bool(); + allow_class_replace=r.process(*value).as_bool(); } } @@ -205,9 +200,7 @@ static void _process(Request& r, MethodP throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - uint processe_file_no=file_alias? - r.register_file(r.absolute(*file_alias)) - : pseudo_file_no__process; + uint processe_file_no=file_alias ? r.register_file(r.absolute(*file_alias)) : pseudo_file_no__process; // process...{string} Value& vjunction=params.as_junction(index, "body must be code"); // evaluate source to process @@ -215,11 +208,7 @@ static void _process(Request& r, MethodP Temp_class_replace class_replace(r, allow_class_replace); - r.use_buf(*target_class, - source.untaint_cstr(String::L_AS_IS, r.connection(false)), - main_alias, - processe_file_no, - line_no_alias_offset); + r.use_buf(*target_class, source.untaint_cstr(String::L_AS_IS, r.connection(false)), main_alias, processe_file_no, line_no_alias_offset); // main_method main_method=target_class->get_method(main_method_name); @@ -251,15 +240,13 @@ static void _while(Request& r, MethodPar if(delim_maybe_code){ // delimiter set bool need_delim=false; while(true) { - if(++endless_loop_count>=MAX_LOOPS) // endless loop? - throw Exception(PARSER_RUNTIME, - 0, - "endless loop detected"); + if(++endless_loop_count>=pa_loop_limit) // endless loop? + throw Exception(PARSER_RUNTIME, 0, "endless loop detected"); - if(!r.process_to_value(vcondition, false/*don't intercept string*/).as_bool()) + if(!r.process(vcondition).as_bool()) break; - StringOrValue sv_processed=r.process(body_code); + Value& 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(); @@ -276,12 +263,10 @@ static void _while(Request& r, MethodPar } } else { while(true) { - if(++endless_loop_count>=MAX_LOOPS) // endless loop? - throw Exception(PARSER_RUNTIME, - 0, - "endless loop detected"); + if(++endless_loop_count>=pa_loop_limit) // endless loop? + throw Exception(PARSER_RUNTIME, 0, "endless loop detected"); - if(!r.process_to_value(vcondition, false/*don't intercept string*/).as_bool()) + if(!r.process(vcondition).as_bool()) break; r.process_write(body_code); @@ -308,7 +293,7 @@ static void _use(Request& r, MethodParam if(key == "replace") { valid_options++; - allow_class_replace=r.process_to_value(*value).as_bool(); + allow_class_replace=r.process(*value).as_bool(); } if(valid_options!=options->count()) @@ -345,10 +330,8 @@ static void _for(Request& r, MethodParam Value& body_code=params.as_junction(3, "body must be code"); Value* delim_maybe_code=params.count()>4?¶ms[4]:0; - if(to-from>=MAX_LOOPS) // too long loop? - throw Exception(PARSER_RUNTIME, - 0, - "endless loop detected"); + if(to-from>=pa_loop_limit) // too long loop? + throw Exception(PARSER_RUNTIME, 0, "endless loop detected"); VInt* vint=new VInt(0); @@ -360,7 +343,7 @@ static void _for(Request& r, MethodParam for(int i=from; i<=to; i++) { vint->set_int(i); - StringOrValue sv_processed=r.process(body_code); + Value& 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(); @@ -391,8 +374,7 @@ static void _for(Request& r, MethodParam static void _eval(Request& r, MethodParams& params) { Value& expr=params.as_junction(0, "need expression"); // evaluate expresion - Value& value_result=r.process_to_value(expr, - false/*don't intercept string*/).as_expr_result(); + Value& value_result=r.process(expr).as_expr_result(); if(params.count()>1) { const String& fmt=params.as_string(1, "fmt must be string").trim(); if(fmt.is_empty()){ @@ -461,13 +443,13 @@ public: }; #endif static void _switch(Request& r, MethodParams& params) { - Switch_data* data=new Switch_data(r, r.process_to_value(params[0])); + Switch_data* data=new Switch_data(r, r.process(params[0])); Temp_hash_value, void*> switch_data_setter(&r.classes_conf, switch_data_name, data); 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*/); + r.process(cases_code); if(Value* selected_code=data->found? data->found: data->_default) r.write_pass_lang(r.process(*selected_code)); } @@ -494,7 +476,7 @@ static void _case(Request& r, MethodPara #endif for(int i=0; i_default=code; @@ -517,16 +499,30 @@ static void _case(Request& r, MethodPara } #ifndef DOXYGEN struct Try_catch_result { - StringOrValue processed_code; + ValueRef processed_code; const String* exception_should_be_handled; Try_catch_result(): exception_should_be_handled(0) {} }; + +/// Auto-object used for temporary changing Request::skip. +class Temp_skip { + Request& frequest; + Request::Skip saved_skip; +public: + Temp_skip(Request& arequest) : frequest(arequest), saved_skip(arequest.get_skip()) { + arequest.set_skip(Request::SKIP_NOTHING); + } + ~Temp_skip() { + if(frequest.get_skip() == Request::SKIP_NOTHING) + frequest.set_skip(saved_skip); + } +}; #endif /// used by ^try and ^cache, @returns $exception.handled[string] if any template -static Try_catch_result try_catch(Request& r, StringOrValue body_code(Request&, I), I info, Value* catch_code, bool could_be_handled_by_caller=false) { +static Try_catch_result try_catch(Request& r, Value& body_code(Request&, I), I info, Value* catch_code, bool could_be_handled_by_caller=false) { Try_catch_result result; // minor bug: context not restored if only finally code is present, see #1062 @@ -540,11 +536,15 @@ static Try_catch_result try_catch(Reques try { result.processed_code=body_code(r, info); } catch(const Exception& e) { + Request_context_saver throw_context(r); // remembering exception stack trace + Request::Exception_details details=r.get_details(e); + try_context.restore(); // restoring try-context for code after try and catch-code { Temp_value_element temp(r, *catch_code->get_junction()->method_frame, exception_var_name, &details.vhash); + Temp_skip temp_skip(r); result.processed_code=r.process(*catch_code); } @@ -561,14 +561,16 @@ static Try_catch_result try_catch(Reques bhandled=vhandled->as_bool(); } - if(!bhandled) + if(!bhandled){ + throw_context.restore(); // restoring exception stack trace creared by try_context.restore() rethrow; + } } return result; } -static StringOrValue process_try_body_code(Request& r, Value* body_code) { +static Value& process_try_body_code(Request& r, Value* body_code) { return r.process(*body_code); } @@ -608,8 +610,8 @@ 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)); +static Value& process_cache_body_code(Request& r, Value* body_code) { + return r.process(*body_code); } /* @todo maybe network order worth spending some effort? @@ -636,7 +638,7 @@ static void locked_process_and_cache_put "$" EXCEPTION_VAR_NAME "." EXCEPTION_HANDLED_PART_NAME " value must be " "either boolean or string '" CACHE_EXCEPTION_HANDLED_CACHE_NAME "'"); } else - info.processed_code=&result.processed_code.as_string(); + info.processed_code=&((Value &)result.processed_code).as_string(); // expiration time not spoiled by ^cache(0) or something? if(info.scope->expires > time(0)) { @@ -676,12 +678,14 @@ const String* locked_process_and_cache_p cache_delete(file_spec); return result; } + #ifndef DOXYGEN struct Cache_get_result { const String* body; bool expired; }; #endif + static Cache_get_result cache_get(Request_charsets& charsets, const String& file_spec, time_t now) { Cache_get_result result={0, false}; @@ -718,9 +722,11 @@ static time_t as_expires(Request& r, Met 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")); } + static void _cache(Request& r, MethodParams& params) { if(params.count()==0) { // ^cache[] -- return current expiration time @@ -804,8 +810,7 @@ static void _cache(Request& r, MethodPar Try_catch_result result=try_catch(r, process_try_body_code, &body_code, catch_code); r.write_assign_lang(result.processed_code); } else { - const String& processed_body=r.process_to_string(body_code); - r.write_assign_lang(processed_body); + r.write_assign_lang(r.process_to_string(body_code)); } } @@ -815,24 +820,34 @@ static void _try_operator(Request& r, Me Value* finally_code=(params.count()==3) ? ¶ms.as_junction(2, "finally_code must be code") : 0; Try_catch_result result; - StringOrValue finally_result; + try{ + // process try and catch code result=try_catch(r, process_try_body_code, &body_code, &catch_code); } catch(...){ - if(finally_code) - finally_result=r.process(*finally_code); + // process finally code but ignore the result + if(finally_code){ + Temp_skip temp(r); + Value &finally_result=r.process(*finally_code); + } rethrow; } - if(finally_code) - finally_result=r.process(*finally_code); + // process finally code + if(finally_code){ + Temp_skip temp(r); + Value& finally_result=r.process(*finally_code); - // write out processed body_code or catch_code - r.write_pass_lang(result.processed_code); + // no exception in try/catch or finally, writing processed body_code or catch_code + r.write_pass_lang(result.processed_code); - // write out processed finally code - if(finally_code) + // write out processed finally code r.write_pass_lang(finally_result); + } else { + // no exception in try/catch, writing processed body_code or catch_code + r.write_pass_lang(result.processed_code); + } + } static void _throw_operator(Request&, MethodParams& params) { @@ -921,7 +936,7 @@ VClassMAIN::VClassMAIN(): VClass(MAIN_CL add_native_method("continue", Method::CT_ANY, _continue, 0, 1, Method::CO_WITHOUT_FRAME); // ^for[i](from-number;to-number-inclusive){code}[delim] - add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1, Method::CO_WITHOUT_WCONTEXT); + add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1); // ^eval(expr) // ^eval(expr)[format]