--- parser3/src/classes/int.C	2001/03/09 08:19:46	1.1
+++ parser3/src/classes/int.C	2001/03/11 08:28:40	1.6
@@ -1,5 +1,9 @@
 /*
-$Id: int.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: int.C,v 1.6 2001/03/11 08:28:40 paf Exp $
 */
 
 #include "pa_request.h"
@@ -17,26 +21,27 @@ static void _int(Request& r, Array *) {
 	Pool& pool=r.pool();
 	VInt *vint=static_cast<VInt *>(r.self);
 	Value& value=*new(pool) VInt(pool, vint->get_int());
-	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();
 	VInt *vint=static_cast<VInt *>(r.self);
 	Value& value=*new(pool) VDouble(pool, vint->get_double());
-	r.wcontext->write(value);
+	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
 }
 
 static void _inc(Request& r, Array *params) {
 	VInt *vint=static_cast<VInt *>(r.self);
 	int increment=params->size()?
-		static_cast<int>(static_cast<Value *>(params->get(0))->get_double()):1;
+		static_cast<int>(r.autocalc(
+			*static_cast<Value *>(params->get(0)),
+			0/*no name*/,
+			false/*don't make it string*/).get_double()):1;
 	vint->inc(increment);
 }
 
-void initialize_int_class(Pool& pool) {
-	int_class=new(pool) VClass(pool);
-
+void initialize_int_class(Pool& pool, VClass& vclass) {
 	// ^int.int[]
 	String& INT_NAME=*new(pool) String(pool);
 	INT_NAME.APPEND_CONST("int");
@@ -47,7 +52,7 @@ void initialize_int_class(Pool& pool) {
 		0/*params_names*/, 0/*locals_names*/,
 		0/*parser_code*/, _int
 	);
-	int_class->add_method(INT_NAME, INT_METHOD);
+	vclass.add_method(INT_NAME, INT_METHOD);
 
 	// ^int.int[]
 	String& DOUBLE_NAME=*new(pool) String(pool);
@@ -59,7 +64,7 @@ void initialize_int_class(Pool& pool) {
 		0/*params_names*/, 0/*locals_names*/,
 		0/*parser_code*/, _int
 	);
-	int_class->add_method(DOUBLE_NAME, DOUBLE_METHOD);
+	vclass.add_method(DOUBLE_NAME, DOUBLE_METHOD);
 
 	// ^int.inc[] ^int.inc[offset]
 	String& INC_NAME=*new(pool) String(pool);
@@ -71,6 +76,6 @@ void initialize_int_class(Pool& pool) {
 		0/*params_names*/, 0/*locals_names*/,
 		0/*parser_code*/, _inc
 	);
-	int_class->add_method(INC_NAME, INC_METHOD);
+	vclass.add_method(INC_NAME, INC_METHOD);
 }