--- parser3/src/classes/string.C	2001/03/09 08:19:46	1.1
+++ parser3/src/classes/string.C	2001/03/11 08:16:31	1.5
@@ -1,5 +1,9 @@
 /*
-$Id: string.C,v 1.1 2001/03/09 08:19:46 paf Exp $
+	Parser
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: string.C,v 1.5 2001/03/11 08:16:31 paf Exp $
 */
 
 #include "pa_request.h"
@@ -16,24 +20,22 @@ VClass *string_class;
 static void _length(Request& r, Array *) {
 	Pool& pool=r.pool();
 	Value& value=*new(pool) VDouble(pool, r.self->as_string().size());
-	r.wcontext->write(value);
+	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
 }
 
 static void _int(Request& r, Array *) {
 	Pool& pool=r.pool();
 	Value& value=*new(pool) VInt(pool, static_cast<int>(r.self->get_double()));
-	r.wcontext->write(value);
+	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
 }
 
 static void _double(Request& r, Array *) {
 	Pool& pool=r.pool();
 	Value& value=*new(pool) VDouble(pool, r.self->get_double());
-	r.wcontext->write(value);
+	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
 }
 
-void initialize_string_class(Pool& pool) {
-	string_class=new(pool) VClass(pool);
-
+void initialize_string_class(Pool& pool, VClass& vclass) {
 	// ^string.length[]
 	String& LENGTH_NAME=*new(pool) String(pool);
 	LENGTH_NAME.APPEND_CONST("length");
@@ -44,7 +46,7 @@ void initialize_string_class(Pool& pool)
 		0/*params_names*/, 0/*locals_names*/,
 		0/*parser_code*/, _length
 	);
-	string_class->add_method(LENGTH_NAME, LENGTH_METHOD);
+	vclass.add_method(LENGTH_NAME, LENGTH_METHOD);
 
 	// ^string.int[]
 	String& INT_NAME=*new(pool) String(pool);
@@ -56,7 +58,7 @@ void initialize_string_class(Pool& pool)
 		0/*params_names*/, 0/*locals_names*/,
 		0/*parser_code*/, _int
 	);
-	string_class->add_method(INT_NAME, INT_METHOD);
+	vclass.add_method(INT_NAME, INT_METHOD);
 
 	// ^string.double[]
 	String& DOUBLE_NAME=*new(pool) String(pool);
@@ -68,6 +70,6 @@ void initialize_string_class(Pool& pool)
 		0/*params_names*/, 0/*locals_names*/,
 		0/*parser_code*/, _double
 	);
-	string_class->add_method(DOUBLE_NAME, DOUBLE_METHOD);
-}
+	vclass.add_method(DOUBLE_NAME, DOUBLE_METHOD);
+}