--- parser3/src/classes/op.C	2009/07/07 12:16:13	1.192
+++ parser3/src/classes/op.C	2009/07/15 12:59:19	1.195
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_OP_C="$Date: 2009/07/07 12:16:13 $";
+static const char * const IDENT_OP_C="$Date: 2009/07/15 12:59:19 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -88,6 +88,7 @@ public:
 		ULN("html", HTML);
 		ULN("optimized-html", HTML|String::L_OPTIMIZE_BIT);
 		ULN("regex", REGEX);
+		ULN("parser-code", PARSER_CODE);
 		#undef ULN
 	}
 } untaint_lang_name2enum;
@@ -172,7 +173,7 @@ static void _process(Request& r, MethodP
 		size_t options_index=index+1;
 		HashStringValue* options=0;
 		if(options_index<params.count()) {
-			Value& voptions=params.as_no_junction(options_index, "options must not be code");
+			Value& voptions=params.as_no_junction(options_index, OPTIONS_MUST_NOT_BE_CODE);
 			options=voptions.get_hash();
 			if(!options)
 				throw Exception(PARSER_RUNTIME,
@@ -896,11 +897,11 @@ VClassMAIN::VClassMAIN(): VClass() {
 	// ^if(condition){code-when-true}{code-when-false}
 	add_native_method("if", Method::CT_ANY, _if, 2, 3, Method::CO_WITHOUT_FRAME);
 
-	// ^untaint[as-is|uri|sql|js|html|html-typo|regex]{code}
-	add_native_method("untaint", Method::CT_ANY, _untaint, 1, 2);
+	// ^untaint[as-is|uri|sql|js|html|html-typo|regex|parser-code]{code}
+	add_native_method("untaint", Method::CT_ANY, _untaint, 1, 2, Method::CO_WITHOUT_FRAME);
 
-	// ^taint[as-is|uri|sql|js|html|html-typo|regex]{code}
-	add_native_method("taint", Method::CT_ANY, _taint, 1, 2);
+	// ^taint[as-is|uri|sql|js|html|html-typo|regex|parser-code]{code}
+	add_native_method("taint", Method::CT_ANY, _taint, 1, 2, Method::CO_WITHOUT_FRAME);
 
 	// ^process[code]
 	add_native_method("process", Method::CT_ANY, _process, 1, 3);