--- parser3/src/classes/int.C	2003/11/20 16:34:23	1.52
+++ parser3/src/classes/int.C	2026/05/06 20:19:02	1.77
@@ -1,18 +1,19 @@
 /** @file
 	Parser: @b int parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
-static const char * const IDENT_INT_C="$Date: 2003/11/20 16:34:23 $";
-
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 
 #include "pa_request.h"
 #include "pa_vdouble.h"
 #include "pa_vint.h"
+#include "pa_vbool.h"
+
+volatile const char * IDENT_INT_C="$Id: int.C,v 1.77 2026/05/06 20:19:02 moko Exp $" IDENT_PA_VINT_H;
 
 // externs
 
@@ -23,44 +24,38 @@ void _string_format(Request& r, MethodPa
 class MInt: public Methoded {
 public:
 	MInt();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
 
-DECLARE_CLASS_VAR(int, new MInt, 0);
+DECLARE_CLASS_VAR(int, new MInt);
 
 // methods
 
-static void _int(Request& r, MethodParams& params) {
-	// just checking (default) syntax validity, never really using it  here, just for string.int compatibility
-	if(params.count()>0)
-		params.as_junction(0, "default must be int");
-
+static void _int(Request& r, MethodParams&) {
 	VInt& vint=GET_SELF(r, VInt);
-	r.write_no_lang(*new VInt(vint.get_int()));
+	r.write(*new VInt(vint.get_int()));
 }
 
-static void _double(Request& r, MethodParams& params) {
-	// just checking (default) syntax validity, never really using it  here, just for string.doube compatibility
-	if(params.count()>0)
-		params.as_junction(0, "default must be double");
+static void _double(Request& r, MethodParams&) {
+	VInt& vint=GET_SELF(r, VInt);
+	r.write(*new VDouble(vint.as_double()));
+}
 
+static void _bool(Request& r, MethodParams&) {
 	VInt& vint=GET_SELF(r, VInt);
-	r.write_no_lang(*new VDouble(vint.as_double()));
+	r.write(VBool::get(vint.as_bool()));
 }
 
 typedef void (*vint_op_func_ptr)(VInt& vint, double param);
 
-static void __inc(VInt& vint, double param) { vint.inc((int)param); }
-static void __dec(VInt& vint, double param) { vint.inc((int)-param); }
+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((int)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) {
+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);
@@ -72,50 +67,67 @@ static void _mul(Request& r, MethodParam
 static void _div(Request& r, MethodParams& params) { vint_op(r, params, &__div); }
 static void _mod(Request& r, MethodParams& params) { vint_op(r, params, &__mod); }
 
+static void _plus_plus(Request& r, MethodParams& params) {
+	VInt& vint=GET_SELF(r, VInt);
+	r.write(*new VInt(vint));
+	vint.inc(1);
+}
+
+static void _minus_minus(Request& r, MethodParams& params) {
+	VInt& vint=GET_SELF(r, VInt);
+	r.write(*new VInt(vint));
+	vint.inc(-1);
+}
+
 // from string.C
-extern 
-const String* sql_result_string(Request& r, MethodParams& params,
-				HashStringValue*& options, Value*& default_code);
+extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code);
+
 static void _sql(Request& r, MethodParams& params) {
-	int val;
-	HashStringValue* options;
+	pa_wint val;
 	Value* default_code=0;
-	if(const String* string=sql_result_string(r, params, options, default_code))
-		val=string->as_int();
+	if(const String* string=sql_result_string(r, params, default_code))
+		val=string->as_wint();
 	else
 		if(default_code)
-			val=r.process_to_value(*default_code).as_int();
+			val=r.process(*default_code).as_wint();
 		else {
-			throw Exception("parser.runtime",
-				0,
-				"produced no result, but no default option specified");
+			throw Exception(PARSER_RUNTIME, 0, "produced no result, but no default option specified");
 		}
-	r.write_no_lang(*new VInt(val));
+	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[]
 	// ^int.inc[offset]
 	add_native_method("inc", Method::CT_DYNAMIC, _inc, 0, 1);
-	// ^int.dec[] 
+	// ^int.dec[]
 	// ^int.dec[offset]
 	add_native_method("dec", Method::CT_DYNAMIC, _dec, 0, 1);
-	// ^int.mul[k] 
+
+	// ^int.++[]
+	add_native_method("++", Method::CT_DYNAMIC, _plus_plus, 0, 0);
+	// ^int.--[]
+	add_native_method("--", Method::CT_DYNAMIC, _minus_minus, 0, 0);
+
+	// ^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);