--- parser3/src/classes/op.C 2016/10/03 20:34:48 1.235 +++ parser3/src/classes/op.C 2016/10/25 23:37:52 1.241 @@ -18,7 +18,7 @@ #include "pa_vclass.h" #include "pa_charset.h" -volatile const char * IDENT_OP_C="$Id: op.C,v 1.235 2016/10/03 20:34:48 moko Exp $"; +volatile const char * IDENT_OP_C="$Id: op.C,v 1.241 2016/10/25 23:37:52 moko Exp $"; // defines @@ -86,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){ @@ -106,17 +106,19 @@ String::Language get_untaint_lang(const static void _untaint(Request& r, MethodParams& params) { String::Language lang; if(params.count()==1) - lang=String::L_AS_IS; // mark as simply 'as-is'. useful in html from sql + lang=String::L_AS_IS; // mark as simply 'as-is'. useful in html from sql else lang=get_untaint_lang(params.as_string(0, "lang must be string")); - { - Value& vbody=params.as_junction(params.count()-1, "body must be code"); - - Temp_lang temp_lang(r, lang); // set temporarily specified ^untaint[language; - Value& result=r.process(vbody); // process marking tainted with that lang - r.write_assign_lang(result); - } + Value& vbody=params.as_junction(params.count()-1, "body must be code"); + Value& result=r.process(vbody); + + if(const String* string=result.get_string()){ + String &untainted=*new String(); + string->append_to(untainted, lang); // mark all tainted to specified language + r.write_pass_lang(untainted); + } else + r.write_pass_lang(result); // this is not normal, just backward compatibility } static void _taint(Request& r, MethodParams& params) { @@ -130,7 +132,7 @@ static void _taint(Request& r, MethodPar Value& vbody=params.as_no_junction(params.count()-1, "body must not be code"); String result(vbody.as_string(), lang); // force result language to specified - r.write_assign_lang(result); + r.write_pass_lang(result); } } @@ -161,8 +163,6 @@ static void _process(Request& r, MethodP if(!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); @@ -192,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(); } } @@ -203,12 +203,14 @@ static void _process(Request& r, MethodP 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"); + // temporary remove language change + Temp_lang temp_lang(r, String::L_PARSER_CODE); // evaluate source to process const String& source=r.process_to_string(vjunction); 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_PARSER_CODE, r.connection(false)), main_alias, processe_file_no, line_no_alias_offset); // main_method main_method=target_class->get_method(main_method_name); @@ -218,7 +220,7 @@ static void _process(Request& r, MethodP if(main_method) { VMethodFrame frame(*main_method, r.get_method_frame()->caller(), *target_self); frame.empty_params(); - r.op_call(frame); + r.call(frame); r.write_pass_lang(frame.result()); } } @@ -243,7 +245,7 @@ static void _while(Request& r, MethodPar 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; Value& sv_processed=r.process(body_code); @@ -266,7 +268,7 @@ static void _while(Request& r, MethodPar 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); @@ -293,7 +295,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()) @@ -374,8 +376,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()){ @@ -444,13 +445,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)); } @@ -477,7 +478,7 @@ static void _case(Request& r, MethodPara #endif for(int i=0; i_default=code; @@ -783,7 +784,7 @@ static void _cache(Request& r, MethodPar scope.body_from_disk=cached.body; // storing for user to retrive it with ^cache[] } else { // and it's not expired yet write it out - r.write_assign_lang(*cached.body); + r.write_pass_lang(*cached.body); // happy with it return; } @@ -795,7 +796,7 @@ static void _cache(Request& r, MethodPar const String* processed_body=locked_process_and_cache_put(r, body_code, catch_code, scope, file_spec); if(processed_body){ // write it out - r.write_assign_lang(*processed_body); + r.write_pass_lang(*processed_body); // happy with it return; } else { @@ -809,9 +810,9 @@ static void _cache(Request& r, MethodPar // process without caching if(catch_code){ Try_catch_result result=try_catch(r, process_try_body_code, &body_code, catch_code); - r.write_assign_lang(result.processed_code); + r.write_pass_lang(result.processed_code); } else { - r.write_assign_lang(r.process_to_string(body_code)); + r.write_pass_lang(r.process_to_string(body_code)); } } @@ -937,7 +938,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]