--- parser3/src/include/pa_request.h 2016/10/05 18:41:54 1.232 +++ parser3/src/include/pa_request.h 2016/10/25 23:37:52 1.234 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.232 2016/10/05 18:41:54 moko Exp $" +#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.234 2016/10/25 23:37:52 moko Exp $" #include "pa_pool.h" #include "pa_hash.h" @@ -192,8 +192,9 @@ public: /// executes ops void execute(ArrayOperation& ops); // execute.C - void op_call(VMethodFrame &frame); - void op_call_write(VMethodFrame &frame); + void call(VMethodFrame &frame); + void call_expression(VMethodFrame &frame); + void call_write(VMethodFrame &frame); Value& construct(VStateless_class &class_value, const Method &method); /// execute ops with anti-recoursion check @@ -251,15 +252,6 @@ public: wcontext->write(avalue, String::L_PASS_APPENDED); } - /// appending possible string, assigning untaint language - void write_assign_lang(Value& avalue) { - wcontext->write(avalue, flang); - } - /// appending string, assigning untaint language - void write_assign_lang(const String& astring) { - wcontext->write(astring, flang); - } - /// appending sure value void write_value(Value& avalue) { wcontext->write(avalue);