--- parser3/src/classes/date.C	2016/10/04 13:23:45	1.105
+++ parser3/src/classes/date.C	2023/11/26 16:02:41	1.115
@@ -1,8 +1,8 @@
 /** @file
 	Parser: @b date parser class.
 
-	Copyright (c) 2001-2015 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"
@@ -12,8 +12,9 @@
 #include "pa_vdouble.h"
 #include "pa_vdate.h"
 #include "pa_vtable.h"
+#include "pa_vbool.h"
 
-volatile const char * IDENT_DATE_C="$Id: date.C,v 1.105 2016/10/04 13:23:45 moko Exp $" IDENT_PA_VDATE_H;
+volatile const char * IDENT_DATE_C="$Id: date.C,v 1.115 2023/11/26 16:02:41 moko Exp $" IDENT_PA_VDATE_H;
 
 // class
 
@@ -57,12 +58,16 @@ static void _now(Request& r, MethodParam
 	vdate.set_time(t);
 }
 
-static void _today(Request& r, MethodParams&) {
+static void _today(Request& r, MethodParams& params) {
 	VDate& vdate=GET_SELF(r, VDate);
 
 	time_t t=time(0);
 
 	tm today=*localtime(&t);
+
+	if (params.count() == 1) // ^today(offset)
+		today.tm_mday += params.as_int(0, "offset must be int", r);
+
 	today.tm_hour=0;
 	today.tm_min=0;
 	today.tm_sec=0;
@@ -188,7 +193,7 @@ tm cstr_to_time_t(char *cstr, const char
 	char *cur=cstr;
 
 	const char *year, *month, *mday;
-	const char *hour, *min, *sec, *msec;
+	const char *hour, *min, *sec, *msec PA_ATTR_UNUSED;
 
 	year=skip_number(&cur, "-:", &delim);
 	if(delim != ':' || delim == ':' && strlen(year) >=4 ){
@@ -235,9 +240,9 @@ tm cstr_to_time_t(char *cstr, const char
 		tmIn.tm_mday=tmNow->tm_mday;
 	}
 
-	tmIn.tm_hour=hour?pa_atoi(hour):0;
-	tmIn.tm_min=min?pa_atoi(min):0;
-	tmIn.tm_sec=sec?pa_atoi(sec):0;	
+	tmIn.tm_hour=pa_atoi(hour);
+	tmIn.tm_min=pa_atoi(min);
+	tmIn.tm_sec=pa_atoi(sec);
 	//tmIn.tm_[msec<<no such, waits reimplementation of the class]=f(msec);
 
 	return tmIn;
@@ -288,13 +293,13 @@ static void _sql_string(Request& r, Meth
 			throw Exception(PARSER_RUNTIME, &what, "'type' must be 'date', 'time' or 'datetime'");
 	}
 
-	r.write_assign_lang(*vdate.get_sql_string(format));
+	r.write(*vdate.get_sql_string(format));
 }
 
 static void _gmt_string(Request& r, MethodParams&) {
 	VDate& vdate=GET_SELF(r, VDate);
 
-	r.write_assign_lang(*vdate.get_gmt_string());
+	r.write(*vdate.get_gmt_string());
 }
 
 static void _iso_string(Request& r, MethodParams& params) {
@@ -324,7 +329,7 @@ static void _iso_string(Request& r, Meth
 				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 		}
 
-	r.write_assign_lang(*vdate.get_iso_string(format));
+	r.write(*vdate.get_iso_string(format));
 }
 
 static void _roll(Request& r, MethodParams& params) {
@@ -476,7 +481,7 @@ static Table& fill_week_days(Request& r,
 }
 
 static void _calendar(Request& r, MethodParams& params) {
-	const String& what=params.as_string(0, "format must be strig");
+	const String& what=params.as_string(0, "format must be string");
 	bool rus=false;
 	if(what=="rus")
 		rus=true;
@@ -491,7 +496,7 @@ static void _calendar(Request& r, Method
 	else // 1+3
 		table=&fill_week_days(r, params, rus);
 
-	r.write_no_lang(*new VTable(table));
+	r.write(*new VTable(table));
 }
 
 static void _unix_timestamp(Request& r, MethodParams& params) {
@@ -499,7 +504,7 @@ static void _unix_timestamp(Request& r,
 
 	if(params.count()==0) { 
 		// ^date.unix-timestamp[]
-		r.write_no_lang(*new VDouble((double)vdate.get_time()));
+		r.write(*new VDouble((double)vdate.get_time()));
 	} else {
 		if(vdate.get_time())
 			throw Exception(PARSER_RUNTIME, 0, "date object already constructed");
@@ -522,7 +527,22 @@ static void _last_day(Request& r, Method
 		// ^date.lastday[]
 		tmIn=GET_SELF(r, VDate).get_tm();
 	}
-	r.write_no_lang(*new VInt(VDate::getMonthDays(tmIn.tm_year, tmIn.tm_mon)));
+	r.write(*new VInt(VDate::getMonthDays(tmIn.tm_year, tmIn.tm_mon)));
+}
+
+static void _int(Request& r, MethodParams&) {
+	VDate& vdate=GET_SELF(r, VDate);
+	r.write(*new VInt(vdate.as_int()));
+}
+
+static void _double(Request& r, MethodParams&) {
+	VDate& vdate=GET_SELF(r, VDate);
+	r.write(*new VDouble(vdate.as_double()));
+}
+
+static void _bool(Request& r, MethodParams&) {
+	VDate& vdate=GET_SELF(r, VDate);
+	r.write(VBool::get(vdate.as_bool()));
 }
 
 // constructor
@@ -533,7 +553,8 @@ MDate::MDate(): Methoded("date") {
 	add_native_method("now", Method::CT_DYNAMIC, _now, 0, 1);
 
 	// ^date::today[]
-	add_native_method("today", Method::CT_DYNAMIC, _today, 0, 0);
+	// ^date::today(offset int days)
+	add_native_method("today", Method::CT_DYNAMIC, _today, 0, 1);
 
 	// ^date::create(float days)
 	// ^date::create[date]
@@ -567,4 +588,13 @@ MDate::MDate(): Methoded("date") {
 	// ^date.unix-timestamp[]
 	// ^date::unix-timestamp(timestamp)
 	add_native_method("unix-timestamp", Method::CT_DYNAMIC, _unix_timestamp, 0, 1);
+
+	// date.int[default for ^string.int compatibility]
+	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);
+
+	// ^date.double[default for ^string.double compatibility]
+	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1);
+
+	// ^date.bool[default for ^string.bool compatibility]
+	add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);
 }