--- parser3/src/classes/op.C 2016/10/04 22:05:28 1.237 +++ parser3/src/classes/op.C 2016/10/11 21:30:16 1.240 @@ -18,7 +18,7 @@ #include "pa_vclass.h" #include "pa_charset.h" -volatile const char * IDENT_OP_C="$Id: op.C,v 1.237 2016/10/04 22:05:28 moko Exp $"; +volatile const char * IDENT_OP_C="$Id: op.C,v 1.240 2016/10/11 21:30:16 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){ @@ -218,7 +218,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()); } } @@ -936,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]