--- parser3/src/classes/op.C	2001/10/19 12:43:29	1.53
+++ parser3/src/classes/op.C	2001/11/19 12:17:05	1.60
@@ -2,9 +2,9 @@
 	Parser: parser @b operators.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: op.C,v 1.53 2001/10/19 12:43:29 parser Exp $
+	$Id: op.C,v 1.60 2001/11/19 12:17:05 paf Exp $
 */
 
 #include "classes.h"
@@ -53,16 +53,20 @@ static void _if(Request& r, const String
 static void _untaint(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	const String& lang_name=params->as_string(0, "lang must be string");
-	String::Untaint_lang lang=static_cast<String::Untaint_lang>(
-		untaint_lang_name2enum->get_int(lang_name));
-	if(!lang)
-		throw Exception(0, 0,
-			&lang_name,
-			"invalid untaint language");
+	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=untaint_lang_name2enum->get_int(lang_name);
+		if(!lang)
+			throw Exception(0, 0,
+				&lang_name,
+				"invalid taint language");
+	}
 
 	{
-		Value& vbody=params->as_junction(1, "body must be code");
+		Value& vbody=params->as_junction(params->size()-1, "body must be code");
 		
 		Temp_lang temp_lang(r, lang); // set temporarily specified ^untaint[language;
 		r.write_pass_lang(r.process(vbody)); // process marking tainted with that lang
@@ -72,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,
@@ -176,16 +179,16 @@ static void _for(Request& r, const Strin
 	Value& body_code=params->as_junction(3, "body must be code");
 	Value *delim_maybe_code=params->size()>4?&params->get(4):0;
 
+	if(to-from>=MAX_LOOPS) // too long loop?
+		throw Exception(0, 0,
+			&method_name,
+			"endless loop detected");
+
 	bool need_delim=false;
 	VInt *vint=new(pool) VInt(pool, 0);
-	int endless_loop_count=0;
 	for(int i=from; i<=to; i++) {
-		if(++endless_loop_count>=MAX_LOOPS) // endless loop?
-			throw Exception(0, 0,
-				&method_name,
-				"endless loop detected");
 		vint->set_int(i);
-		r.self/*root*/->put_element(var_name, vint);
+		r.root->put_element(var_name, vint);
 
 		Value& processed_body=r.process(body_code);
 		if(delim_maybe_code) { // delimiter set?
@@ -336,7 +339,7 @@ MOP::MOP(Pool& apool) : Methoded(apool),
 	add_native_method("if", Method::CT_ANY, _if, 2, 3);
 
 	// ^untaint[as-is|uri|sql|js|html|html-typo]{code}
-	add_native_method("untaint", Method::CT_ANY, _untaint, 2, 2);
+	add_native_method("untaint", Method::CT_ANY, _untaint, 1, 2);
 
 	// ^taint[as-is|uri|sql|js|html|html-typo]{code}
 	add_native_method("taint", Method::CT_ANY, _taint, 1, 2);
@@ -353,7 +356,7 @@ MOP::MOP(Pool& apool) : Methoded(apool),
 	// ^use[file]
 	add_native_method("use", Method::CT_ANY, _use, 1, 1);
 
-	// ^for[i;from-number;to-number-inclusive]{code}[delim]
+	// ^for[i](from-number;to-number-inclusive){code}[delim]
 	add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1);
 
 	// ^eval(expr)