--- parser3/src/classes/op.C	2008/01/28 16:01:43	1.173
+++ parser3/src/classes/op.C	2008/05/15 09:34:32	1.176
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_OP_C="$Date: 2008/01/28 16:01:43 $";
+static const char * const IDENT_OP_C="$Date: 2008/05/15 09:34:32 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -102,19 +102,22 @@ static void _if(Request& r, MethodParams
 		r.write_pass_lang(r.process(*params.get(2)));
 }
 
-static void _untaint(Request& r, MethodParams& params) {
+static String::Language get_untaint_lang(MethodParams& params, int index){
+	const String& lang_name=params.as_string(index, "lang must be string");
+	String::Language lang=untaint_lang_name2enum.get(lang_name);
+	if(!lang)
+		throw Exception(0,
+			&lang_name,
+			"invalid taint language");
+	return lang;
+}
 
+static void _untaint(Request& r, MethodParams& params) {
 	String::Language lang;
 	if(params.count()==1)
-		lang=String::L_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(lang_name);
-		if(!lang)
-			throw Exception(0,
-				&lang_name,
-				"invalid taint language");
-	}
+		lang=String::L_AS_IS; // mark as simply 'as-is'. useful in html from sql 
+	else
+		lang=get_untaint_lang(params, 0);
 
 	{
 		Value& vbody=params.as_junction(params.count()-1, "body must be code");
@@ -127,15 +130,9 @@ static void _untaint(Request& r, MethodP
 static void _taint(Request& r, MethodParams& params) {
 	String::Language lang;
 	if(params.count()==1)
-		lang=String::L_TAINTED; // mark as simply 'tainted'. useful in table:set
-	else {
-		const String& lang_name=params.as_string(0, "lang must be string");
-		lang=untaint_lang_name2enum.get(lang_name);
-		if(!lang)
-			throw Exception(0,
-				&lang_name,
-				"invalid taint language");
-	}
+		lang=String::L_TAINTED; // mark as simply 'tainted'. useful in table:create
+	else
+		lang=get_untaint_lang(params, 0);
 
 	{
 		Value& vbody=params.as_no_junction(params.count()-1, "body must not be code");
@@ -268,7 +265,8 @@ static void _while(Request& r, MethodPar
 		if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body
 			if(need_delim) // need delim & iteration produced string?
 				r.write_pass_lang(r.process(*delim_maybe_code));
-			need_delim=true;
+			else
+				need_delim=true;
 		}
 		r.write_pass_lang(sv_processed);
 
@@ -329,7 +327,8 @@ static void _for(Request& r, MethodParam
 		if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body
 			if(need_delim) // need delim & iteration produced string?
 				r.write_pass_lang(r.process(*delim_maybe_code));
-			need_delim=true;
+			else
+				need_delim=true;
 		}
 		r.write_pass_lang(sv_processed);
 
@@ -723,10 +722,10 @@ static void _cache(Request& r, MethodPar
 		Cache_get_result cached=cache_get(r.charsets, file_spec, now);
 
 		if(cached.body) { // have cached copy
-		if(cached.expired) {
-			scope.body_from_disk=cached.body; // storing for user to retrive it with ^cache[]
-		} else {
-			// and it's not expired yet write it out 
+			if(cached.expired) {
+				scope.body_from_disk=cached.body; // storing for user to retrive it with ^cache[]
+			} else {
+				// and it's not expired yet write it out 
    				r.write_assign_lang(*cached.body);
    				// happy with it
    				return;
@@ -736,15 +735,15 @@ static void _cache(Request& r, MethodPar
 		// no cached info or it's already expired
 
 		// trying to process it under lock and store result in file
-   			const String* processed_body=locked_process_and_cache_put(r, body_code, catch_code, scope, file_spec);
+		const String* processed_body=locked_process_and_cache_put(r, body_code, catch_code, scope, file_spec);
 		if(processed_body){
-   			// write it out 
-   			r.write_assign_lang(*processed_body);
-   			// happy with it
-   			return;
+			// write it out 
+			r.write_assign_lang(*processed_body);
+			// happy with it
+			return;
 		} else {
 			// we fail while get exclusive lock. nvm, we just execute body_code a bit later
-   		}
+		}
 	} else { 
 		// instructed not to cache; forget cached copy
 		cache_delete(file_spec);