--- parser3/src/include/pa_request.h 2016/11/01 22:39:00 1.237 +++ parser3/src/include/pa_request.h 2016/11/03 16:17:37 1.239 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.237 2016/11/01 22:39:00 moko Exp $" +#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.239 2016/11/03 16:17:37 moko Exp $" #include "pa_pool.h" #include "pa_hash.h" @@ -192,9 +192,33 @@ public: /// executes ops void execute(ArrayOperation& ops); // execute.C - void call(VMethodFrame &frame); - void call_expression(VMethodFrame &frame); - void call_write(VMethodFrame &frame); + + template void call(Frame& frame){ + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; + + rcontext=wcontext=method_frame=&frame; + + frame.call(*this); + + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; + } + + template void call_write(Frame& frame){ + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + + rcontext=method_frame=&frame; + + frame.call(*this); + + rcontext=saved_rcontext; + method_frame=saved_method_frame; + } + Value& construct(VStateless_class &class_value, const Method &method); /// execute ops with anti-recoursion check @@ -230,26 +254,19 @@ public: const String* get_method_filename(const Method* method); // execute.C const String* get_used_filename(uint file_no); - /// appending, sure of clean string inside - void write_no_lang(const String& astring) { + /// appending string with it's languages + inline void write(const String& astring) { wcontext->write(astring); } - /// appending sure value, that would be converted to clean string - void write_no_lang(Value& avalue) { - wcontext->write_as_string(avalue); - } - - /// appending string, passing language built into string being written - void write_pass_lang(const String& astring) { - wcontext->write(astring); - } - /// appending possible string, passing language built into string being written - void write_pass_lang(Value& avalue) { + + /// in [] and {} appending string if get_string is not null, else appending value + /// in () allways appending value + inline void write(Value& avalue) { wcontext->write_as_string(avalue); } - /// appending sure value - void write_value(Value& avalue) { + /// allways appending value + inline void write_value(Value& avalue) { wcontext->write(avalue); } @@ -321,9 +338,6 @@ public: // status read methods /// for @main[] const String* execute_virtual_method(Value& aself, const String& method_name); - /// executes parser method, use op_call(frame) to execute native method - void execute_method(VMethodFrame& aframe); - //{ for @conf[filespec] and @auto[filespec] and parser://method/call const String* execute_method(Value& aself, const Method& method, Value* optional_param, bool do_return_string);