--- parser3/src/classes/op.C	2002/10/15 08:31:56	1.115
+++ 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/15 08:31:56 $";
+static const char* IDENT_OP_C="$Date: 2002/10/31 10:23:45 $";
 
 #include "classes.h"
 #include "pa_common.h"
@@ -96,26 +96,27 @@ static void _taint(Request& r, const Str
 static void _process(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	const Method *main_method;
+	Value& target_self=params->size()>1?
+		params->as_no_junction(0, "target must not be code")
+		:r.get_method_frame()->caller()->self();
 	{
-		Value& vjunction=params->as_junction(0, "body must be code");
+		Value& vjunction=params->as_junction(params->size()-1, "body must be code");
 
-		//VStateless_class& self_class=*r.get_self()->get_class();
-		//make this param. with this: as default 
-		VStateless_class *self_class=vjunction.get_junction()->self.get_class();
-		if(!self_class)
-			throw Exception(0,
+		VStateless_class *target_class=target_self.get_last_derived_class();
+		if(!target_class)
+			throw Exception("parser.runtime",
 				&method_name,
-				"has no self class");
-
+				"no target class");
+		
 		// evaluate source to process
 		const String& source=r.process_to_string(vjunction);
 
 		// 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(*target_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(*target_class, *auto_method_name, 0);
 		
 		// calculate pseudo file name of processed chars
 		// would be something like "/some/file(4) process"
@@ -140,17 +141,19 @@ static void _process(Request& r, const S
 
 		// process source code, append processed methods to 'self' class
 		// maybe-define new @main
-		r.use_buf(*self_class,
+		r.use_buf(*target_class,
 			source.cstr(String::UL_UNSPECIFIED, r.connection(0)), 
 			*new(pool) String(pool, heap_place, place_size, true /*tainted*/),
 			heap_place);
 		
 		// main_method
-		main_method=self_class->get_method(r.main_method_name);
+		main_method=target_class->get_method(r.main_method_name);
 	}
 	// after restoring current-request-lang
 	// maybe-execute @main[]
 	if(main_method) {
+		// temporarily set method_frame's self to target_self
+		Temp_method_frame_self tmfs(*r.get_method_frame(), target_self);
 		// execute!	
 		r.execute(*main_method->parser_code);
 	}
@@ -205,7 +208,7 @@ static void _for(Request& r, const Strin
 
 	bool need_delim=false;
 	VInt *vint=new(pool) VInt(pool, 0);
-	r.get_method_frame()->put_element(var_name, vint, false);
+	r.get_method_frame()->caller()->put_element(var_name, vint, false);
 	for(int i=from; i<=to; i++) {
 		vint->set_int(i);
 
@@ -583,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();
@@ -600,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);
 }
 
@@ -642,6 +650,8 @@ static void _throw_operator(Request& r,
 // constructor
 
 VClassMAIN::VClassMAIN(Pool& apool): VClass(apool) {
+	set_name(*NEW String(pool(), MAIN_CLASS_NAME));
+
 	// ^if(condition){code-when-true}
 	// ^if(condition){code-when-true}{code-when-false}
 	add_native_method("if", Method::CT_ANY, _if, 2, 3);
@@ -653,7 +663,7 @@ VClassMAIN::VClassMAIN(Pool& apool): VCl
 	add_native_method("taint", Method::CT_ANY, _taint, 1, 2);
 
 	// ^process[code]
-	add_native_method("process", Method::CT_ANY, _process, 1, 1);
+	add_native_method("process", Method::CT_ANY, _process, 1, 2);
 
 	// ^rem{code}
 	add_native_method("rem", Method::CT_ANY, _rem, 1, 10000);