--- parser3/src/classes/int.C	2001/03/10 11:03:46	1.2
+++ parser3/src/classes/int.C	2026/04/25 13:38:46	1.76
@@ -1,74 +1,120 @@
-/*
-$Id: int.C,v 1.2 2001/03/10 11:03:46 paf Exp $
+/** @file
+	Parser: @b int parser class.
+
+	Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
+#include "classes.h"
+#include "pa_vmethod_frame.h"
+
 #include "pa_request.h"
-#include "_int.h"
 #include "pa_vdouble.h"
 #include "pa_vint.h"
+#include "pa_vbool.h"
+
+volatile const char * IDENT_INT_C="$Id: int.C,v 1.76 2026/04/25 13:38:46 moko Exp $" IDENT_PA_VINT_H;
+
+// externs
+
+void _string_format(Request& r, MethodParams&);
+
+// class
+
+class MInt: public Methoded {
+public:
+	MInt();
+};
 
-// global var
+// global variable
 
-VClass *int_class;
+DECLARE_CLASS_VAR(int, new MInt);
 
 // methods
 
-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);
+static void _int(Request& r, MethodParams&) {
+	VInt& vint=GET_SELF(r, VInt);
+	r.write(*new VInt(vint.get_int()));
 }
 
-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);
+static void _double(Request& r, MethodParams&) {
+	VInt& vint=GET_SELF(r, VInt);
+	r.write(*new VDouble(vint.as_double()));
 }
 
-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;
-	vint->inc(increment);
+static void _bool(Request& r, MethodParams&) {
+	VInt& vint=GET_SELF(r, VInt);
+	r.write(VBool::get(vint.as_bool()));
 }
 
-void initialize_int_class(Pool& pool, VClass& vclass) {
-	// ^int.int[]
-	String& INT_NAME=*new(pool) String(pool);
-	INT_NAME.APPEND_CONST("int");
-
-	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);
+typedef void (*vint_op_func_ptr)(VInt& vint, double param);
 
-	// ^int.int[]
-	String& DOUBLE_NAME=*new(pool) String(pool);
-	DOUBLE_NAME.APPEND_CONST("int");
+static void __inc(VInt& vint, double param) { vint.inc(param); }
+static void __dec(VInt& vint, double param) { vint.inc(-param); }
+static void __mul(VInt& vint, double param) { vint.mul(param); }
+static void __div(VInt& vint, double param) { vint.div(param); }
+static void __mod(VInt& vint, double param) { vint.mod(clip2wint(param)); }
+
+static void vint_op(Request& r, MethodParams& params, vint_op_func_ptr func) {
+	VInt& vint=GET_SELF(r, VInt);
+	double param=params.count()?params.as_double(0, "param must be numerical", r):1;
+	(*func)(vint, param);
+}
 
-	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);
+static void _inc(Request& r, MethodParams& params) { vint_op(r, params, &__inc); }
+static void _dec(Request& r, MethodParams& params) { vint_op(r, params, &__dec); }
+static void _mul(Request& r, MethodParams& params) { vint_op(r, params, &__mul); }
+static void _div(Request& r, MethodParams& params) { vint_op(r, params, &__div); }
+static void _mod(Request& r, MethodParams& params) { vint_op(r, params, &__mod); }
+
+// from string.C
+extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code);
+
+static void _sql(Request& r, MethodParams& params) {
+	pa_wint val;
+	Value* default_code=0;
+	if(const String* string=sql_result_string(r, params, default_code))
+		val=string->as_wint();
+	else
+		if(default_code)
+			val=r.process(*default_code).as_wint();
+		else {
+			throw Exception(PARSER_RUNTIME, 0, "produced no result, but no default option specified");
+		}
+	r.write(*new VInt(val));
 }
 
+// constructor
+
+MInt::MInt(): Methoded("int") {
+	// ^int.int[]
+	// ^int.int[default for ^string.int compatibility]
+	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);
+	// ^int.double[]
+	// ^int.double[default for ^string.double compatibility]
+	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1);
+	// ^int.bool[]
+	// ^int.bool[default for ^string.bool compatibility]
+	add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);
+
+	// ^int.inc[] 
+	// ^int.inc[offset]
+	add_native_method("inc", Method::CT_DYNAMIC, _inc, 0, 1);
+	// ^int.dec[] 
+	// ^int.dec[offset]
+	add_native_method("dec", Method::CT_DYNAMIC, _dec, 0, 1);
+	// ^int.mul[k] 
+	add_native_method("mul", Method::CT_DYNAMIC, _mul, 1, 1);
+	// ^int.div[d]
+	add_native_method("div", Method::CT_DYNAMIC, _div, 1, 1);
+	// ^int.mod[offset]
+	add_native_method("mod", Method::CT_DYNAMIC, _mod, 1, 1);
+
+
+	// ^int.format{format}
+	add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
+
+	// ^sql[query]
+	// ^sql[query][$.limit(1) $.offset(2) $.default(0)]
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
+}