--- parser3/src/include/pa_request.h 2003/11/19 11:00:33 1.170 +++ parser3/src/include/pa_request.h 2003/11/28 09:24:52 1.173 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char* IDENT_REQUEST_H="$Date: 2003/11/19 11:00:33 $"; +static const char * const IDENT_REQUEST_H="$Date: 2003/11/28 09:24:52 $"; #include "pa_pool.h" #include "pa_hash.h" @@ -334,6 +334,25 @@ public: // status read methods } */ + /// for @main[] + const String* execute_virtual_method(Value& aself, const String& method_name); + + /// for @postprocess[body] + StringOrValue execute_method(VMethodFrame& amethodFrame, const Method& method); + //{ for @conf[filespec] and @auto[filespec] and parser://method/call + const String* execute_method(Value& aself, + const Method& method, VString* optional_param, + bool do_return_string); + struct Execute_nonvirtual_method_result { + const String* string; + Method* method; + Execute_nonvirtual_method_result(): string(0), method(0) {} + }; + Execute_nonvirtual_method_result execute_nonvirtual_method(VStateless_class& aclass, + const String& method_name, VString* optional_param, + bool do_return_string); + //} + #ifdef XML public: // charset helpers @@ -363,24 +382,6 @@ private: // compile.C private: // execute.C - /// for @postprocess[body] - StringOrValue execute_method(VMethodFrame& amethodFrame, const Method& method); - //{ for @conf[filespec] and @auto[filespec] - const String* execute_method(Value& aself, - const Method& method, VString* optional_param, - bool do_return_string); - struct Execute_nonvirtual_method_result { - const String* string; - Method* method; - Execute_nonvirtual_method_result(): string(0), method(0) {} - }; - Execute_nonvirtual_method_result execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, VString* optional_param, - bool do_return_string); - //} - /// for @main[] - const String* execute_virtual_method(Value& aself, const String& method_name); - Value& get_element(Value& ncontext, const String& name, bool can_call_operator); private: // defaults @@ -440,6 +441,7 @@ class Request_context_saver { public: Request_context_saver(Request& ar) : + fr(ar), exception_trace_top(ar.exception_trace.top_index()), exception_trace_bottom(ar.exception_trace.bottom_index()), stack(ar.stack.top_index()), @@ -448,8 +450,7 @@ public: rcontext(ar.rcontext), wcontext(ar.wcontext), flang(ar.flang), - fconnection(ar.fconnection), - fr(ar) {} + fconnection(ar.fconnection) {} void restore() { fr.exception_trace.set_top_index(exception_trace_top); fr.exception_trace.set_bottom_index(exception_trace_bottom);