--- parser3/src/classes/date.C	2003/10/30 13:16:53	1.48
+++ parser3/src/classes/date.C	2004/02/19 15:16:53	1.63
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b date parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_DATE_C="$Date: 2003/10/30 13:16:53 $";
+static const char * const IDENT_DATE_C="$Date: 2004/02/19 15:16:53 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -19,7 +19,7 @@ static const char* IDENT_DATE_C="$Date:
 
 class MDate: public Methoded {
 public: // VStateless_class
-	Value* create_new_value() { return new VDate(0); }
+	Value* create_new_value(Pool&) { return new VDate(0); }
 
 public:
 	MDate();
@@ -60,12 +60,13 @@ static void _now(Request& r, MethodParam
 	vdate.set_time(t);
 }
 
-static int NN_year_to_NNNN(int year) {
-	if(year<70) // 0..69 -> 100..169 [2000..2069]
-		year+=100;
-	if(year>=1900)
-		year-=1900;
-	return year;
+/// 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);
+	return iyear-1900;
 }
 
 // 2002-04-25 18:14:00
@@ -91,7 +92,7 @@ static int NN_year_to_NNNN(int year) {
 	const char* min=lsplit(&cur, ':');
 	const char* sec=cur;
 
-	tm tmIn={0};
+	tm tmIn;  memset(&tmIn, 0, sizeof(tmIn));
 	tmIn.tm_isdst=-1;
 	if(!month)
 		if(min) {
@@ -104,13 +105,13 @@ static int NN_year_to_NNNN(int year) {
 			goto date_part_set;
 		} else
 			hour=min=sec=0; // not YYYY- & not HH: = just YYYY					
-	tmIn.tm_year=NN_year_to_NNNN(atoi(year));
-	tmIn.tm_mon=month?atoi(month)-1:0;
-	tmIn.tm_mday=mday?atoi(mday):1;
+	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:
-	tmIn.tm_hour=hour?atoi(hour):0;
-	tmIn.tm_min=min?atoi(min):0;
-	tmIn.tm_sec=sec?atoi(sec):0;
+	tmIn.tm_hour=hour?pa_atoi(hour):0;
+	tmIn.tm_min=min?pa_atoi(min):0;
+	tmIn.tm_sec=sec?pa_atoi(sec):0;
 	time_t result=mktime(&tmIn);
 	if(result<0)
 		if(fail_on_error)
@@ -138,9 +139,9 @@ static void _create(Request& r, MethodPa
 					"invalid datetime");
 		}
 	} else if(params.count()>=2) { // ^create(y;m;d[;h[;m[;s]]])
-		tm tmIn={0};
+		tm tmIn; memset(&tmIn, 0, sizeof(tmIn));
 		tmIn.tm_isdst=-1;
-		tmIn.tm_year=NN_year_to_NNNN(params.as_int(0, "year must be int", r));
+		tmIn.tm_year=to_tm_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;
 		if(params.count()>3) tmIn.tm_hour=params.as_int(3, "hour must be int", r);
@@ -232,7 +233,7 @@ static void _roll(Request& r, MethodPara
 	tmOut->tm_isdst=-1; 
 	{
 		time_t t_changed_time=mktime/*normalizetime*/(tmOut);
-		/*autofix: in msk timezone last sunday of april hour hole: [2am->3am)
+		/*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)
@@ -257,7 +258,12 @@ static Table& fill_month_days(Request& r
 	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={0, 0, 0, 1, month, year-1900};
+	tm tmIn;  
+	memset(&tmIn, 0, sizeof(tmIn)); 
+	tmIn.tm_mday=1;
+	tmIn.tm_mon=month; 
+	tmIn.tm_year=year-1900;
+
 	time_t t=mktime(&tmIn);
 	if(t<0)
 		throw Exception(0, 
@@ -273,9 +279,9 @@ static Table& fill_month_days(Request& r
 	for(int _day=1-weekDay1; _day<=monthDays;) {
 		Table::element_type row(new ArrayString(7));
 		// calculating year week no [1..54]
-		char *weekno_buf;
-		size_t weekno_size;
-		int weekyear;
+		char *weekno_buf=0; // surely would be assigned to, but to calm down compiler
+		size_t weekno_size=0; // same
+		int weekyear=0; // same
 		// 0..6 week days-cells fill with month days
 		for(int wday=0; wday<7; wday++, _day++) {
 			String* cell=new String;
@@ -286,7 +292,12 @@ static Table& fill_month_days(Request& r
 			*row+=cell;            
 
 			if(wday==(rus?3:4)/*thursday*/) {
-				tm tms={0,0,0,  _day, month, year-1900};
+				tm tms;
+				memset(&tms, 0, sizeof(tmIn)); 
+				tms.tm_mday=_day;
+				tms.tm_mon=month; 
+				tms.tm_year=year-1900;
+				
 				/*normalize*/mktime(&tms);
 
 				weekyear=tms.tm_year+1900;
@@ -326,7 +337,13 @@ static Table& fill_week_days(Request& 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={0, 0, 18, day, month, year-1900};
+	tm tmIn;
+	memset(&tmIn, 0, sizeof(tmIn)); 
+	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, 
@@ -378,6 +395,26 @@ static void _calendar(Request& r, Method
 	r.write_no_lang(*new VTable(table));
 }
 
+static void _unix_timestamp(Request& r, MethodParams& params) {
+	VDate& vdate=GET_SELF(r, VDate);
+
+	if(params.count()==0) { 
+		// ^date.unix-timestamp[]
+		r.write_no_lang(*new VInt((int)vdate.get_time()));
+	} else {
+		if(vdate.get_time())
+			throw Exception(0,
+				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);
+	}
+}
+
+
 // constructor
 
 MDate::MDate(): Methoded("date") {
@@ -399,4 +436,7 @@ MDate::MDate(): Methoded("date") {
 	// ^date:calendar[week|weekeng;year;month;day] = table
 	add_native_method("calendar", Method::CT_STATIC, _calendar, 3, 4);
 
+
+	// ^unix-timestamp[]
+	add_native_method("unix-timestamp", Method::CT_DYNAMIC, _unix_timestamp, 0, 1);
 }