--- parser3/src/classes/op.C	2002/09/17 16:16:16	1.109
+++ parser3/src/classes/op.C	2002/10/14 13:53:20	1.112
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_OP_C="$Date: 2002/09/17 16:16:16 $";
+static const char* IDENT_OP_C="$Date: 2002/10/14 13:53:20 $";
 
 #include "classes.h"
 #include "pa_common.h"
@@ -102,17 +102,15 @@ static void _taint(Request& r, const Str
 
 static void _process(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VStateless_class *self_class=r.self->get_class();
-	if(!self_class)
-		self_class=new(pool) VStateless_class(pool); // methods storage in case of self abscence
+	VStateless_class& self_class=*r.get_self()->get_class();
 	const Method *main_method;
 	{
 		// temporary remove language change
 		Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
 		// temporary zero @main so to maybe-replace it in processed code
-		Temp_method temp_method_main(*self_class, r.main_method_name, 0);
+		Temp_method temp_method_main(self_class, r.main_method_name, 0);
 		// temporary zero @auto so it wouldn't be auto-called in Request::use_buf
-		Temp_method temp_method_auto(*self_class, *auto_method_name, 0);
+		Temp_method temp_method_auto(self_class, *auto_method_name, 0);
 		
 		// evaluate source to process
 		const String& source=r.process_to_string(params->as_junction(0, "body must be code"));
@@ -143,10 +141,10 @@ static void _process(Request& r, const S
 			source.cstr(String::UL_UNSPECIFIED, r.connection(0)), 
 			*new(pool) String(pool, heap_place, place_size, true /*tainted*/),
 			heap_place, 
-			self_class);
+			&self_class);
 		
 		// main_method
-		main_method=self_class->get_method(r.main_method_name);
+		main_method=self_class.get_method(r.main_method_name);
 	}
 	// after restoring current-request-lang
 	// maybe-execute @main[]
@@ -205,7 +203,7 @@ static void _for(Request& r, const Strin
 
 	bool need_delim=false;
 	VInt *vint=new(pool) VInt(pool, 0);
-	r.method_frame->put_element(var_name, vint, false);
+	r.get_method_frame()->put_element(var_name, vint, false);
 	for(int i=from; i<=to; i++) {
 		vint->set_int(i);
 
@@ -579,23 +577,11 @@ static void _try_operator(Request& r, co
 	Value& catch_code=params->as_junction(1, "catch_code must be code");
 
 	StringOrValue result;
-
-	// taking snapshot of request processing status
-	//int ssexception_trace=r.exception_trace.top_index();
-	int sstack=r.stack.top_index();
-	Value *sself=r.self;
-	VMethodFrame *smethod_frame=r.method_frame;
-	Value *srcontext=r.rcontext;  
-	WContext *swcontext=r.wcontext;	
 	try {
+		Request_context_saver context_saved(r); // taking snapshot of request processing status, restoring it at }
 		result=r.process(body_code);
+		context_saved.restore(); // manually restoring context
 	} catch(const Exception& e) {
-		// restoring request processing status
-		//r.exception_trace.top_index(ssexception_trace);
-		r.stack.top_index(sstack);
-		r.self=sself; r.method_frame=smethod_frame, r.rcontext=srcontext; r.wcontext=swcontext;
-		
-		
 		VHash& vhash=exception2vhash(pool, e);
 
 		Junction *junction=catch_code.get_junction();