--- parser3/src/classes/op.C	2003/03/19 13:16:55	1.127.2.22.2.3
+++ parser3/src/classes/op.C	2003/03/20 08:11:12	1.127.2.22.2.5
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_OP_C="$Date: 2003/03/19 13:16:55 $";
+static const char* IDENT_OP_C="$Date: 2003/03/20 08:11:12 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -97,7 +97,7 @@ static void _if(Request& r, const String
 
 static void _untaint(Request& r, const String& method_name, MethodParams* params) {
 
-	String_UL lang;
+	Untaint_lang lang;
 	if(params->count()==1)
 		lang=String::UL_AS_IS; // mark as simply 'tainted'. useful in html from sql 
 	else {
@@ -119,7 +119,7 @@ static void _untaint(Request& r, const S
 
 static void _taint(Request& r, const String& /*method_name*/, MethodParams* params) {
 
-	String_UL lang;
+	Untaint_lang lang;
 	if(params->count()==1)
 		lang=String::UL_TAINTED; // mark as simply 'tainted'. useful in table:set
 	else {
@@ -190,7 +190,7 @@ static void _process(Request& r, const S
 		// process source code, append processed methods to 'self' class
 		// maybe-define new @main
 		r.use_buf(*target_class,
-			source->cstr(pool, String::UL_UNSPECIFIED, r.connection(0)), 
+			source->cstr(String::UL_UNSPECIFIED, r.connection(0)), 
 			String* (new String(heap_place, place_size, true /*tainted*/)),
 			heap_place);
 		
@@ -279,7 +279,7 @@ static void _eval(Request& r, const Stri
 		ValuePtr fmt=params->as_no_junction(1, "fmt must not be code");
 		String string;
 		string.APPEND_CONST(
-			format(pool, value_result->as_double(), fmt->as_string(&pool)->cstr()));
+			format(value_result->as_double(), fmt->as_string(&pool)->cstr()));
 		r.write_no_lang(string);
 	} else
 		r.write_no_lang(value_result);
@@ -445,7 +445,7 @@ static void locked_process_and_cache_put
 	if(info.data->expires > time(0)) {
 		// string -serialize> buffer
 		char *data; size_t data_size;
-		info.evaluated_body->serialize(pool, 
+		info.evaluated_body->serialize(
 			sizeof(Data_string_serialized_prolog), 
 			data, data_size);
 		Data_string_serialized_prolog& prolog=
@@ -480,7 +480,7 @@ const String& locked_process_and_cache_p
 	return result;
 }
 const String& cache_getCharset& charset, const String& file_spec, time_t now) {
-	File_read_result file=file_read(pool, charset, file_spec, 
+	File_read_result file=file_read(charset, file_spec, 
 			   false/*as_text*/, 
 			   0, //no params
 			   false/*fail_on_read_problem*/);
@@ -566,7 +566,7 @@ static void _cache(Request& r, const Str
 		//          |lockSH succeeds; ...
 
 		for(int retry=0; retry<2; retry++) {
-			if(const String& cached_body=cache_get(pool, r.charsets.source(), file_spec, now)) { // have cached copy?
+			if(const String& cached_body=cache_get(r.charsets.source(), file_spec, now)) { // have cached copy?
 				// write it out 
 				r.write_assign_lang(*cached_body);
 				// happy with it
@@ -604,7 +604,7 @@ static void _cache(Request& r, const Str
 // also used in pa_request.C to pass param to @unhandled_exception
 VHashPtr exception2vhashconst Exception& e) {
 	VHashPtr result(new VHash);
-	HashStringValue& hash=result->hash(Exception::undefined_source);
+	HashStringValue& hash=result->hash(0);
 	if(const char* type=e.type(true))
 		hash.put(exception_type_part_name, ValuePtr(new VString(String* (new String(type)))));
 	if(const String& asource=e.problem_source()) {
@@ -645,7 +645,7 @@ static void _try_operator(Request& r, co
 		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
 
-		VHashPtr vhash=exception2vhash(pool, e);
+		VHashPtr vhash=exception2vhash(e);
 
 		JunctionPtr junction=catch_code->get_junction();
 		Value* method_frame=junction->method_frame;
@@ -654,7 +654,7 @@ static void _try_operator(Request& r, co
 		result=r.process(catch_code);
 		bool handled=false;
 		if(ValuePtr value=
-			vhash->hash(Exception::undefined_source).get(exception_handled_part_name))
+			vhash->hash(0).get(exception_handled_part_name))
 			handled=value->as_bool();		
 		junction->method_frame->put_element(exception_var_name, saved_exception_var_value, false);