--- parser3/src/classes/date.C	2008/02/14 10:11:16	1.78
+++ parser3/src/classes/date.C	2008/09/04 09:35:09	1.83
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_DATE_C="$Date: 2008/02/14 10:11:16 $";
+static const char * const IDENT_DATE_C="$Date: 2008/09/04 09:35:09 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -63,7 +63,7 @@ static void _now(Request& r, MethodParam
 /// shrinked range: 1970/1/1 to 2038/1/1
 static int to_year(int iyear) {
 	if(iyear<1970 || iyear>2038)
-		throw Exception(0,
+		throw Exception(DATE_RANGE_EXCEPTION_TYPE,
 			0,
 			"year '%d' is out of valid range", iyear);
 	return iyear;
@@ -83,7 +83,7 @@ static int to_tm_year(int iyear) {
 // 2002:04:25 [+maybe time]
 /*not static, used in image.C*/ tm cstr_to_time_t(char *cstr) {
 	if( !cstr || !*cstr )
-		throw Exception(0,
+		throw Exception(DATE_RANGE_EXCEPTION_TYPE,
 			0,
 			"empty string is not valid datetime");
 
@@ -127,15 +127,13 @@ date_part_set:
 static void _create(Request& r, MethodParams& params) {
 	VDate& vdate=GET_SELF(r, VDate);
 
-	if(params.count()==1) { 
-		// ^create[2002-04-25 18:14:00]
-		// ^create[18:14:00]
-		if(const String* sdate=params[0].get_string())
+	if(params.count()==1){
+		if(const String* sdate=params[0].get_string()){ // ^create[2002-04-25 18:14:00] ^create[18:14:00]
 			vdate.set_time(cstr_to_time_t(sdate->cstrm()));
-		else { // ^create(float days)
+		} else { // ^create(float days) or ^create[date object]
 			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,
+				throw Exception(DATE_RANGE_EXCEPTION_TYPE,
 					0,
 					"invalid datetime");
 			vdate.set_time(t);
@@ -164,6 +162,14 @@ static void _sql_string(Request& r, Meth
 	r.write_assign_lang(String(buf, size));
 }
 
+static void _gmt_string(Request& r, MethodParams&) {
+	VDate& vdate=GET_SELF(r, VDate);
+
+	time_t when=vdate.get_time();
+	
+	r.write_assign_lang(String(date_gmt_string(gmtime(&when))));
+}
+
 static void _roll(Request& r, MethodParams& params) {
 	VDate& vdate=GET_SELF(r, VDate);
 
@@ -201,12 +207,12 @@ static void _roll(Request& r, MethodPara
 		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,
+			throw Exception(DATE_RANGE_EXCEPTION_TYPE,
 				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,
+				throw Exception(DATE_RANGE_EXCEPTION_TYPE,
 					0,
 					"bad resulting time (day hole still with %d day adjustment)", adjust_day );
 			
@@ -218,7 +224,7 @@ static void _roll(Request& r, MethodPara
 
 	tm *tmOut=localtime(&t_changed_date);
 	if(!tmOut)
-		throw Exception(0,
+		throw Exception(DATE_RANGE_EXCEPTION_TYPE,
 			0,
 			"bad resulting time (seconds from epoch=%d)", t_changed_date);
     
@@ -238,7 +244,7 @@ static void _roll(Request& r, MethodPara
 		*/
 
 		if(t_changed_time<0)
-			throw Exception(0,
+			throw Exception(DATE_RANGE_EXCEPTION_TYPE,
 				0,
 				"bad resulting time (after reconstruction)");
 		
@@ -261,7 +267,7 @@ static Table& fill_month_days(Request& r
 
 	time_t t=mktime(&tmIn);
 	if(t<0)
-		throw Exception(0, 
+		throw Exception(DATE_RANGE_EXCEPTION_TYPE, 
 			0, 
 			"invalid date");
 	tm *tmOut=localtime(&t);
@@ -338,7 +344,7 @@ static Table& fill_week_days(Request& r,
 		
 	time_t t=mktime(&tmIn);
 	if(t<0)
-		throw Exception(0, 
+		throw Exception(DATE_RANGE_EXCEPTION_TYPE, 
 			0, 
 			"invalid date");
 	tm *tmOut=localtime(&t);
@@ -395,7 +401,7 @@ static void _unix_timestamp(Request& r,
 		r.write_no_lang(*new VInt((int)vdate.get_time()));
 	} else {
 		if(vdate.get_time())
-			throw Exception(0,
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"date object already constructed");
 
@@ -406,25 +412,25 @@ static void _unix_timestamp(Request& r,
 	}
 }
 
-static void _lastday(Request& r, MethodParams& params) {
+static void _last_day(Request& r, MethodParams& params) {
 	int year;
 	int month;
 	if(&r.get_self() == date_class) {
-		// ^date:lastday(year;month)
-		if(params.count() == 2) {
-			year=to_year(params.as_int(0, "year must be int", r));
-			month=to_month(params.as_int(1, "month must be int", r));
-		} else
+		if(params.count() != 2)
 			throw Exception(PARSER_RUNTIME,
 				0,
 				"year and month must be defined");
+
+		// ^date:lastday(year;month)
+		year=to_year(params.as_int(0, "year must be int", r));
+		month=to_month(params.as_int(1, "month must be int", r));
 	} else {
 		// ^date.lastday[]
 		tm &tmIn=GET_SELF(r, VDate).get_localtime();
 		year=tmIn.tm_year+1900;
 		month=tmIn.tm_mon;
 	}
-	r.write_assign_lang(*new VInt(getMonthDays(year, month)));
+	r.write_no_lang(*new VInt(getMonthDays(year, month)));
 }
 
 
@@ -442,9 +448,12 @@ MDate::MDate(): Methoded("date") {
 	// ^date.sql-string[]
 	add_native_method("sql-string", Method::CT_DYNAMIC, _sql_string, 0, 0);
 
+	// ^date.gmt-string[]
+	add_native_method("gmt-string", Method::CT_DYNAMIC, _gmt_string, 0, 0);
+
 	// ^date:lastday(year;month)
 	// ^date.lastday[]
-	add_native_method("lastday", Method::CT_ANY, _lastday, 0, 2);
+	add_native_method("last-day", Method::CT_ANY, _last_day, 0, 2);
 
 	// ^date.roll(year|month|day;+/- 1)
 	add_native_method("roll", Method::CT_DYNAMIC, _roll, 2, 2);