--- parser3/src/classes/int.C	2001/03/10 11:03:46	1.2
+++ parser3/src/classes/int.C	2001/03/12 22:21:01	1.12
@@ -1,11 +1,16 @@
 /*
-$Id: int.C,v 1.2 2001/03/10 11:03: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.12 2001/03/12 22:21:01 paf Exp $
 */
 
 #include "pa_request.h"
 #include "_int.h"
 #include "pa_vdouble.h"
 #include "pa_vint.h"
+#include "_string.h"
 
 // global var
 
@@ -13,62 +18,41 @@ VClass *int_class;
 
 // methods
 
-static void _int(Request& r, Array *) {
+static void _int(Request& r, const String&, 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 *) {
+static void _double(Request& r, const String&, 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) {
+static void _inc(Request& r, const String&, 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;
+		(int)r.process(
+			*static_cast<Value *>(params->get(0)),
+			0/*no name*/,
+			false/*don't intercept string*/).get_double():1;
 	vint->inc(increment);
 }
 
 void initialize_int_class(Pool& pool, VClass& vclass) {
 	// ^int.int[]
-	String& INT_NAME=*new(pool) String(pool);
-	INT_NAME.APPEND_CONST("int");
+	vclass.add_native_method("int", _int, 0, 0);
 
-	Method& INT_METHOD=*new(pool) Method(pool,
-		INT_NAME,
-		0, 0, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _int
-	);
-	vclass.add_method(INT_NAME, INT_METHOD);
+	// ^int.double[]
+	vclass.add_native_method("double", _double, 0, 0);
 
-	// ^int.int[]
-	String& DOUBLE_NAME=*new(pool) String(pool);
-	DOUBLE_NAME.APPEND_CONST("int");
+	// ^int.inc[] 
+	// ^int.inc[offset]
+	vclass.add_native_method("inc", _inc, 0, 1);
 
-	Method& DOUBLE_METHOD=*new(pool) Method(pool,
-		DOUBLE_NAME,
-		0, 0, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _int
-	);
-	vclass.add_method(DOUBLE_NAME, DOUBLE_METHOD);
-
-	// ^int.inc[] ^int.inc[offset]
-	String& INC_NAME=*new(pool) String(pool);
-	INC_NAME.APPEND_CONST("inc");
-
-	Method& INC_METHOD=*new(pool) Method(pool,
-		INC_NAME,
-		0, 1, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _inc
-	);
-	vclass.add_method(INC_NAME, INC_METHOD);
+	// ^int.format[]
+	vclass.add_native_method("format", _string_format, 1, 1);
 }
-