--- parser3/src/classes/op.C	2002/10/16 07:32:51	1.121
+++ parser3/src/classes/op.C	2002/10/31 10:23:45	1.124
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_OP_C="$Date: 2002/10/16 07:32:51 $";
+static const char* IDENT_OP_C="$Date: 2002/10/31 10:23:45 $";
 
 #include "classes.h"
 #include "pa_common.h"
@@ -102,7 +102,7 @@ static void _process(Request& r, const S
 	{
 		Value& vjunction=params->as_junction(params->size()-1, "body must be code");
 
-		VStateless_class *target_class=target_self.get_class();
+		VStateless_class *target_class=target_self.get_last_derived_class();
 		if(!target_class)
 			throw Exception("parser.runtime",
 				&method_name,
@@ -152,8 +152,6 @@ static void _process(Request& r, const S
 	// after restoring current-request-lang
 	// maybe-execute @main[]
 	if(main_method) {
-		// temporarily set request's self to target_self
-		Temp_request_self trs(r, target_self);
 		// temporarily set method_frame's self to target_self
 		Temp_method_frame_self tmfs(*r.get_method_frame(), target_self);
 		// execute!	
@@ -588,11 +586,14 @@ static void _try_operator(Request& r, co
 	Value& catch_code=params->as_junction(1, "catch_code must be code");
 
 	StringOrValue result;
+	// taking snapshot of try-context
+	Request_context_saver try_context(r);
 	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) {
+		Request_context_saver throw_context(r); // taking snapshot of throw-context [stack trace contains error]
+		try_context.restore(); // restoring try-context to perform catch-code
+
 		VHash& vhash=exception2vhash(pool, e);
 
 		Junction *junction=catch_code.get_junction();
@@ -605,10 +606,12 @@ static void _try_operator(Request& r, co
 			handled=value->as_bool();		
 		junction->method_frame->put_element(*exception_var_name, saved_exception_var_value, false);
 
-		if(!handled)
+		if(!handled) {
+			throw_context.restore(); // restoring throw-context [exception were not handled]
 			throw(e); // rethrow
+		}
 	}
-	// write it out 
+	// write out result
 	r.write_pass_lang(result);
 }