--- parser3/src/classes/op.C	2001/11/14 09:30:08	1.59
+++ parser3/src/classes/op.C	2001/11/22 12:40:48	1.62
@@ -4,7 +4,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: op.C,v 1.59 2001/11/14 09:30:08 paf Exp $
+	$Id: op.C,v 1.62 2001/11/22 12:40:48 paf Exp $
 */
 
 #include "classes.h"
@@ -53,13 +53,12 @@ static void _if(Request& r, const String
 static void _untaint(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	String::Untaint_lang lang;
+	uchar lang;
 	if(params->size()==1)
 		lang=String::UL_AS_IS; // mark as simply 'tainted'. useful in html from sql 
 	else {
 		const String& lang_name=params->as_string(0, "lang must be string");
-		lang=static_cast<String::Untaint_lang>(
-			untaint_lang_name2enum->get_int(lang_name));
+		lang=untaint_lang_name2enum->get_int(lang_name);
 		if(!lang)
 			throw Exception(0, 0,
 				&lang_name,
@@ -77,13 +76,12 @@ static void _untaint(Request& r, const S
 static void _taint(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	String::Untaint_lang lang;
+	uchar lang;
 	if(params->size()==1)
 		lang=String::UL_TAINTED; // mark as simply 'tainted'. useful in table:set
 	else {
 		const String& lang_name=params->as_string(0, "lang must be string");
-		lang=static_cast<String::Untaint_lang>(
-			untaint_lang_name2enum->get_int(lang_name));
+		lang=untaint_lang_name2enum->get_int(lang_name);
 		if(!lang)
 			throw Exception(0, 0,
 				&lang_name,
@@ -123,11 +121,11 @@ static void _process(Request& r, const S
 		
 		// evaluate source to process
 		const String& source=
-			r.process(params->as_no_junction(0, "body must be string")).as_string();
+			r.process(params->as_junction(0, "body must be code")).as_string();
 
 		// process source code, append processed methods to 'self' class
 		// maybe-define new @main
-		r.use_buf(source.cstr(), place, &self_class);
+		r.use_buf(source.cstr(String::UL_UNSPECIFIED, r.connection), place, &self_class);
 		
 		// maybe-execute @main[]
 		if(const Method *method=self_class.get_method(*main_method_name)) {