--- parser3/src/classes/op.C	2002/06/10 14:37:35	1.96
+++ parser3/src/classes/op.C	2002/08/13 13:02:39	1.102
@@ -3,10 +3,10 @@
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: op.C,v 1.96 2002/06/10 14:37:35 paf Exp $
 */
 
+static const char* IDENT_OP_C="$Date: 2002/08/13 13:02:39 $";
+
 #include "classes.h"
 #include "pa_common.h"
 #include "pa_request.h"
@@ -100,22 +100,7 @@ static void _taint(Request& r, const Str
 }
 
 static void _process(Request& r, const String& method_name, MethodParams *params) {
-	// calculate pseudo file name of processed chars
-	// would be something like "/some/file(4) process"
-	char local_place[MAX_STRING];
-#ifndef NO_STRING_ORIGIN
-	const Origin& origin=method_name.origin();
-	size_t place_size=snprintf(local_place, MAX_STRING, "%s(%d) %s", 
-		origin.file?origin.file:"unknown_file", 1+origin.line,
-		method_name.cstr())+1;
-#else
-	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);
-	memcpy(heap_place, local_place, place_size);
-
-
+	Pool& pool=r.pool();
 	VStateless_class& self_class=*r.self->get_class();
 	const Method *main_method;
 	{
@@ -128,11 +113,32 @@ static void _process(Request& r, const S
 		
 		// evaluate source to process
 		const String& source=r.process_to_string(params->as_junction(0, "body must be code"));
+		// calculate pseudo file name of processed chars
+		// would be something like "/some/file(4) process"
+		char local_place[MAX_STRING];
+#ifndef NO_STRING_ORIGIN
+		const Origin& source_origin=source.origin();
+		const Origin& method_origin=method_name.origin();
+		size_t place_size;
+		if(source_origin.file==method_origin.file)
+			place_size=snprintf(local_place, MAX_STRING, "%s(%d) %s",  // same file
+				source_origin.file?source_origin.file:"unknown_file", 1+source_origin.line, 
+				method_name.cstr())+1;
+		else // different files ^process{external__file_text__or__sql}
+			place_size=snprintf(local_place, MAX_STRING, "%s", 
+				source_origin.file?source_origin.file:"unknown_file")+1;
+#else
+		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);
+		memcpy(heap_place, local_place, place_size);
 
 		// process source code, append processed methods to 'self' class
 		// maybe-define new @main
 		r.use_buf(
 			source.cstr(String::UL_UNSPECIFIED, r.connection(0)), 
+			*new(pool) String(pool, heap_place, place_size, true /*tainted*/),
 			heap_place, 
 			&self_class);
 		
@@ -196,7 +202,7 @@ static void _for(Request& r, const Strin
 
 	bool need_delim=false;
 	VInt *vint=new(pool) VInt(pool, 0);
-	r.root->put_element(var_name, vint);
+	r.root->put_element(var_name, vint, false);
 	for(int i=from; i<=to; i++) {
 		vint->set_int(i);
 
@@ -402,7 +408,8 @@ const String *locked_process_and_cache_p
 		false/*do_append*/,
 		false/*block*/,
 		false/*fail on lock problem*/) ? info.evaluated_body: 0;
-	if(data.expires==0)
+	time_t now=time(0);
+	if(data.expires<=now)
 		cache_delete(file_spec);
 	return result;
 }
@@ -587,13 +594,14 @@ static void _try_operator(Request& r, co
 		VHash& vhash=exception2vhash(pool, e);
 
 		Junction *junction=catch_code.get_junction();
-		Value *saved_exception_var_value=junction->root->get_element(*exception_var_name);
-		junction->root->put_element(*exception_var_name, &vhash);
+		Value *root=junction->root;
+		Value *saved_exception_var_value=root->get_element(*exception_var_name, root);
+		junction->root->put_element(*exception_var_name, &vhash, false);
 		result=r.process(catch_code);
 		bool handled=false;
 		if(Value *value=static_cast<Value *>(vhash.hash(0).get(*exception_handled_part_name)))
 			handled=value->as_bool();		
-		junction->root->put_element(*exception_var_name, saved_exception_var_value);
+		junction->root->put_element(*exception_var_name, saved_exception_var_value, false);
 
 		if(!handled)
 			throw(e); // rethrow
@@ -630,7 +638,7 @@ static void _throw_operator(Request& r,
 		const char *type=params->as_string(0, "type must be string").cstr();
 		const String& source=params->as_string(1, "source must be string");
 		const char *comment=params->size()>2?params->as_string(2, "comment must be string").cstr():0;
-		throw Exception(type, &source, "%s", comment);
+		throw Exception(type, &source, "%s", comment?comment:"");
 	}
 }
 	
@@ -705,8 +713,8 @@ void MOP::configure_user(Request& r) {
 	Pool& pool=r.pool();
 
 	// $MAIN:SQL.drivers
-	if(Value *sql=r.main_class->get_element(main_sql_name))
-		if(Value *element=sql->get_element(main_sql_drivers_name))
+	if(Value *sql=r.main_class->get_element(main_sql_name, r.main_class))
+		if(Value *element=sql->get_element(main_sql_drivers_name, sql))
 			if(Table *protocol2library=element->get_table())
 				r.classes_conf.put(name(), protocol2library);
 }