--- parser3/src/classes/double.C	2012/03/16 09:24:06	1.64
+++ parser3/src/classes/double.C	2023/11/16 23:54:54	1.76
@@ -1,8 +1,8 @@
 /** @file
 	Parser: @b double 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_DOUBLE_C="$Id: double.C,v 1.64 2012/03/16 09:24:06 moko Exp $" IDENT_PA_VDOUBLE_H;
+volatile const char * IDENT_DOUBLE_C="$Id: double.C,v 1.76 2023/11/16 23:54:54 moko Exp $" IDENT_PA_VDOUBLE_H;
 
 // externs
 
@@ -28,35 +28,23 @@ public:
 
 // global variable
 
-DECLARE_CLASS_VAR(double, new MDouble, 0);
+DECLARE_CLASS_VAR(double, new MDouble);
 
 // 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&) {
 	VDouble& vdouble=GET_SELF(r, VDouble);
-	r.write_no_lang(*new VInt(vdouble.as_int()));
+	r.write(*new VInt(vdouble.as_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&) {
 	VDouble& vdouble=GET_SELF(r, VDouble);
-	r.write_no_lang(*new VDouble(vdouble.as_double()));
+	r.write(*new VDouble(vdouble.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_double(0, "default must be bool", r);
-
+static void _bool(Request& r, MethodParams&) {
 	VDouble& vdouble=GET_SELF(r, VDouble);
-	r.write_no_lang(VBool::get(vdouble.as_bool()));
+	r.write(VBool::get(vdouble.as_bool()));
 }
 
 typedef void (*vdouble_op_func_ptr)(VDouble& vdouble, double param);
@@ -65,13 +53,11 @@ static void __inc(VDouble& vdouble, doub
 static void __dec(VDouble& vdouble, double param) { vdouble.inc(-param); }
 static void __mul(VDouble& vdouble, double param) { vdouble.mul(param); }
 static void __div(VDouble& vdouble, double param) { vdouble.div(param); }
-static void __mod(VDouble& vdouble, double param) { vdouble.mod((int)param); }
+static void __mod(VDouble& vdouble, double param) { vdouble.mod(param); }
 
-static void vdouble_op(Request& r, MethodParams& params, 
-					   vdouble_op_func_ptr func) {
+static void vdouble_op(Request& r, MethodParams& params, vdouble_op_func_ptr func) {
 	VDouble& vdouble=GET_SELF(r, VDouble);
-	double param=params.count()?
-			params.as_double(0, "param must be double", r):1/*used in inc/dec*/;
+	double param=params.count() ? params.as_double(0, "param must be double", r) : 1/*used in inc/dec*/;
 	(*func)(vdouble, param);
 }
 
@@ -82,37 +68,33 @@ static void _div(Request& r, MethodParam
 static void _mod(Request& r, MethodParams& params) { vdouble_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) {
 	double val;
-	HashStringValue* options;
 	Value* default_code;
-	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_double();
 	else
 		if(default_code)
-			val=r.process_to_value(*default_code).as_double();
+			val=r.process(*default_code).as_double();
 		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 VDouble(val));
+	r.write(*new VDouble(val));
 }
 
 // constructor
 
 MDouble::MDouble(): Methoded("double") {
 	// ^double.int[]
+	// ^double.int[default for ^string.int compatibility]
 	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);
-
 	// ^double.double[]
+	// ^double.double[default for ^string.double compatibility]
 	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1);
-
 	// ^double.bool[]
+	// ^double.bool[default for ^string.bool compatibility]
 	add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);
 	
 	// ^double.inc[]