--- parser3/src/classes/op.C	2002/10/16 08:22:13	1.122
+++ parser3/src/classes/op.C	2003/03/17 14:48:04	1.127.4.1
@@ -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 08:22:13 $";
+static const char* IDENT_OP_C="$Date: 2003/03/17 14:48:04 $";
 
 #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,
@@ -136,7 +136,7 @@ static void _process(Request& r, const S
 		strncpy(local_place, method_name.cstr(), MAX_STRING-1); place[MAX_STRING-1]=0;
 		size_t place_size=strlen(local_place)+1;
 #endif
-		char *heap_place=(char *)r.malloc(place_size);
+		char *heap_place=(char *)r.malloc_atomic(place_size);
 		memcpy(heap_place, local_place, place_size);
 
 		// process source code, append processed methods to 'self' class
@@ -249,8 +249,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();
 		}
 	}
@@ -428,6 +428,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 */) {
@@ -568,7 +569,7 @@ VHash& exception2vhash(Pool& pool, const
 	}
 	if(const char *ecomment=e.comment(true)) {
 		int comment_size=strlen(ecomment);
-		char *pcomment=(char *)pool.malloc(comment_size);
+		char *pcomment=(char *)pool.malloc_atomic(comment_size);
 		memcpy(pcomment, ecomment, comment_size);
 		hash.put(*exception_comment_part_name, 
 			new(pool) VString(*new(pool) String(pool, pcomment, comment_size, true/*tainted*/)));
@@ -586,16 +587,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;
@@ -603,10 +607,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);
 }
 
@@ -641,6 +647,10 @@ static void _throw_operator(Request& r,
 		throw Exception(type, &source, "%s", comment?comment:"");
 	}
 }
+
+static void _gc_operator(Request& r, const String& method_name, MethodParams *params) {
+	r.pool().collect_garbage();
+}
 	
 // constructor
 
@@ -700,6 +710,7 @@ VClassMAIN::VClassMAIN(Pool& apool): VCl
 	// ^throw[type;source;comment]
 	add_native_method("throw", Method::CT_ANY, _throw_operator, 1, 3);
 
+	add_native_method("gc", Method::CT_ANY, _gc_operator, 0, 0);
 }
 
 // constructor & configurator