--- parser3/src/classes/op.C	2002/10/16 07:32:51	1.121
+++ parser3/src/classes/op.C	2003/01/27 16:00:41	1.127.2.3
@@ -1,11 +1,11 @@
 /** @file
 	Parser: parser @b operators.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	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: 2003/01/27 16:00:41 $";
 
 #include "classes.h"
 #include "pa_common.h"
@@ -30,6 +30,10 @@ public:
 	VClassMAIN(Pool& apool);
 };
 
+// helpers
+
+Hash<StringPtr, int> Hash untaint_lang_name2enum;
+
 // methods
 
 static void _if(Request& r, const String&, MethodParams *params) {
@@ -102,7 +106,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 +156,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!	
@@ -251,8 +253,8 @@ struct timeval mt[2];
 	Value& body_code=params->as_junction(1, "body must be code");
 
 	Table *protocol2driver_and_client=0;
-	if(Value *sql=r.main_class.get_element(*new(pool) String(pool, MAIN_SQL_NAME), &r.main_class, false)) {
-		if(Value *element=sql->get_element(*new(pool) String(pool, MAIN_SQL_DRIVERS_NAME), sql, false)) {
+	if(Value *sql=r.main_class.get_element(*new(pool) String(pool, MAIN_SQL_NAME), r.main_class, false)) {
+		if(Value *element=sql->get_element(*new(pool) String(pool, MAIN_SQL_DRIVERS_NAME), *sql, false)) {
 			protocol2driver_and_client=element->get_table();
 		}
 	}
@@ -354,7 +356,7 @@ static void _case(Request& r, const Stri
 
 // consts
 
-const int DATA_STRING_SERIALIZED_VERSION=0x0002;
+const int DATA_STRING_SERIALIZED_VERSION=0x0003;
 
 // helper types
 
@@ -379,6 +381,10 @@ struct Locked_process_and_cache_put_acti
 	Value *body_code; const String *evaluated_body;
 };
 #endif
+/* @todo maybe network order worth spending some effort?
+	don't bothering myself with network byte order,
+	am not planning to be able to move resulting file across platforms
+*/
 static void locked_process_and_cache_put_action(int f, void *context) {
 	Locked_process_and_cache_put_action_info& info=
 		*static_cast<Locked_process_and_cache_put_action_info *>(context);
@@ -430,6 +436,7 @@ String *cache_get(Pool& pool, const Stri
 	if(file_read(pool, file_spec, 
 			   data, data_size, 
 			   false/*as_text*/, 
+			   0, 0, //no params&out_fields
 			   false/*fail_on_read_problem*/)
 	    && data_size/* ignore reads which are empty due to 
 			non-unary open+lockEX conflict with lockSH */) {
@@ -588,16 +595,19 @@ 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();
 		Value *method_frame=junction->method_frame;
-		Value *saved_exception_var_value=method_frame->get_element(*exception_var_name, method_frame, false);
+		Value *saved_exception_var_value=method_frame->get_element(*exception_var_name, *method_frame, false);
 		junction->method_frame->put_element(*exception_var_name, &vhash, false);
 		result=r.process(catch_code);
 		bool handled=false;
@@ -605,10 +615,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);
 }
 
@@ -707,5 +719,22 @@ VClassMAIN::VClassMAIN(Pool& apool): VCl
 // constructor & configurator
 
 VClass& VClassMAIN_create(Pool& pool) {
+	#define ULN(name, LANG) \
+		untaint_lang_name2enum.put(StringPtr(new String(name)), (int)String::UL_##LANG);
+	ULN("as-is", AS_IS);
+	ULN("optimized-as-is", AS_IS|String::UL_OPTIMIZE_BIT);
+	ULN("file-spec", FILE_SPEC);
+	ULN("http-header", HTTP_HEADER);
+	ULN("mail-header", MAIL_HEADER);
+	ULN("uri", URI);
+	ULN("table", TABLE);
+	ULN("sql", SQL);
+	ULN("js", JS);
+	ULN("xml", XML);
+	ULN("optimized-xml", XML|String::UL_OPTIMIZE_BIT);
+	ULN("html", HTML);
+	ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT);
+	#undef ULN
+	
 	return *new(pool) VClassMAIN(pool);
 }