--- parser3/src/classes/date.C 2005/08/09 08:14:47 1.71 +++ parser3/src/classes/date.C 2015/09/21 22:37:36 1.96 @@ -1,12 +1,10 @@ /** @file Parser: @b date parser class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_DATE_C="$Date: 2005/08/09 08:14:47 $"; - #include "classes.h" #include "pa_vmethod_frame.h" @@ -15,16 +13,16 @@ static const char * const IDENT_DATE_C=" #include "pa_vdate.h" #include "pa_vtable.h" +volatile const char * IDENT_DATE_C="$Id: date.C,v 1.96 2015/09/21 22:37:36 moko Exp $" IDENT_PA_VDATE_H; + // class class MDate: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&, HashStringValue&) { return new VDate(0); } + Value* create_new_value(Pool&) { return new VDate(0); } public: MDate(); -public: // Methoded - bool used_directly() { return true; } }; // global variable @@ -36,10 +34,9 @@ DECLARE_CLASS_VAR(date, new MDate, 0); class Date_calendar_table_template_columns: public ArrayString { public: Date_calendar_table_template_columns(): ArrayString(6+2) { - for(int i=0; i<=6; i++) { - char *cname=new(PointerFreeGC) char[1/*strlen("6")*/+1/*terminating 0*/]; - *this+=new String(cname, sprintf(cname, "%d", i)); // .i column name - } + for(int i=0; i<=6; i++) + *this+=new String(i, "%d"); // .i column name + *this+=new String("week"); *this+=new String("year"); } @@ -60,106 +57,246 @@ static void _now(Request& r, MethodParam vdate.set_time(t); } -/// shrinked range: 1970/1/1 to 2038/1/1 -static int to_tm_year(int iyear) { - if(iyear<1970 || iyear>2038) - throw Exception(0, - 0, - "year '%d' is out of valid range", iyear); +static void _today(Request& r, MethodParams&) { + VDate& vdate=GET_SELF(r, VDate); + + time_t t=time(0); + + tm today=*localtime(&t); + today.tm_hour=0; + today.tm_min=0; + today.tm_sec=0; + + vdate.set_tm(today); +} + +static int to_year(int iyear) { + if(iyear<0 || iyear>9999) + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "year '%d' is out of range 0..9999", iyear); return iyear-1900; } -// 2002-04-25 18:14:00 -// 18:14:00 -// 2002:04:25 [+maybe time] -/*not static, used in image.C*/ tm cstr_to_time_t(char *cstr) { +static int to_month(int imonth) { + return max(1, min(imonth, 12)) -1; +} + + +static const char *skip_number_throw(char *string, char c, const char *valid){ + if(!valid[0]) + throw Exception("date.format", 0, "invalid character '%c' after number in '%s'", c, string); + if(!strcmp(valid, "+-Z")) + throw Exception("date.format", 0, "invalid timezone character '%c' after number in '%s'", c, string); + throw Exception("date.format", 0, "number delimiter '%c'%s expected, but found '%c' in date '%s'", + valid[0], valid[strlen(valid)-1] == 'Z' ? " or timezone":"", c, string); +} + +static char *skip_number(char* string, const char *valid_delim, char *delim) { + if(string) { + char *str=string; + // skipping whitespace + while(isspace(str[0])) str++; + // skipping +- + if(str[0]=='-' || str[0]=='+') str++; + // at least one digit should be present + if(!str[0]) + throw Exception("date.format", 0, "number expected in date '%s'", string); + if(!isdigit(str[0])) + throw Exception("date.format", 0, "'%c' must be number in date '%s'", str[0], string); + str++; + // skipping digits + while(isdigit(str[0])) str++; + // skipping trailing whitespace + if(!strchr(valid_delim, ' ')) + while(isspace(str[0])) str++; + // delimiter check + if(char c=str[0]){ + if(!strchr(valid_delim, c)) + skip_number_throw(string, c, valid_delim); + if(delim) + *delim=c; + str[0]=0; + return str+1; + } + } + if(delim) + *delim=0; + return 0; +} + +static char *skip_number(char** string_ref, const char *valid_delim, char *delim=0) { + char *result=*string_ref; + *string_ref=skip_number(*string_ref, valid_delim, delim); + return result; +} + +static char *skip_writespace(char* str) { + if(str){ + while(isspace(str[0])) str++; + return str[0] ? str : 0; + } + return 0; +} + +static char *numeric_tz(char prefix, char* tz) { + char *cur=tz; + // hours + if(!isdigit(*(cur++))) + return 0; + if(isdigit(cur[0])) + cur++; + if(cur[0] == ':'){ + // optional minutes + cur++; + if(!isdigit(*(cur++))) + return 0; + if(isdigit(cur[0])) + cur++; + } + // nothing more + if(skip_writespace(cur)) + return 0; + // returning POSIX TZ format + size_t size=4+(cur-tz)+1/*zero-teminator*/; + char *buf=new(PointerFreeGC) char[size]; + strcpy(buf, prefix=='+' ? "SUB-":"SUB+"); + strncpy(buf+4, tz, cur-tz); + buf[size]=0; + return buf; +} + +// SQL 2002-04-25 18:14:00 +// ISO 2002-04-25T18:14:00.45+01:00 +// TIME 18:14:00 +// ':' DELIMITED 2002:04:25 [+maybe time] +// not static, used in image.C +tm cstr_to_time_t(char *cstr, const char **tzOut) { if( !cstr || !*cstr ) - throw Exception(0, - 0, - "empty string is not valid datetime"); + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "empty string is not valid datetime"); + if(tzOut) + *tzOut=0; + + tm tmIn; + memset(&tmIn, 0, sizeof(tmIn)); + tmIn.tm_isdst=-1; + char delim; char *cur=cstr; - int date_delim=isdigit((unsigned char)cur[0])&&isdigit((unsigned char)cur[1])&&isdigit((unsigned char)cur[2])&&isdigit((unsigned char)cur[3])&&cur[4]==':'?':' - :'-'; - const char* year=lsplit(&cur, date_delim); - const char* month=lsplit(&cur, date_delim); - const char* mday=lsplit(&cur, ' '); - if(!month) - cur=cstr; - const char* hour=lsplit(&cur, ':'); - const char* min=lsplit(&cur, ':'); - const char* sec=lsplit(&cur, '.'); - const char* msec=cur; - tm tmIn; memset(&tmIn, 0, sizeof(tmIn)); - tmIn.tm_isdst=-1; - if(!month) - if(min) { - year=mday=0; // HH:MM - time_t t=time(0); - tm *tmNow=localtime(&t); - tmIn.tm_year=tmNow->tm_year; - tmIn.tm_mon=tmNow->tm_mon; - tmIn.tm_mday=tmNow->tm_mday; - goto date_part_set; - } else - hour=min=sec=msec=0; // not YYYY- & not HH: = just YYYY - tmIn.tm_year=to_tm_year(pa_atoi(year)); - tmIn.tm_mon=month?pa_atoi(month)-1:0; - tmIn.tm_mday=mday?pa_atoi(mday):1; -date_part_set: + const char *year, *month, *mday; + const char *hour, *min, *sec, *msec; + + year=skip_number(&cur, "-:", &delim); + if(delim != ':' || delim == ':' && strlen(year) >=4 ){ + // year present + month=skip_number(&cur, delim == ':' ? ":" : "-"); + mday=skip_number(&cur, tzOut ? " \tT":" \t", &delim); + if(delim != 'T'){ + // SQL date format + cur=skip_writespace(cur); + hour=skip_number(&cur, ":"); + min=skip_number(&cur, ":"); + sec=skip_number(&cur, "."); + msec=skip_number(&cur, ""); + } else { + // ISO date format + hour=skip_number(&cur, ":"); + min=skip_number(&cur, ":+-Z", &delim); + sec=delim==':' ? skip_number(&cur, ".+-Z", &delim) : 0; + msec=delim=='.' ? skip_number(&cur, "+-Z", &delim) : 0; + // timezone specification check + const char *tz = delim == 'Z' ? (skip_writespace(cur) ? 0 : "UTC") : (cur ? numeric_tz(delim, cur) : 0); + if(!tz){ + if(!delim) + throw Exception("date.format", 0, "empty timezone"); + throw Exception("date.format", 0, "invalid timezone '%c%s'", delim, cur ? cur : ""); + } + *tzOut=tz; + } + + tmIn.tm_year=to_year(pa_atoi(year)); + tmIn.tm_mon=month?pa_atoi(month)-1:0; + tmIn.tm_mday=mday?pa_atoi(mday):1; + } else { + // time only + hour=year; + min=skip_number(&cur, ":"); + sec=skip_number(&cur, "."); + msec=skip_number(&cur, ""); + + time_t t=time(0); + tm *tmNow=localtime(&t); + tmIn.tm_year=tmNow->tm_year; + tmIn.tm_mon=tmNow->tm_mon; + 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_[msec<cstrm())); - else { // ^create(float days) - time_t t=(time_t)round(params.as_double(0, "float days must be double", r)*SECS_PER_DAY); - if(t<0 || !localtime(&t)) - throw Exception(0, - 0, - "invalid datetime"); - vdate.set_time(t); + if(params.count()==1){ + if(params[0].is_string()){ // ^create[2002-04-25 18:14:00] ^create[18:14:00] + const char *tz; + tm tmIn=cstr_to_time_t(params[0].get_string()->cstrm(), &tz); + if(tz) + vdate.set_tz(tz); + vdate.set_tm(tmIn); + } else { // ^create(float days) or ^create[date object] + vdate.set_time(round(params.as_double(0, "float days must be double", r)*SECS_PER_DAY)); } - } else if(params.count()>=2) { // ^create(y;m;d[;h[;m[;s]]]) + } else { // ^create(y;m;d[;h[;m[;s]]]) + assert(params.count()<=6); tm tmIn; memset(&tmIn, 0, sizeof(tmIn)); tmIn.tm_isdst=-1; - tmIn.tm_year=to_tm_year(params.as_int(0, "year must be int", r)); + tmIn.tm_year=to_year(params.as_int(0, "year must be int", r)); tmIn.tm_mon=params.as_int(1, "month must be int", r)-1; tmIn.tm_mday=params.count()>2?params.as_int(2, "mday must be int", r):1; - int savedHour=0; - if(params.count()>3) savedHour=tmIn.tm_hour=params.as_int(3, "hour must be int", r); + if(params.count()>3) tmIn.tm_hour=params.as_int(3, "hour must be int", r); if(params.count()>4) tmIn.tm_min=params.as_int(4, "minutes must be int", r); if(params.count()>5) tmIn.tm_sec=params.as_int(5, "seconds must be int", r); - vdate.set_time(tmIn); - } else - throw Exception("parser.runtime", - 0, - "invalid params count, must be 1 or >=2"); + vdate.set_tm(tmIn); + }; } -static void _sql_string(Request& r, MethodParams&) { +static void _sql_string(Request& r, MethodParams& params) { VDate& vdate=GET_SELF(r, VDate); - int size=1+ 4+1+2+1+2 +1+ 2+1+2+1+2 +1 +1; - char *buf=new(PointerFreeGC) char[size]; - size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", vdate.get_localtime()); - - r.write_assign_lang(String(buf, size)); + + VDate::sql_string_type format = VDate::sql_string_datetime; + if(params.count() > 0) { + const String& what=params.as_string(0, "'type' must be string"); + if(what.is_empty() || what == "datetime") + format = VDate::sql_string_datetime; + else if(what == "date") + format=VDate::sql_string_date; + else if(what == "time") + format=VDate::sql_string_time; + else + throw Exception(PARSER_RUNTIME, &what, "'type' must be 'date', 'time' or 'datetime'"); + } + + r.write_assign_lang(*vdate.get_sql_string(format)); } -static void _roll(Request& r, MethodParams& params) { +static void _gmt_string(Request& r, MethodParams&) { + VDate& vdate=GET_SELF(r, VDate); + + r.write_assign_lang(*vdate.get_gmt_string()); +} + +static void _iso_string(Request& r, MethodParams&) { VDate& vdate=GET_SELF(r, VDate); + r.write_assign_lang(*vdate.get_iso_string()); +} + +static void _roll(Request& r, MethodParams& params) { const String& what=params.as_string(0, "'what' must be string"); int oyear=0; int omonth=0; @@ -170,143 +307,99 @@ static void _roll(Request& r, MethodPara else if(what=="day") offset=&oday; else if(what=="TZ") { const String& argument_tz=params.as_string(1, "'TZ' must be string"); - vdate.set_tz(&argument_tz); + if(&r.get_self() == date_class){ + VDate::set_default_tz(argument_tz.cstr()); + } else { + VDate& vdate=GET_SELF(r, VDate); + vdate.set_tz(argument_tz.cstr()); + vdate.set_time(vdate.get_time()); + } return; } else - throw Exception("parser.runtime", - &what, - "must be year|month|day|TZ"); + throw Exception(PARSER_RUNTIME, &what, "must be year|month|day|TZ"); + + if(&r.get_self() == date_class) + throw Exception(PARSER_RUNTIME, &what, "must be TZ to be called statically"); + + VDate& vdate=GET_SELF(r, VDate); *offset=params.as_int(1, "offset must be int", r); - time_t self_time=vdate.get_time(); - tm tmIn=*localtime(&self_time); + tm tmIn=vdate.get_tm(); tm tmSaved=tmIn; int adjust_day=0; - time_t t_changed_date; while(true) { tmIn.tm_year+=oyear; tmIn.tm_mon+=omonth; tmIn.tm_mday+=oday+adjust_day; - tmIn.tm_hour=24/2; + tmIn.tm_hour=24/2; tmIn.tm_min=0; tmIn.tm_sec=0; - int saved_mon=(tmIn.tm_mon+12*100)%12; // crossing year boundary backwards - t_changed_date=mktime/*normalizetime*/(&tmIn); - if(t_changed_date<0) - throw Exception(0, - 0, - "bad resulting time (rolled out of valid date range)"); - if(oday==0 && tmIn.tm_mon!=saved_mon/*but it changed*/) { - if(adjust_day <= -3/*31->28 max, so never, but...*/) - throw Exception(0, - 0, - "bad resulting time (day hole still with %d day adjustment)", adjust_day ); + int saved_day=tmIn.tm_mday; + vdate.set_tm(tmIn); /* normalize */ + + if(oday==0 && tmIn.tm_mday!=saved_day /* but it changed */ ) { + if(adjust_day <= -3 /* 31->28 max, so never, but... */ ) + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "bad resulting time (day hole still with %d day adjustment)", adjust_day ); tmIn=tmSaved; // restoring --adjust_day; //retrying with prev day } else - break; + break; } - tm *tmOut=localtime(&t_changed_date); - if(!tmOut) - throw Exception(0, - 0, - "bad resulting time (seconds from epoch=%d)", t_changed_date); - - tmOut->tm_hour=tmSaved.tm_hour; - tmOut->tm_min=tmSaved.tm_min; - tmOut->tm_sec=tmSaved.tm_sec; - tmOut->tm_isdst=-1; - { - time_t t_changed_time=mktime/*normalizetime*/(tmOut); - /*autofix: in msk timezone last sunday of march hour hole: [2am->3am) - if( - tmOut->tm_hour!=tmSaved.tm_hour - ||tmOut->tm_min!=tmSaved.tm_min) - throw Exception(0, - 0, - "bad resulting time (hour hole)"); - */ - - if(t_changed_time<0) - throw Exception(0, - 0, - "bad resulting time (after reconstruction)"); - - vdate.set_time(t_changed_time); - } + tmIn.tm_hour=tmSaved.tm_hour; + tmIn.tm_min=tmSaved.tm_min; + tmIn.tm_sec=tmSaved.tm_sec; + tmIn.tm_isdst=-1; + + vdate.set_tm(tmIn); } static Table& fill_month_days(Request& r, MethodParams& params, bool rus){ Table::Action_options table_options; Table& result=*new Table(date_calendar_table_template, table_options); - int year=params.as_int(1, "year must be int", r); - int month=max(1, min(params.as_int(2, "month must be int", r), 12)) -1; - - tm tmIn; - memset(&tmIn, 0, sizeof(tmIn)); + tm tmIn; + memset(&tmIn, 0, sizeof(tmIn)); + tmIn.tm_year=to_year(params.as_int(1, "year must be int", r)); + tmIn.tm_mon=to_month(params.as_int(2, "month must be int", r)); tmIn.tm_mday=1; - tmIn.tm_mon=month; - tmIn.tm_year=year-1900; - time_t t=mktime(&tmIn); - if(t<0) - throw Exception(0, - 0, - "invalid date"); - tm *tmOut=localtime(&t); - - int weekDay1=tmOut->tm_wday; - if(rus) + VDate t(tmIn); /* normalize */ + int weekDay1=tmIn.tm_wday; + + if(rus) weekDay1=weekDay1?weekDay1-1:6; //sunday last - int monthDays=getMonthDays(year, month); + int monthDays=VDate::getMonthDays(tmIn.tm_year, tmIn.tm_mon); for(int _day=1-weekDay1; _day<=monthDays;) { Table::element_type row(new ArrayString(7)); // calculating year week no [1..54] - char *weekno_buf=0; // surely would be assigned to, but to calm down compiler - size_t weekno_size=0; // same - int weekyear=0; // same + int weekyear=0; // surely would be assigned to, but to calm down compiler + int weekno=0; // same // 0..6 week days-cells fill with month days for(int wday=0; wday<7; wday++, _day++) { - String* cell=new String; - if(_day>=1 && _day<=monthDays) { - char *buf=new(PointerFreeGC) char[2+1]; - cell->append_know_length(buf, sprintf(buf, "%02d", _day), String::L_CLEAN); - } - *row+=cell; + *row+=(_day>=1 && _day<=monthDays)?new String(_day, "%02d"):new String(); if(wday==(rus?3:4)/*thursday*/) { tm tms; - memset(&tms, 0, sizeof(tmIn)); + memset(&tms, 0, sizeof(tms)); tms.tm_mday=_day; - tms.tm_mon=month; - tms.tm_year=year-1900; + tms.tm_mon=tmIn.tm_mon; + tms.tm_year=tmIn.tm_year; - /*normalize*/mktime(&tms); - + VDate ts(tms); /*normalize*/ weekyear=tms.tm_year+1900; - - const int weekno_buf_size=2+1/*for stupid snprintfs*/ +1; - - // http://www.merlyn.demon.co.uk/weekinfo.htm - const int FirstThurs[] = {7,5,4,3,2,7,6,5,4,2,1,7,6,4,3,2,1,6,5,4,3,1,7,6,5,3,2,1}; - int n=1 + (tms.tm_yday-(FirstThurs[weekyear % 28]-3))/7; - weekno_buf=new(PointerFreeGC) char[weekno_buf_size]; - weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", n); + weekno=VDate::CalcWeek(tms).week; } - - } - // appending year week no - *row+=new String(weekno_buf, weekno_size); - // appending year week year - { - char* buf=new(PointerFreeGC) char[4+1]; - *row+=new String(buf, sprintf(buf, "%02d", weekyear)); } + // appending week no + *row+=new String(weekno, "%02d"); + + // appending week year + *row+=new String(weekyear, "%04d"); + result+=row; } @@ -321,41 +414,30 @@ static Table& fill_week_days(Request& r, *columns+=new String("weekday"); Table& result=*new Table(columns); - int year=params.as_int(1, "year must be int", r); - int month=max(1, min(params.as_int(2, "month must be int", r), 12)) -1; - int day=params.as_int(3, "day must be int", r); - tm tmIn; - memset(&tmIn, 0, sizeof(tmIn)); + memset(&tmIn, 0, sizeof(tmIn)); + tmIn.tm_year=to_year(params.as_int(1, "year must be int", r)); + tmIn.tm_mon=to_month(params.as_int(2, "month must be int", r)); + tmIn.tm_mday=params.as_int(3, "day must be int", r); tmIn.tm_hour=18; - tmIn.tm_mday=day; - tmIn.tm_mon=month; - tmIn.tm_year=year-1900; - - time_t t=mktime(&tmIn); - if(t<0) - throw Exception(0, - 0, - "invalid date"); - tm *tmOut=localtime(&t); - - int baseWeekDay=tmOut->tm_wday; + + VDate t(tmIn); /* normalize */ + int baseWeekDay=tmIn.tm_wday; + if(rus) baseWeekDay=baseWeekDay?baseWeekDay-1:6; //sunday last - t-=baseWeekDay*SECS_PER_DAY; + t.set_time(t.get_time()-baseWeekDay*SECS_PER_DAY); - for(int curWeekDay=0; curWeekDay<7; curWeekDay++, t+=SECS_PER_DAY) { - tm *tmOut=localtime(&t); + for(int curWeekDay=0; curWeekDay<7; curWeekDay++, t.set_time(t.get_time()+SECS_PER_DAY)) { Table::element_type row(new ArrayString(4)); -#define WDFILL(size, value) { \ - char *buf=new(PointerFreeGC) char[size+1]; \ - *row+=new String(buf, sprintf(buf, "%0"#size"d", value)); \ - } - WDFILL(4, 1900+tmOut->tm_year); - WDFILL(2, 1+tmOut->tm_mon); - WDFILL(2, tmOut->tm_mday); - WDFILL(2, tmOut->tm_wday); + + tm tmOut=t.get_tm(); + *row+=new String(1900+tmOut.tm_year, "%04d"); + *row+=new String(1+tmOut.tm_mon, "%02d"); + *row+=new String(tmOut.tm_mday, "%02d"); + *row+=new String(tmOut.tm_wday, "%02d"); + result+=row; } @@ -370,9 +452,7 @@ static void _calendar(Request& r, Method else if(what=="eng") rus=false; else - throw Exception("parser.runtime", - &what, - "must be rus|eng"); + throw Exception(PARSER_RUNTIME, &what, "must be rus|eng"); Table* table; if(params.count()==1+2) @@ -388,43 +468,72 @@ static void _unix_timestamp(Request& r, if(params.count()==0) { // ^date.unix-timestamp[] - r.write_no_lang(*new VInt((int)vdate.get_time())); + r.write_no_lang(*new VDouble((double)vdate.get_time())); } else { if(vdate.get_time()) - throw Exception(0, - 0, - "date object already constructed"); - + throw Exception(PARSER_RUNTIME, 0, "date object already constructed"); // ^unix-timestamp(time_t) - time_t t=(time_t)params.as_int(0, "Unix timestamp must be integer", r); - - vdate.set_time(t); + vdate.set_time(params.as_double(0, "Unix timestamp must be number", r)); } } +static void _last_day(Request& r, MethodParams& params) { + tm tmIn; + if(&r.get_self() == date_class) { + if(params.count() != 2) + throw Exception(PARSER_RUNTIME, 0, "year and month must be defined"); + // ^date:lastday(year;month) + tmIn.tm_year=to_year(params.as_int(0, "year must be int", r)); + tmIn.tm_mon=to_month(params.as_int(1, "month must be int", r)); + } else { + if(params.count() != 0) + throw Exception(PARSER_RUNTIME, 0, "year and month must not be defined"); + // ^date.lastday[] + tmIn=GET_SELF(r, VDate).get_tm(); + } + r.write_no_lang(*new VInt(VDate::getMonthDays(tmIn.tm_year, tmIn.tm_mon))); +} // constructor MDate::MDate(): Methoded("date") { - // ^now[] + // ^date::now[] + // ^date::now(offset float days) add_native_method("now", Method::CT_DYNAMIC, _now, 0, 1); - // ^create(float days) + // ^date::today[] + add_native_method("today", Method::CT_DYNAMIC, _today, 0, 0); + + // ^date::create(float days) + // ^date::create[date] + // ^date::create(year;month;day[;hour[;minute[;sec]]]) + // ^date::create[yyyy-mm-dd[ hh:mm:ss]] + // ^date::create[hh:mm:ss] add_native_method("create", Method::CT_DYNAMIC, _create, 1, 6); // old name for compatibility with <= v1.17 2002/2/18 12:13:42 paf add_native_method("set", Method::CT_DYNAMIC, _create, 1, 6); - // ^sql-string[] - add_native_method("sql-string", Method::CT_DYNAMIC, _sql_string, 0, 0); + // ^date.sql-string[] + add_native_method("sql-string", Method::CT_DYNAMIC, _sql_string, 0, 1); - // ^roll(year|month|day;+/- 1) - add_native_method("roll", Method::CT_DYNAMIC, _roll, 2, 2); + // ^date.gmt-string[] + add_native_method("gmt-string", Method::CT_DYNAMIC, _gmt_string, 0, 0); - // ^date:calendar[month|montheng;year;month] = table - // ^date:calendar[week|weekeng;year;month;day] = table - add_native_method("calendar", Method::CT_STATIC, _calendar, 3, 4); + // ^date.iso-string[] + add_native_method("iso-string", Method::CT_DYNAMIC, _iso_string, 0, 0); + + // ^date:lastday(year;month) + // ^date.lastday[] + add_native_method("last-day", Method::CT_ANY, _last_day, 0, 2); + // ^date.roll[year|month|day](+/- 1) + add_native_method("roll", Method::CT_ANY, _roll, 2, 2); + + // ^date:calendar[rus|eng](year;month) = table + // ^date:calendar[rus|eng](year;month;day) = table + add_native_method("calendar", Method::CT_STATIC, _calendar, 3, 4); - // ^unix-timestamp[] + // ^date.unix-timestamp[] + // ^date::unix-timestamp(timestamp) add_native_method("unix-timestamp", Method::CT_DYNAMIC, _unix_timestamp, 0, 1); }