--- parser3/src/classes/int.C	2012/03/16 09:24:07	1.60
+++ parser3/src/classes/int.C	2023/09/26 20:49:06	1.71
@@ -1,8 +1,8 @@
 /** @file
 	Parser: @b int parser class.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #include "classes.h"
@@ -13,7 +13,7 @@
 #include "pa_vint.h"
 #include "pa_vbool.h"
 
-volatile const char * IDENT_INT_C="$Id: int.C,v 1.60 2012/03/16 09:24:07 moko Exp $" IDENT_PA_VINT_H;
+volatile const char * IDENT_INT_C="$Id: int.C,v 1.71 2023/09/26 20:49:06 moko Exp $" IDENT_PA_VINT_H;
 
 // externs
 
@@ -28,35 +28,23 @@ public:
 
 // 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_int(0, "default must be int", r);
-
+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.double compatibility
-	if(params.count()>0)
-		params.as_double(0, "default must be double", r);
-
+static void _double(Request& r, MethodParams&) {
 	VInt& vint=GET_SELF(r, VInt);
-	r.write_no_lang(*new VDouble(vint.as_double()));
+	r.write(*new VDouble(vint.as_double()));
 }
 
-static void _bool(Request& r, MethodParams& params) {
-	// just checking (default) syntax validity, never really using it here, just for string.bool compatibility
-	if(params.count()>0)
-		params.as_bool(0, "default must be bool", r);
-
+static void _bool(Request& r, MethodParams&) {
 	VInt& vint=GET_SELF(r, VInt);
-	r.write_no_lang(VBool::get(vint.as_bool()));
+	r.write(VBool::get(vint.as_bool()));
 }
 
 typedef void (*vint_op_func_ptr)(VInt& vint, double param);
@@ -67,8 +55,7 @@ static void __mul(VInt& vint, double par
 static void __div(VInt& vint, double param) { vint.div(param); }
 static void __mod(VInt& vint, double param) { vint.mod((int)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);
@@ -81,36 +68,33 @@ static void _div(Request& r, MethodParam
 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,
-				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;
 	Value* default_code=0;
-	if(const String* string=sql_result_string(r, params, options, default_code))
+	if(const String* string=sql_result_string(r, params, default_code))
 		val=string->as_int();
 	else
 		if(default_code)
-			val=r.process_to_value(*default_code).as_int();
+			val=r.process(*default_code).as_int();
 		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);
-
-	// ^double.bool[]
+	// ^int.bool[]
+	// ^int.bool[default for ^string.bool compatibility]
 	add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);
 
 	// ^int.inc[]