--- parser3/src/classes/Attic/root.C	2001/03/08 13:42:30	1.2
+++ parser3/src/classes/Attic/root.C	2001/03/11 12:10:42	1.16
@@ -1,31 +1,49 @@
 /*
-$Id: root.C,v 1.2 2001/03/08 13:42:30 paf Exp $
+	Parser
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: root.C,v 1.16 2001/03/11 12:10:42 paf Exp $
 */
 
 #include "pa_request.h"
+#include "_root.h"
 
-static void _if(Request& r, Array& params) {
+static void _if(Request& r, Array *params) {
 	bool condition=
 		r.autocalc(
-			*static_cast<Value *>(params.get(0)), 
-			false/*don't make it string*/).get_bool();
-	Value& value=r.autocalc(
-		*static_cast<Value *>(params.get(condition?1:2)), 
-		true/*make it string*/);
-	r.write(value);
+			*static_cast<Value *>(params->get(0)), 
+			0/*no name*/,
+			false/*don't intercept string*/).get_bool();
+	if(condition) {
+		Value& value=r.autocalc(*static_cast<Value *>(params->get(1)));
+		r.wcontext->write(value, String::Untaint_lang::PASS_APPENDED);
+	} else if(params->size()==3) {
+		Value& value=r.autocalc(*static_cast<Value *>(params->get(2)));
+		r.wcontext->write(value, String::Untaint_lang::PASS_APPENDED);
+	}
+}
+
+static void _untaint(Request& r, Array *params) {
+	const String& lang_name=r.autocalc(*static_cast<Value *>(params->get(0))).as_string();
+	String::Untaint_lang lang=static_cast<String::Untaint_lang>(
+		untaint_lang_name_to_enum->get_int(lang_name));
+	if(!lang)
+		R_THROW(0, 0,
+			&lang_name,
+			"invalid language");
+
+	Temp_lang temp_lang(r, lang);
+	Value& value=r.autocalc(*static_cast<Value *>(params->get(1)));
+	r.wcontext->write(value, String::Untaint_lang::PASS_APPENDED);
 }
+	
 
-void construct_root_class(Request& request) {
-	Pool& pool=request.pool();
-	String& IF_NAME=*new(pool) String(pool);
-	IF_NAME.APPEND_CONST("if");
-
-	Method& IF_METHOD=*new(pool) Method(pool,
-		IF_NAME,
-		3/*numbered_params_count*/,
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _if
-	);
+void initialize_root_class(Pool& pool, VClass& vclass) {
+	// ^if(condition){code-when-true}
+	// ^if(condition){code-when-true}{code-when-false}
+	vclass.add_native_method("if", _if, 2, 3);
 
-	request.root_class.add_method(IF_NAME, IF_METHOD);
+	// ^untaint[as-is|sql|js|html|html-typo]{code}
+	vclass.add_native_method("untaint", _untaint, 2, 2);
 }