From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 31 Aug 2020 11:03:08 +0000 (+0100)
Subject: Update timelib to 2020.01
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bc8785b615e908a74461df2568ba9b906f3f5c0;p=php

Update timelib to 2020.01
---

diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 1c1edeaf28..c9ae9a8332 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 on Mon Aug 31 11:40:58 2020 */
+/* Generated by re2c 2.0.3 on Mon Aug 31 11:54:55 2020 */
 #line 1 "parse_date.re"
 /*
  * The MIT License (MIT)
@@ -353,7 +353,7 @@ static void add_error(Scanner *s, int error_code, char *error)
 	s->errors->error_messages[s->errors->error_count - 1].message = timelib_strdup(error);
 }
 
-static void add_pbf_warning(Scanner *s, int error_code, char *error, char *sptr, char *cptr)
+static void add_pbf_warning(Scanner *s, int error_code, char *error, const char *sptr, const char *cptr)
 {
 	s->errors->warning_count++;
 	s->errors->warning_messages = timelib_realloc(s->errors->warning_messages, s->errors->warning_count * sizeof(timelib_error_message));
@@ -363,7 +363,7 @@ static void add_pbf_warning(Scanner *s, int error_code, char *error, char *sptr,
 	s->errors->warning_messages[s->errors->warning_count - 1].message = timelib_strdup(error);
 }
 
-static void add_pbf_error(Scanner *s, int error_code, char *error, char *sptr, char *cptr)
+static void add_pbf_error(Scanner *s, int error_code, char *error, const char *sptr, const char *cptr)
 {
 	s->errors->error_count++;
 	s->errors->error_messages = timelib_realloc(s->errors->error_messages, s->errors->error_count * sizeof(timelib_error_message));
@@ -373,7 +373,7 @@ static void add_pbf_error(Scanner *s, int error_code, char *error, char *sptr, c
 	s->errors->error_messages[s->errors->error_count - 1].message = timelib_strdup(error);
 }
 
-static timelib_sll timelib_meridian(char **ptr, timelib_sll h)
+static timelib_sll timelib_meridian(const char **ptr, timelib_sll h)
 {
 	timelib_sll retval = 0;
 
@@ -400,7 +400,7 @@ static timelib_sll timelib_meridian(char **ptr, timelib_sll h)
 	return retval;
 }
 
-static timelib_sll timelib_meridian_with_check(char **ptr, timelib_sll h)
+static timelib_sll timelib_meridian_with_check(const char **ptr, timelib_sll h)
 {
 	timelib_sll retval = 0;
 
@@ -444,9 +444,10 @@ static char *timelib_string(Scanner *s)
 	return tmp;
 }
 
-static timelib_sll timelib_get_nr_ex(char **ptr, int max_length, int *scanned_length)
+static timelib_sll timelib_get_nr_ex(const char **ptr, int max_length, int *scanned_length)
 {
-	char *begin, *end, *str;
+	const char *begin, *end;
+	char *str;
 	timelib_sll tmp_nr = TIMELIB_UNSET;
 	int len = 0;
 
@@ -472,12 +473,12 @@ static timelib_sll timelib_get_nr_ex(char **ptr, int max_length, int *scanned_le
 	return tmp_nr;
 }
 
-static timelib_sll timelib_get_nr(char **ptr, int max_length)
+static timelib_sll timelib_get_nr(const char **ptr, int max_length)
 {
 	return timelib_get_nr_ex(ptr, max_length, NULL);
 }
 
-static void timelib_skip_day_suffix(char **ptr)
+static void timelib_skip_day_suffix(const char **ptr)
 {
 	if (isspace(**ptr)) {
 		return;
@@ -487,9 +488,10 @@ static void timelib_skip_day_suffix(char **ptr)
 	}
 }
 
-static timelib_sll timelib_get_frac_nr(char **ptr, int max_length)
+static timelib_sll timelib_get_frac_nr(const char **ptr, int max_length)
 {
-	char *begin, *end, *str;
+	const char *begin, *end;
+	char *str;
 	double tmp_nr = TIMELIB_UNSET;
 	int len = 0;
 
@@ -512,7 +514,7 @@ static timelib_sll timelib_get_frac_nr(char **ptr, int max_length)
 	return tmp_nr;
 }
 
-static timelib_ull timelib_get_unsigned_nr(char **ptr, int max_length)
+static timelib_ull timelib_get_unsigned_nr(const char **ptr, int max_length)
 {
 	timelib_ull dir = 1;
 
@@ -533,10 +535,10 @@ static timelib_ull timelib_get_unsigned_nr(char **ptr, int max_length)
 	return dir * timelib_get_nr(ptr, max_length);
 }
 
-static timelib_sll timelib_lookup_relative_text(char **ptr, int *behavior)
+static timelib_sll timelib_lookup_relative_text(const char **ptr, int *behavior)
 {
 	char *word;
-	char *begin = *ptr, *end;
+	const char *begin = *ptr, *end;
 	timelib_sll  value = 0;
 	const timelib_lookup_table *tp;
 
@@ -558,7 +560,7 @@ static timelib_sll timelib_lookup_relative_text(char **ptr, int *behavior)
 	return value;
 }
 
-static timelib_sll timelib_get_relative_text(char **ptr, int *behavior)
+static timelib_sll timelib_get_relative_text(const char **ptr, int *behavior)
 {
 	while (**ptr == ' ' || **ptr == '\t' || **ptr == '-' || **ptr == '/') {
 		++*ptr;
@@ -566,10 +568,10 @@ static timelib_sll timelib_get_relative_text(char **ptr, int *behavior)
 	return timelib_lookup_relative_text(ptr, behavior);
 }
 
-static timelib_long timelib_lookup_month(char **ptr)
+static timelib_long timelib_lookup_month(const char **ptr)
 {
 	char *word;
-	char *begin = *ptr, *end;
+	const char *begin = *ptr, *end;
 	timelib_long  value = 0;
 	const timelib_lookup_table *tp;
 
@@ -590,7 +592,7 @@ static timelib_long timelib_lookup_month(char **ptr)
 	return value;
 }
 
-static timelib_long timelib_get_month(char **ptr)
+static timelib_long timelib_get_month(const char **ptr)
 {
 	while (**ptr == ' ' || **ptr == '\t' || **ptr == '-' || **ptr == '.' || **ptr == '/') {
 		++*ptr;
@@ -598,14 +600,14 @@ static timelib_long timelib_get_month(char **ptr)
 	return timelib_lookup_month(ptr);
 }
 
-static void timelib_eat_spaces(char **ptr)
+static void timelib_eat_spaces(const char **ptr)
 {
 	while (**ptr == ' ' || **ptr == '\t') {
 		++*ptr;
 	}
 }
 
-static void timelib_eat_until_separator(char **ptr)
+static void timelib_eat_until_separator(const char **ptr)
 {
 	++*ptr;
 	while (strchr(" \t.,:;/-0123456789", **ptr) == NULL) {
@@ -613,10 +615,10 @@ static void timelib_eat_until_separator(char **ptr)
 	}
 }
 
-static const timelib_relunit* timelib_lookup_relunit(char **ptr)
+static const timelib_relunit* timelib_lookup_relunit(const char **ptr)
 {
 	char *word;
-	char *begin = *ptr, *end;
+	const char *begin = *ptr, *end;
 	const timelib_relunit *tp, *value = NULL;
 
 	while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t' && **ptr != ';' && **ptr != ':' &&
@@ -638,7 +640,7 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
 	return value;
 }
 
-static void timelib_set_relative(char **ptr, timelib_sll amount, int behavior, Scanner *s)
+static void timelib_set_relative(const char **ptr, timelib_sll amount, int behavior, Scanner *s)
 {
 	const timelib_relunit* relunit;
 
@@ -709,10 +711,10 @@ static const timelib_tz_lookup_table* abbr_search(const char *word, timelib_long
 	return NULL;
 }
 
-static timelib_long timelib_lookup_abbr(char **ptr, int *dst, char **tz_abbr, int *found)
+static timelib_long timelib_lookup_abbr(const char **ptr, int *dst, char **tz_abbr, int *found)
 {
 	char *word;
-	char *begin = *ptr, *end;
+	const char *begin = *ptr, *end;
 	timelib_long  value = 0;
 	const timelib_tz_lookup_table *tp;
 
@@ -739,9 +741,9 @@ static timelib_long timelib_lookup_abbr(char **ptr, int *dst, char **tz_abbr, in
 #define sHOUR(a) (int)(a * 3600)
 #define sMIN(a) (int)(a * 60)
 
-static timelib_long timelib_parse_tz_cor(char **ptr)
+static timelib_long timelib_parse_tz_cor(const char **ptr)
 {
-	char *begin = *ptr, *end;
+	const char *begin = *ptr, *end;
 	timelib_long  tmp;
 
 	while (isdigit(**ptr) || **ptr == ':') {
@@ -772,10 +774,10 @@ static timelib_long timelib_parse_tz_cor(char **ptr)
 	return 0;
 }
 
-static timelib_long timelib_parse_tz_minutes(char **ptr, timelib_time *t)
+static timelib_long timelib_parse_tz_minutes(const char **ptr, timelib_time *t)
 {
 	timelib_long retval = TIMELIB_UNSET;
-	char *begin = *ptr;
+	const char *begin = *ptr;
 
 	/* First character must be +/- */
 	if (**ptr != '+' && **ptr != '-') {
@@ -803,7 +805,7 @@ static timelib_long timelib_parse_tz_minutes(char **ptr, timelib_time *t)
 	return retval;
 }
 
-timelib_long timelib_parse_zone(char **ptr, int *dst, timelib_time *t, int *tz_not_found, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_wrapper)
+timelib_long timelib_parse_zone(const char **ptr, int *dst, timelib_time *t, int *tz_not_found, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_wrapper)
 {
 	timelib_tzinfo *res;
 	timelib_long            retval = 0;
@@ -879,16 +881,17 @@ timelib_long timelib_parse_zone(char **ptr, int *dst, timelib_time *t, int *tz_n
 static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 {
 	uchar *cursor = s->cur;
-	char *str, *ptr = NULL;
+	char *str;
+	const char *ptr = NULL;
 
 std:
 	s->tok = cursor;
 	s->len = 0;
-#line 1011 "parse_date.re"
+#line 1016 "parse_date.re"
 
 
 
-#line 892 "<stdout>"
+#line 895 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
@@ -1008,23 +1011,23 @@ yy2:
 	YYDEBUG(2, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(3, *YYCURSOR);
-#line 1808 "parse_date.re"
+#line 1830 "parse_date.re"
 	{
 		s->pos = cursor; s->line++;
 		goto std;
 	}
-#line 1017 "<stdout>"
+#line 1020 "<stdout>"
 yy4:
 	YYDEBUG(4, *YYCURSOR);
 	++YYCURSOR;
 yy5:
 	YYDEBUG(5, *YYCURSOR);
-#line 1814 "parse_date.re"
+#line 1836 "parse_date.re"
 	{
 		add_error(s, TIMELIB_ERR_UNEXPECTED_CHARACTER, "Unexpected character");
 		goto std;
 	}
-#line 1028 "<stdout>"
+#line 1031 "<stdout>"
 yy6:
 	YYDEBUG(6, *YYCURSOR);
 	yyaccept = 0;
@@ -1036,11 +1039,11 @@ yy6:
 	if (yych <= '9') goto yy57;
 yy7:
 	YYDEBUG(7, *YYCURSOR);
-#line 1803 "parse_date.re"
+#line 1825 "parse_date.re"
 	{
 		goto std;
 	}
-#line 1044 "<stdout>"
+#line 1047 "<stdout>"
 yy8:
 	YYDEBUG(8, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -1577,20 +1580,20 @@ yy17:
 	}
 yy18:
 	YYDEBUG(18, *YYCURSOR);
-#line 1719 "parse_date.re"
+#line 1741 "parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("tzcorrection | tz");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TZ();
-		s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+		s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 		if (tz_not_found) {
 			add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 		}
 		TIMELIB_DEINIT;
 		return TIMELIB_TIMEZONE;
 	}
-#line 1594 "<stdout>"
+#line 1597 "<stdout>"
 yy19:
 	YYDEBUG(19, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -2652,21 +2655,21 @@ yy56:
 					if (yyaccept == 3) {
 						goto yy77;
 					} else {
-						goto yy107;
+						goto yy209;
 					}
 				}
 			} else {
 				if (yyaccept <= 6) {
 					if (yyaccept == 5) {
-						goto yy209;
-					} else {
 						goto yy214;
+					} else {
+						goto yy250;
 					}
 				} else {
 					if (yyaccept == 7) {
-						goto yy250;
+						goto yy281;
 					} else {
-						goto yy280;
+						goto yy279;
 					}
 				}
 			}
@@ -2674,95 +2677,91 @@ yy56:
 			if (yyaccept <= 12) {
 				if (yyaccept <= 10) {
 					if (yyaccept == 9) {
-						goto yy278;
+						goto yy301;
 					} else {
-						goto yy300;
+						goto yy311;
 					}
 				} else {
 					if (yyaccept == 11) {
-						goto yy310;
+						goto yy337;
 					} else {
-						goto yy336;
+						goto yy403;
 					}
 				}
 			} else {
 				if (yyaccept <= 14) {
 					if (yyaccept == 13) {
-						goto yy402;
+						goto yy405;
 					} else {
-						goto yy404;
+						goto yy507;
 					}
 				} else {
 					if (yyaccept == 15) {
-						goto yy506;
+						goto yy548;
 					} else {
-						goto yy547;
+						goto yy700;
 					}
 				}
 			}
 		}
 	} else {
-		if (yyaccept <= 25) {
-			if (yyaccept <= 21) {
-				if (yyaccept <= 19) {
-					if (yyaccept <= 18) {
-						if (yyaccept == 17) {
-							goto yy699;
-						} else {
-							goto yy714;
-						}
+		if (yyaccept <= 24) {
+			if (yyaccept <= 20) {
+				if (yyaccept <= 18) {
+					if (yyaccept == 17) {
+						goto yy716;
 					} else {
-						goto yy727;
+						goto yy729;
 					}
 				} else {
-					if (yyaccept == 20) {
-						goto yy750;
+					if (yyaccept == 19) {
+						goto yy752;
 					} else {
-						goto yy818;
+						goto yy820;
 					}
 				}
 			} else {
-				if (yyaccept <= 23) {
-					if (yyaccept == 22) {
-						goto yy890;
+				if (yyaccept <= 22) {
+					if (yyaccept == 21) {
+						goto yy894;
 					} else {
-						goto yy580;
+						goto yy581;
 					}
 				} else {
-					if (yyaccept == 24) {
-						goto yy906;
+					if (yyaccept == 23) {
+						goto yy910;
 					} else {
-						goto yy940;
+						goto yy944;
 					}
 				}
 			}
 		} else {
-			if (yyaccept <= 29) {
-				if (yyaccept <= 27) {
-					if (yyaccept == 26) {
-						goto yy978;
+			if (yyaccept <= 28) {
+				if (yyaccept <= 26) {
+					if (yyaccept == 25) {
+						goto yy985;
 					} else {
-						goto yy996;
+						goto yy1003;
 					}
 				} else {
-					if (yyaccept == 28) {
-						goto yy1001;
+					if (yyaccept == 27) {
+						goto yy1008;
 					} else {
-						goto yy1055;
+						goto yy1062;
 					}
 				}
 			} else {
-				if (yyaccept <= 31) {
-					if (yyaccept == 30) {
-						goto yy1092;
+				if (yyaccept <= 30) {
+					if (yyaccept == 29) {
+						goto yy1100;
 					} else {
-						goto yy1115;
+						goto yy1123;
 					}
 				} else {
-					if (yyaccept == 32) {
-						goto yy1118;
+					if (yyaccept == 31) {
+						goto yy1126;
 					} else {
-						goto yy1238;
+						goto yy1256;
 					}
 				}
 			}
@@ -3330,18 +3329,18 @@ yy76:
 	}
 yy77:
 	YYDEBUG(77, *YYCURSOR);
-#line 1469 "parse_date.re"
+#line 1491 "parse_date.re"
 	{
 		DEBUG_OUTPUT("datenoyearrev");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		timelib_skip_day_suffix((char **) &ptr);
-		s->time->m = timelib_get_month((char **) &ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		timelib_skip_day_suffix(&ptr);
+		s->time->m = timelib_get_month(&ptr);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 3345 "<stdout>"
+#line 3344 "<stdout>"
 yy78:
 	YYDEBUG(78, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -3786,8 +3785,7 @@ yy104:
 	goto yy56;
 yy105:
 	YYDEBUG(105, *YYCURSOR);
-	yyaccept = 4;
-	YYMARKER = ++YYCURSOR;
+	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
 	YYDEBUG(106, *YYCURSOR);
@@ -3795,9 +3793,8 @@ yy105:
 		goto yy105;
 	}
 	if (yych == '.') goto yy275;
-yy107:
 	YYDEBUG(107, *YYCURSOR);
-#line 1071 "parse_date.re"
+#line 1076 "parse_date.re"
 	{
 		timelib_ull i;
 
@@ -3807,7 +3804,7 @@ yy107:
 		TIMELIB_UNHAVE_TIME();
 		TIMELIB_HAVE_TZ();
 
-		i = timelib_get_unsigned_nr((char **) &ptr, 24);
+		i = timelib_get_unsigned_nr(&ptr, 24);
 		s->time->y = 1970;
 		s->time->m = 1;
 		s->time->d = 1;
@@ -3822,7 +3819,7 @@ yy107:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 3826 "<stdout>"
+#line 3823 "<stdout>"
 yy108:
 	YYDEBUG(108, *YYCURSOR);
 	++YYCURSOR;
@@ -3834,9 +3831,9 @@ yy109:
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'Z') goto yy276;
+		if (yych <= 'Z') goto yy277;
 		if (yych <= '`') goto yy18;
-		if (yych <= 'z') goto yy276;
+		if (yych <= 'z') goto yy277;
 		goto yy18;
 	}
 yy110:
@@ -3848,17 +3845,17 @@ yy110:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'N') goto yy276;
-			goto yy277;
+			if (yych <= 'N') goto yy277;
+			goto yy278;
 		}
 	} else {
 		if (yych <= 'n') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'o') goto yy277;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'o') goto yy278;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -3871,17 +3868,17 @@ yy111:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Q') goto yy276;
-			goto yy279;
+			if (yych <= 'Q') goto yy277;
+			goto yy280;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'r') goto yy279;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'r') goto yy280;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -3894,17 +3891,17 @@ yy112:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'F') goto yy276;
-			goto yy281;
+			if (yych <= 'F') goto yy277;
+			goto yy282;
 		}
 	} else {
 		if (yych <= 'f') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'g') goto yy281;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'g') goto yy282;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -3918,17 +3915,17 @@ yy113:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			goto yy282;
+			goto yy283;
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			goto yy18;
 		} else {
-			if (yych <= '_') goto yy282;
+			if (yych <= '_') goto yy283;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy283;
+			if (yych <= 'z') goto yy284;
 			goto yy18;
 		}
 	}
@@ -3940,25 +3937,25 @@ yy114:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'O') goto yy277;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'O') goto yy278;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'n') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'o') goto yy284;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'o') goto yy285;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -3971,25 +3968,25 @@ yy115:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy279;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'R') goto yy280;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'q') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'r') goto yy285;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'r') goto yy286;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4002,25 +3999,25 @@ yy116:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'G') goto yy281;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'G') goto yy282;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'f') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'g') goto yy286;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'g') goto yy287;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4034,17 +4031,17 @@ yy117:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'B') goto yy276;
-			goto yy287;
+			if (yych <= 'B') goto yy277;
+			goto yy288;
 		}
 	} else {
 		if (yych <= 'b') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'c') goto yy287;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'c') goto yy288;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4056,25 +4053,25 @@ yy118:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'C') goto yy287;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'C') goto yy288;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'b') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'c') goto yy288;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'c') goto yy289;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4088,17 +4085,17 @@ yy119:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'B') goto yy276;
-			goto yy289;
+			if (yych <= 'B') goto yy277;
+			goto yy290;
 		}
 	} else {
 		if (yych <= 'b') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'c') goto yy289;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'c') goto yy290;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4110,25 +4107,25 @@ yy120:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'C') goto yy289;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'C') goto yy290;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'b') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'c') goto yy290;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'c') goto yy291;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4142,17 +4139,17 @@ yy121:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'F') goto yy276;
-			goto yy291;
+			if (yych <= 'F') goto yy277;
+			goto yy292;
 		}
 	} else {
 		if (yych <= 'f') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'g') goto yy291;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'g') goto yy292;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4165,17 +4162,17 @@ yy122:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'D') goto yy276;
-			goto yy292;
+			if (yych <= 'D') goto yy277;
+			goto yy293;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'e') goto yy292;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'e') goto yy293;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4187,25 +4184,25 @@ yy123:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'G') goto yy291;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'G') goto yy292;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'f') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'g') goto yy293;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'g') goto yy294;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4218,25 +4215,25 @@ yy124:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy292;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'E') goto yy293;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'd') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'e') goto yy294;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'e') goto yy295;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4250,17 +4247,17 @@ yy125:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'A') goto yy276;
-			goto yy295;
+			if (yych <= 'A') goto yy277;
+			goto yy296;
 		}
 	} else {
 		if (yych <= 'a') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'b') goto yy295;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'b') goto yy296;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4272,19 +4269,19 @@ yy126:
 			if (yych == ')') goto yy108;
 			goto yy18;
 		} else {
-			if (yych == 'F') goto yy296;
-			if (yych <= 'Q') goto yy276;
-			goto yy297;
+			if (yych == 'F') goto yy297;
+			if (yych <= 'Q') goto yy277;
+			goto yy298;
 		}
 	} else {
 		if (yych <= 'f') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'e') goto yy276;
-			goto yy296;
+			if (yych <= 'e') goto yy277;
+			goto yy297;
 		} else {
-			if (yych == 'r') goto yy297;
-			if (yych <= 'z') goto yy276;
+			if (yych == 'r') goto yy298;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4297,17 +4294,17 @@ yy127:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'T') goto yy276;
-			goto yy298;
+			if (yych <= 'T') goto yy277;
+			goto yy299;
 		}
 	} else {
 		if (yych <= 't') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'u') goto yy298;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'u') goto yy299;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4319,19 +4316,19 @@ yy128:
 			if (yych == ')') goto yy108;
 			goto yy18;
 		} else {
-			if (yych == 'I') goto yy299;
-			if (yych <= 'N') goto yy276;
-			goto yy301;
+			if (yych == 'I') goto yy300;
+			if (yych <= 'N') goto yy277;
+			goto yy302;
 		}
 	} else {
 		if (yych <= 'i') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'h') goto yy276;
-			goto yy299;
+			if (yych <= 'h') goto yy277;
+			goto yy300;
 		} else {
-			if (yych == 'o') goto yy301;
-			if (yych <= 'z') goto yy276;
+			if (yych == 'o') goto yy302;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4343,25 +4340,25 @@ yy129:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'B') goto yy295;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'B') goto yy296;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'a') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'b') goto yy302;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'b') goto yy303;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4376,34 +4373,34 @@ yy130:
 				if (yych <= '(') goto yy18;
 				goto yy108;
 			} else {
-				if (yych == '-') goto yy282;
+				if (yych == '-') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy282;
+				if (yych <= '/') goto yy283;
 				goto yy18;
 			} else {
-				if (yych == 'F') goto yy296;
-				goto yy276;
+				if (yych == 'F') goto yy297;
+				goto yy277;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'R') goto yy297;
-				goto yy276;
+				if (yych <= 'R') goto yy298;
+				goto yy277;
 			} else {
-				if (yych == '_') goto yy282;
+				if (yych == '_') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= 'q') {
-				if (yych == 'f') goto yy303;
-				goto yy283;
+				if (yych == 'f') goto yy304;
+				goto yy284;
 			} else {
-				if (yych <= 'r') goto yy304;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'r') goto yy305;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4416,25 +4413,25 @@ yy131:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'U') goto yy298;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'U') goto yy299;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 't') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'u') goto yy305;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'u') goto yy306;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4449,34 +4446,34 @@ yy132:
 				if (yych <= '(') goto yy18;
 				goto yy108;
 			} else {
-				if (yych == '-') goto yy282;
+				if (yych == '-') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy282;
+				if (yych <= '/') goto yy283;
 				goto yy18;
 			} else {
-				if (yych == 'I') goto yy299;
-				goto yy276;
+				if (yych == 'I') goto yy300;
+				goto yy277;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'O') goto yy301;
-				goto yy276;
+				if (yych <= 'O') goto yy302;
+				goto yy277;
 			} else {
-				if (yych == '_') goto yy282;
+				if (yych == '_') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= 'n') {
-				if (yych == 'i') goto yy306;
-				goto yy283;
+				if (yych == 'i') goto yy307;
+				goto yy284;
 			} else {
-				if (yych <= 'o') goto yy307;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'o') goto yy308;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4487,14 +4484,14 @@ yy133:
 	if (yych <= 'S') {
 		if (yych == ')') goto yy108;
 		if (yych <= '@') goto yy18;
-		goto yy276;
+		goto yy277;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= 'T') goto yy308;
-			goto yy276;
+			if (yych <= 'T') goto yy309;
+			goto yy277;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4519,40 +4516,40 @@ yy136:
 	if (yych <= '9') {
 		if (yych <= ' ') {
 			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy309;
+				if (yych <= 0x00) goto yy310;
 				goto yy56;
 			} else {
-				if (yych <= '\t') goto yy311;
+				if (yych <= '\t') goto yy312;
 				if (yych <= 0x1F) goto yy56;
-				goto yy311;
+				goto yy312;
 			}
 		} else {
 			if (yych <= '-') {
-				if (yych == ',') goto yy311;
+				if (yych == ',') goto yy312;
 				goto yy56;
 			} else {
-				if (yych <= '.') goto yy311;
+				if (yych <= '.') goto yy312;
 				if (yych <= '/') goto yy56;
-				goto yy313;
+				goto yy314;
 			}
 		}
 	} else {
 		if (yych <= 'm') {
 			if (yych <= 'd') {
 				if (yych <= 'c') goto yy56;
-				goto yy311;
+				goto yy312;
 			} else {
-				if (yych == 'h') goto yy311;
+				if (yych == 'h') goto yy312;
 				goto yy56;
 			}
 		} else {
 			if (yych <= 'r') {
-				if (yych <= 'n') goto yy314;
+				if (yych <= 'n') goto yy315;
 				if (yych <= 'q') goto yy56;
-				goto yy314;
+				goto yy315;
 			} else {
-				if (yych <= 's') goto yy315;
-				if (yych <= 't') goto yy316;
+				if (yych <= 's') goto yy316;
+				if (yych <= 't') goto yy317;
 				goto yy56;
 			}
 		}
@@ -4563,41 +4560,41 @@ yy137:
 	if (yych <= '1') {
 		if (yych <= ' ') {
 			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy309;
+				if (yych <= 0x00) goto yy310;
 				goto yy56;
 			} else {
-				if (yych <= '\t') goto yy311;
+				if (yych <= '\t') goto yy312;
 				if (yych <= 0x1F) goto yy56;
-				goto yy311;
+				goto yy312;
 			}
 		} else {
 			if (yych <= '-') {
-				if (yych == ',') goto yy311;
+				if (yych == ',') goto yy312;
 				goto yy56;
 			} else {
-				if (yych <= '.') goto yy311;
+				if (yych <= '.') goto yy312;
 				if (yych <= '/') goto yy56;
-				goto yy313;
+				goto yy314;
 			}
 		}
 	} else {
 		if (yych <= 'm') {
 			if (yych <= 'd') {
-				if (yych <= '9') goto yy317;
+				if (yych <= '9') goto yy318;
 				if (yych <= 'c') goto yy56;
-				goto yy311;
+				goto yy312;
 			} else {
-				if (yych == 'h') goto yy311;
+				if (yych == 'h') goto yy312;
 				goto yy56;
 			}
 		} else {
 			if (yych <= 'r') {
-				if (yych <= 'n') goto yy314;
+				if (yych <= 'n') goto yy315;
 				if (yych <= 'q') goto yy56;
-				goto yy314;
+				goto yy315;
 			} else {
-				if (yych <= 's') goto yy315;
-				if (yych <= 't') goto yy316;
+				if (yych <= 's') goto yy316;
+				if (yych <= 't') goto yy317;
 				goto yy56;
 			}
 		}
@@ -4608,40 +4605,40 @@ yy138:
 	if (yych <= '9') {
 		if (yych <= ' ') {
 			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy309;
+				if (yych <= 0x00) goto yy310;
 				goto yy56;
 			} else {
-				if (yych <= '\t') goto yy311;
+				if (yych <= '\t') goto yy312;
 				if (yych <= 0x1F) goto yy56;
-				goto yy311;
+				goto yy312;
 			}
 		} else {
 			if (yych <= '-') {
-				if (yych == ',') goto yy311;
+				if (yych == ',') goto yy312;
 				goto yy56;
 			} else {
-				if (yych <= '.') goto yy311;
+				if (yych <= '.') goto yy312;
 				if (yych <= '/') goto yy56;
-				goto yy317;
+				goto yy318;
 			}
 		}
 	} else {
 		if (yych <= 'm') {
 			if (yych <= 'd') {
 				if (yych <= 'c') goto yy56;
-				goto yy311;
+				goto yy312;
 			} else {
-				if (yych == 'h') goto yy311;
+				if (yych == 'h') goto yy312;
 				goto yy56;
 			}
 		} else {
 			if (yych <= 'r') {
-				if (yych <= 'n') goto yy314;
+				if (yych <= 'n') goto yy315;
 				if (yych <= 'q') goto yy56;
-				goto yy314;
+				goto yy315;
 			} else {
-				if (yych <= 's') goto yy315;
-				if (yych <= 't') goto yy316;
+				if (yych <= 's') goto yy316;
+				if (yych <= 't') goto yy317;
 				goto yy56;
 			}
 		}
@@ -4665,14 +4662,14 @@ yy139:
 			if (yych <= '/') goto yy18;
 			if (yych <= '9') goto yy135;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
 			if (yych <= 'Z') {
-				if (yych <= 'I') goto yy318;
-				goto yy276;
+				if (yych <= 'I') goto yy319;
+				goto yy277;
 			} else {
 				if (yych <= '`') goto yy18;
-				if (yych <= 'z') goto yy276;
+				if (yych <= 'z') goto yy277;
 				goto yy18;
 			}
 		}
@@ -4696,9 +4693,9 @@ yy140:
 			if (yych <= '9') goto yy135;
 			goto yy18;
 		} else {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4711,17 +4708,17 @@ yy141:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'M') goto yy276;
-			goto yy319;
+			if (yych <= 'M') goto yy277;
+			goto yy320;
 		}
 	} else {
 		if (yych <= 'm') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'n') goto yy319;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'n') goto yy320;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4733,19 +4730,19 @@ yy142:
 			if (yych == ')') goto yy108;
 			goto yy18;
 		} else {
-			if (yych == 'L') goto yy320;
-			if (yych <= 'M') goto yy276;
-			goto yy321;
+			if (yych == 'L') goto yy321;
+			if (yych <= 'M') goto yy277;
+			goto yy322;
 		}
 	} else {
 		if (yych <= 'l') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'k') goto yy276;
-			goto yy320;
+			if (yych <= 'k') goto yy277;
+			goto yy321;
 		} else {
-			if (yych == 'n') goto yy321;
-			if (yych <= 'z') goto yy276;
+			if (yych == 'n') goto yy322;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4757,25 +4754,25 @@ yy143:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy319;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'N') goto yy320;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'm') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'n') goto yy322;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'n') goto yy323;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4790,34 +4787,34 @@ yy144:
 				if (yych <= '(') goto yy18;
 				goto yy108;
 			} else {
-				if (yych == '-') goto yy282;
+				if (yych == '-') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy282;
+				if (yych <= '/') goto yy283;
 				goto yy18;
 			} else {
-				if (yych == 'L') goto yy320;
-				goto yy276;
+				if (yych == 'L') goto yy321;
+				goto yy277;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'N') goto yy321;
-				goto yy276;
+				if (yych <= 'N') goto yy322;
+				goto yy277;
 			} else {
-				if (yych == '_') goto yy282;
+				if (yych == '_') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= 'm') {
-				if (yych == 'l') goto yy323;
-				goto yy283;
+				if (yych == 'l') goto yy324;
+				goto yy284;
 			} else {
-				if (yych <= 'n') goto yy324;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'n') goto yy325;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4831,17 +4828,17 @@ yy145:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'R') goto yy276;
-			goto yy325;
+			if (yych <= 'R') goto yy277;
+			goto yy326;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 's') goto yy325;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 's') goto yy326;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4853,25 +4850,25 @@ yy146:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy325;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'S') goto yy326;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'r') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 's') goto yy326;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 's') goto yy327;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4884,19 +4881,19 @@ yy147:
 			if (yych == ')') goto yy108;
 			goto yy18;
 		} else {
-			if (yych == 'R') goto yy327;
-			if (yych <= 'X') goto yy276;
-			goto yy328;
+			if (yych == 'R') goto yy328;
+			if (yych <= 'X') goto yy277;
+			goto yy329;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'q') goto yy276;
-			goto yy327;
+			if (yych <= 'q') goto yy277;
+			goto yy328;
 		} else {
-			if (yych == 'y') goto yy328;
-			if (yych <= 'z') goto yy276;
+			if (yych == 'y') goto yy329;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4909,17 +4906,17 @@ yy148:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'C') goto yy276;
-			goto yy329;
+			if (yych <= 'C') goto yy277;
+			goto yy330;
 		}
 	} else {
 		if (yych <= 'c') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'd') goto yy329;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'd') goto yy330;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4932,17 +4929,17 @@ yy149:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'M') goto yy276;
-			goto yy299;
+			if (yych <= 'M') goto yy277;
+			goto yy300;
 		}
 	} else {
 		if (yych <= 'm') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'n') goto yy299;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'n') goto yy300;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -4956,34 +4953,34 @@ yy150:
 				if (yych <= '(') goto yy18;
 				goto yy108;
 			} else {
-				if (yych == '-') goto yy282;
+				if (yych == '-') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy282;
+				if (yych <= '/') goto yy283;
 				goto yy18;
 			} else {
-				if (yych == 'R') goto yy327;
-				goto yy276;
+				if (yych == 'R') goto yy328;
+				goto yy277;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'Y') goto yy328;
-				goto yy276;
+				if (yych <= 'Y') goto yy329;
+				goto yy277;
 			} else {
-				if (yych == '_') goto yy282;
+				if (yych == '_') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= 'x') {
-				if (yych == 'r') goto yy330;
-				goto yy283;
+				if (yych == 'r') goto yy331;
+				goto yy284;
 			} else {
-				if (yych <= 'y') goto yy331;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'y') goto yy332;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -4996,25 +4993,25 @@ yy151:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy329;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'D') goto yy330;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'c') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'd') goto yy332;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'd') goto yy333;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5027,25 +5024,25 @@ yy152:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy299;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'N') goto yy300;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'm') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'n') goto yy306;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'n') goto yy307;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5059,17 +5056,17 @@ yy153:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'W') goto yy276;
-			goto yy333;
+			if (yych <= 'W') goto yy277;
+			goto yy334;
 		}
 	} else {
 		if (yych <= 'w') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'x') goto yy333;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'x') goto yy334;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5082,17 +5079,17 @@ yy154:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'M') goto yy276;
-			goto yy296;
+			if (yych <= 'M') goto yy277;
+			goto yy297;
 		}
 	} else {
 		if (yych <= 'm') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'n') goto yy296;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'n') goto yy297;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5103,26 +5100,26 @@ yy155:
 		if (yych <= 'N') {
 			if (yych == ')') goto yy108;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'O') goto yy334;
-			if (yych <= 'U') goto yy276;
-			if (yych <= 'V') goto yy289;
-			goto yy335;
+			if (yych <= 'O') goto yy335;
+			if (yych <= 'U') goto yy277;
+			if (yych <= 'V') goto yy290;
+			goto yy336;
 		}
 	} else {
 		if (yych <= 'o') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'n') goto yy276;
-			goto yy334;
+			if (yych <= 'n') goto yy277;
+			goto yy335;
 		} else {
 			if (yych <= 'v') {
-				if (yych <= 'u') goto yy276;
-				goto yy289;
+				if (yych <= 'u') goto yy277;
+				goto yy290;
 			} else {
-				if (yych <= 'w') goto yy335;
-				if (yych <= 'z') goto yy276;
+				if (yych <= 'w') goto yy336;
+				if (yych <= 'z') goto yy277;
 				goto yy18;
 			}
 		}
@@ -5135,25 +5132,25 @@ yy156:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'X') goto yy333;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'X') goto yy334;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'w') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'x') goto yy337;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'x') goto yy338;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5166,25 +5163,25 @@ yy157:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy296;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'N') goto yy297;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'm') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'n') goto yy303;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'n') goto yy304;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5199,39 +5196,39 @@ yy158:
 				if (yych <= '(') goto yy18;
 				goto yy108;
 			} else {
-				if (yych == '-') goto yy282;
+				if (yych == '-') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= 'N') {
-				if (yych <= '/') goto yy282;
+				if (yych <= '/') goto yy283;
 				if (yych <= '@') goto yy18;
-				goto yy276;
+				goto yy277;
 			} else {
-				if (yych <= 'O') goto yy334;
-				if (yych <= 'U') goto yy276;
-				goto yy289;
+				if (yych <= 'O') goto yy335;
+				if (yych <= 'U') goto yy277;
+				goto yy290;
 			}
 		}
 	} else {
 		if (yych <= 'n') {
 			if (yych <= '^') {
-				if (yych <= 'W') goto yy335;
-				if (yych <= 'Z') goto yy276;
+				if (yych <= 'W') goto yy336;
+				if (yych <= 'Z') goto yy277;
 				goto yy18;
 			} else {
-				if (yych <= '_') goto yy282;
+				if (yych <= '_') goto yy283;
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			}
 		} else {
 			if (yych <= 'v') {
-				if (yych <= 'o') goto yy338;
-				if (yych <= 'u') goto yy283;
-				goto yy290;
+				if (yych <= 'o') goto yy339;
+				if (yych <= 'u') goto yy284;
+				goto yy291;
 			} else {
-				if (yych <= 'w') goto yy339;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'w') goto yy340;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5245,17 +5242,17 @@ yy159:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy276;
-			goto yy340;
+			if (yych <= 'S') goto yy277;
+			goto yy341;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 't') goto yy340;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 't') goto yy341;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5267,25 +5264,25 @@ yy160:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy340;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'T') goto yy341;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 't') goto yy341;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 't') goto yy342;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5299,17 +5296,17 @@ yy161:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'D') goto yy276;
-			goto yy342;
+			if (yych <= 'D') goto yy277;
+			goto yy343;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'e') goto yy342;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'e') goto yy343;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5321,25 +5318,25 @@ yy162:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy342;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'E') goto yy343;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'd') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'e') goto yy343;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'e') goto yy344;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5353,17 +5350,17 @@ yy163:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy276;
-			goto yy344;
+			if (yych <= 'S') goto yy277;
+			goto yy345;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 't') goto yy344;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 't') goto yy345;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5374,33 +5371,33 @@ yy164:
 		if (yych <= 'B') {
 			if (yych == ')') goto yy108;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
 			if (yych <= 'O') {
-				if (yych <= 'C') goto yy345;
-				goto yy276;
+				if (yych <= 'C') goto yy346;
+				goto yy277;
 			} else {
-				if (yych <= 'P') goto yy346;
-				if (yych <= 'U') goto yy276;
-				goto yy347;
+				if (yych <= 'P') goto yy347;
+				if (yych <= 'U') goto yy277;
+				goto yy348;
 			}
 		}
 	} else {
 		if (yych <= 'o') {
 			if (yych <= '`') {
-				if (yych <= 'Z') goto yy276;
+				if (yych <= 'Z') goto yy277;
 				goto yy18;
 			} else {
-				if (yych == 'c') goto yy345;
-				goto yy276;
+				if (yych == 'c') goto yy346;
+				goto yy277;
 			}
 		} else {
 			if (yych <= 'u') {
-				if (yych <= 'p') goto yy346;
-				goto yy276;
+				if (yych <= 'p') goto yy347;
+				goto yy277;
 			} else {
-				if (yych <= 'v') goto yy347;
-				if (yych <= 'z') goto yy276;
+				if (yych <= 'v') goto yy348;
+				if (yych <= 'z') goto yy277;
 				goto yy18;
 			}
 		}
@@ -5414,17 +5411,17 @@ yy165:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'W') goto yy276;
-			goto yy296;
+			if (yych <= 'W') goto yy277;
+			goto yy297;
 		}
 	} else {
 		if (yych <= 'w') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'x') goto yy296;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'x') goto yy297;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5436,25 +5433,25 @@ yy166:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy344;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'T') goto yy345;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 't') goto yy348;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 't') goto yy349;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5470,37 +5467,37 @@ yy167:
 				goto yy18;
 			} else {
 				if (yych == '.') goto yy18;
-				goto yy282;
+				goto yy283;
 			}
 		} else {
 			if (yych <= 'C') {
 				if (yych <= '@') goto yy18;
-				if (yych <= 'B') goto yy276;
-				goto yy345;
+				if (yych <= 'B') goto yy277;
+				goto yy346;
 			} else {
-				if (yych == 'P') goto yy346;
-				goto yy276;
+				if (yych == 'P') goto yy347;
+				goto yy277;
 			}
 		}
 	} else {
 		if (yych <= 'b') {
 			if (yych <= '^') {
-				if (yych <= 'V') goto yy347;
-				if (yych <= 'Z') goto yy276;
+				if (yych <= 'V') goto yy348;
+				if (yych <= 'Z') goto yy277;
 				goto yy18;
 			} else {
-				if (yych <= '_') goto yy282;
+				if (yych <= '_') goto yy283;
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			}
 		} else {
 			if (yych <= 'p') {
-				if (yych <= 'c') goto yy349;
-				if (yych <= 'o') goto yy283;
-				goto yy350;
+				if (yych <= 'c') goto yy350;
+				if (yych <= 'o') goto yy284;
+				goto yy351;
 			} else {
-				if (yych == 'v') goto yy351;
-				if (yych <= 'z') goto yy283;
+				if (yych == 'v') goto yy352;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5513,25 +5510,25 @@ yy168:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'X') goto yy296;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'X') goto yy297;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'w') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'x') goto yy303;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'x') goto yy304;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5543,7 +5540,7 @@ yy169:
 		if (yych == '.') goto yy71;
 		goto yy56;
 	} else {
-		if (yych <= '9') goto yy352;
+		if (yych <= '9') goto yy353;
 		if (yych <= ':') goto yy71;
 		goto yy56;
 	}
@@ -5554,7 +5551,7 @@ yy170:
 		if (yych == '.') goto yy71;
 		goto yy56;
 	} else {
-		if (yych <= '4') goto yy352;
+		if (yych <= '4') goto yy353;
 		if (yych == ':') goto yy71;
 		goto yy56;
 	}
@@ -5572,19 +5569,19 @@ yy172:
 			if (yych == ')') goto yy108;
 			goto yy18;
 		} else {
-			if (yych == 'I') goto yy353;
-			if (yych <= 'T') goto yy276;
-			goto yy354;
+			if (yych == 'I') goto yy354;
+			if (yych <= 'T') goto yy277;
+			goto yy355;
 		}
 	} else {
 		if (yych <= 'i') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'h') goto yy276;
-			goto yy353;
+			if (yych <= 'h') goto yy277;
+			goto yy354;
 		} else {
-			if (yych == 'u') goto yy354;
-			if (yych <= 'z') goto yy276;
+			if (yych == 'u') goto yy355;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5596,19 +5593,19 @@ yy173:
 			if (yych == ')') goto yy108;
 			goto yy18;
 		} else {
-			if (yych == 'D') goto yy355;
-			if (yych <= 'L') goto yy276;
-			goto yy356;
+			if (yych == 'D') goto yy356;
+			if (yych <= 'L') goto yy277;
+			goto yy357;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'c') goto yy276;
-			goto yy355;
+			if (yych <= 'c') goto yy277;
+			goto yy356;
 		} else {
-			if (yych == 'm') goto yy356;
-			if (yych <= 'z') goto yy276;
+			if (yych == 'm') goto yy357;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5621,17 +5618,17 @@ yy174:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'D') goto yy276;
-			goto yy357;
+			if (yych <= 'D') goto yy277;
+			goto yy358;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'e') goto yy357;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'e') goto yy358;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5644,17 +5641,17 @@ yy175:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'D') goto yy276;
-			goto yy358;
+			if (yych <= 'D') goto yy277;
+			goto yy359;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'e') goto yy358;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'e') goto yy359;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5668,34 +5665,34 @@ yy176:
 				if (yych <= '(') goto yy18;
 				goto yy108;
 			} else {
-				if (yych == '-') goto yy282;
+				if (yych == '-') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy282;
+				if (yych <= '/') goto yy283;
 				goto yy18;
 			} else {
-				if (yych == 'I') goto yy353;
-				goto yy276;
+				if (yych == 'I') goto yy354;
+				goto yy277;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'U') goto yy354;
-				goto yy276;
+				if (yych <= 'U') goto yy355;
+				goto yy277;
 			} else {
-				if (yych == '_') goto yy282;
+				if (yych == '_') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= 't') {
-				if (yych == 'i') goto yy359;
-				goto yy283;
+				if (yych == 'i') goto yy360;
+				goto yy284;
 			} else {
-				if (yych <= 'u') goto yy360;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'u') goto yy361;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5710,34 +5707,34 @@ yy177:
 				if (yych <= '(') goto yy18;
 				goto yy108;
 			} else {
-				if (yych == '-') goto yy282;
+				if (yych == '-') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= '@') {
-				if (yych <= '/') goto yy282;
+				if (yych <= '/') goto yy283;
 				goto yy18;
 			} else {
-				if (yych == 'D') goto yy355;
-				goto yy276;
+				if (yych == 'D') goto yy356;
+				goto yy277;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'M') goto yy356;
-				goto yy276;
+				if (yych <= 'M') goto yy357;
+				goto yy277;
 			} else {
-				if (yych == '_') goto yy282;
+				if (yych == '_') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= 'l') {
-				if (yych == 'd') goto yy361;
-				goto yy283;
+				if (yych == 'd') goto yy362;
+				goto yy284;
 			} else {
-				if (yych <= 'm') goto yy362;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'm') goto yy363;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5750,25 +5747,25 @@ yy178:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy357;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'E') goto yy358;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'd') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'e') goto yy363;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'e') goto yy364;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5781,25 +5778,25 @@ yy179:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy358;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'E') goto yy359;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'd') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 'e') goto yy364;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'e') goto yy365;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5823,14 +5820,14 @@ yy180:
 			if (yych <= '/') goto yy18;
 			if (yych <= '9') goto yy135;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
 			if (yych <= 'Z') {
-				if (yych <= 'I') goto yy365;
-				goto yy276;
+				if (yych <= 'I') goto yy366;
+				goto yy277;
 			} else {
 				if (yych <= '`') goto yy18;
-				if (yych <= 'z') goto yy276;
+				if (yych <= 'z') goto yy277;
 				goto yy18;
 			}
 		}
@@ -5843,19 +5840,19 @@ yy181:
 			if (yych == ')') goto yy108;
 			goto yy18;
 		} else {
-			if (yych <= 'C') goto yy276;
-			if (yych <= 'D') goto yy366;
-			goto yy367;
+			if (yych <= 'C') goto yy277;
+			if (yych <= 'D') goto yy367;
+			goto yy368;
 		}
 	} else {
 		if (yych <= 'c') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 'd') goto yy366;
-			if (yych <= 'e') goto yy367;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 'd') goto yy367;
+			if (yych <= 'e') goto yy368;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5867,33 +5864,33 @@ yy182:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= '/') {
 				if (yych <= '.') goto yy18;
-				goto yy282;
+				goto yy283;
 			} else {
 				if (yych <= '@') goto yy18;
-				if (yych <= 'C') goto yy276;
-				goto yy366;
+				if (yych <= 'C') goto yy277;
+				goto yy367;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'E') goto yy367;
-				goto yy276;
+				if (yych <= 'E') goto yy368;
+				goto yy277;
 			} else {
-				if (yych == '_') goto yy282;
+				if (yych == '_') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= 'd') {
-				if (yych <= 'c') goto yy283;
-				goto yy368;
+				if (yych <= 'c') goto yy284;
+				goto yy369;
 			} else {
-				if (yych <= 'e') goto yy369;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 'e') goto yy370;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -5907,17 +5904,17 @@ yy183:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'R') goto yy276;
-			goto yy370;
+			if (yych <= 'R') goto yy277;
+			goto yy371;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '`') goto yy18;
-			goto yy276;
+			goto yy277;
 		} else {
-			if (yych <= 's') goto yy370;
-			if (yych <= 'z') goto yy276;
+			if (yych <= 's') goto yy371;
+			if (yych <= 'z') goto yy277;
 			goto yy18;
 		}
 	}
@@ -5929,25 +5926,25 @@ yy184:
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy276;
+			goto yy277;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy370;
-			if (yych <= 'Z') goto yy276;
+			if (yych <= 'S') goto yy371;
+			if (yych <= 'Z') goto yy277;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'r') {
 				if (yych <= '`') goto yy18;
-				goto yy283;
+				goto yy284;
 			} else {
-				if (yych <= 's') goto yy371;
-				if (yych <= 'z') goto yy283;
+				if (yych <= 's') goto yy372;
+				if (yych <= 'z') goto yy284;
 				goto yy18;
 			}
 		}
@@ -6039,7 +6036,7 @@ yy187:
 	YYDEBUG(187, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy372;
+	if (yych <= '9') goto yy373;
 	goto yy186;
 yy188:
 	YYDEBUG(188, *YYCURSOR);
@@ -6093,7 +6090,7 @@ yy191:
 			if (yych == 'A') goto yy253;
 			goto yy56;
 		} else {
-			if (yych <= 'E') goto yy373;
+			if (yych <= 'E') goto yy374;
 			if (yych <= 'T') goto yy56;
 			goto yy255;
 		}
@@ -6102,7 +6099,7 @@ yy191:
 			if (yych == 'a') goto yy253;
 			goto yy56;
 		} else {
-			if (yych <= 'e') goto yy373;
+			if (yych <= 'e') goto yy374;
 			if (yych == 'u') goto yy255;
 			goto yy56;
 		}
@@ -6120,9 +6117,9 @@ yy192:
 			} else {
 				if (yych <= '5') {
 					if (yych <= '/') goto yy18;
-					goto yy374;
+					goto yy375;
 				} else {
-					if (yych <= '9') goto yy375;
+					if (yych <= '9') goto yy376;
 					if (yych >= ';') goto yy18;
 				}
 			}
@@ -6190,7 +6187,7 @@ yy193:
 	YYDEBUG(193, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy18;
-	if (yych <= '5') goto yy376;
+	if (yych <= '5') goto yy377;
 	if (yych <= '9') goto yy108;
 	goto yy18;
 yy194:
@@ -6206,7 +6203,7 @@ yy194:
 			} else {
 				if (yych <= '9') {
 					if (yych <= '/') goto yy18;
-					goto yy375;
+					goto yy376;
 				} else {
 					if (yych == 'D') goto yy186;
 					goto yy18;
@@ -6275,7 +6272,7 @@ yy195:
 			} else {
 				if (yych <= '9') {
 					if (yych <= '/') goto yy18;
-					goto yy377;
+					goto yy378;
 				} else {
 					if (yych == 'D') goto yy186;
 					goto yy18;
@@ -6369,8 +6366,8 @@ yy198:
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy378;
-		goto yy379;
+		if (yych <= '-') goto yy379;
+		goto yy380;
 	} else {
 		if (yych <= '/') goto yy56;
 		if (yych <= '9') goto yy200;
@@ -6381,8 +6378,8 @@ yy199:
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy378;
-		goto yy379;
+		if (yych <= '-') goto yy379;
+		goto yy380;
 	} else {
 		if (yych <= '/') goto yy56;
 		if (yych >= '3') goto yy56;
@@ -6391,16 +6388,16 @@ yy200:
 	YYDEBUG(200, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= ',') goto yy56;
-	if (yych <= '-') goto yy378;
-	if (yych <= '.') goto yy379;
+	if (yych <= '-') goto yy379;
+	if (yych <= '.') goto yy380;
 	goto yy56;
 yy201:
 	YYDEBUG(201, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy380;
-		goto yy378;
+		if (yych <= '-') goto yy381;
+		goto yy379;
 	} else {
 		if (yych <= '/') goto yy56;
 		if (yych <= '9') goto yy203;
@@ -6411,8 +6408,8 @@ yy202:
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy380;
-		goto yy378;
+		if (yych <= '-') goto yy381;
+		goto yy379;
 	} else {
 		if (yych <= '/') goto yy56;
 		if (yych >= '3') goto yy56;
@@ -6421,8 +6418,8 @@ yy203:
 	YYDEBUG(203, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= ',') goto yy56;
-	if (yych <= '-') goto yy380;
-	if (yych <= '.') goto yy378;
+	if (yych <= '-') goto yy381;
+	if (yych <= '.') goto yy379;
 	goto yy56;
 yy204:
 	YYDEBUG(204, *YYCURSOR);
@@ -6445,42 +6442,42 @@ yy206:
 yy207:
 	YYDEBUG(207, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy381;
-	if (yych == 'e') goto yy381;
+	if (yych == 'E') goto yy382;
+	if (yych == 'e') goto yy382;
 	goto yy56;
 yy208:
 	YYDEBUG(208, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= ',') goto yy209;
-		if (yych <= '-') goto yy378;
-		goto yy382;
+		if (yych <= '-') goto yy379;
+		goto yy383;
 	} else {
 		if (yych <= '/') goto yy209;
 		if (yych <= '9') goto yy212;
-		if (yych <= ':') goto yy383;
+		if (yych <= ':') goto yy384;
 	}
 yy209:
 	YYDEBUG(209, *YYCURSOR);
-#line 1224 "parse_date.re"
+#line 1234 "parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
 		if (*ptr == ':' || *ptr == '.') {
-			s->time->s = timelib_get_nr((char **) &ptr, 2);
+			s->time->s = timelib_get_nr(&ptr, 2);
 
 			if (*ptr == '.') {
-				s->time->us = timelib_get_frac_nr((char **) &ptr, 8);
+				s->time->us = timelib_get_frac_nr(&ptr, 8);
 			}
 		}
 
 		if (*ptr != '\0') {
-			s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+			s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 			if (tz_not_found) {
 				add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 			}
@@ -6488,123 +6485,123 @@ yy209:
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 6492 "<stdout>"
+#line 6489 "<stdout>"
 yy210:
 	YYDEBUG(210, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') goto yy209;
-		if (yych <= '-') goto yy378;
-		if (yych <= '.') goto yy382;
+		if (yych <= '-') goto yy379;
+		if (yych <= '.') goto yy383;
 		goto yy209;
 	} else {
 		if (yych <= '2') goto yy212;
 		if (yych <= '9') goto yy229;
-		if (yych <= ':') goto yy383;
+		if (yych <= ':') goto yy384;
 		goto yy209;
 	}
 yy211:
 	YYDEBUG(211, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= ',') goto yy209;
-		if (yych <= '-') goto yy378;
-		goto yy382;
+		if (yych <= '-') goto yy379;
+		goto yy383;
 	} else {
 		if (yych <= '/') goto yy209;
 		if (yych <= '9') goto yy229;
-		if (yych <= ':') goto yy383;
+		if (yych <= ':') goto yy384;
 		goto yy209;
 	}
 yy212:
 	YYDEBUG(212, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= ',') goto yy209;
-		if (yych <= '-') goto yy378;
-		goto yy382;
+		if (yych <= '-') goto yy379;
+		goto yy383;
 	} else {
-		if (yych == ':') goto yy383;
+		if (yych == ':') goto yy384;
 		goto yy209;
 	}
 yy213:
 	YYDEBUG(213, *YYCURSOR);
-	yyaccept = 6;
+	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
 		if (yych <= '/') {
-			if (yych >= '/') goto yy384;
+			if (yych >= '/') goto yy385;
 		} else {
 			if (yych <= '9') goto yy216;
-			if (yych >= 'n') goto yy385;
+			if (yych >= 'n') goto yy386;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych >= 'r') goto yy385;
+			if (yych >= 'r') goto yy386;
 		} else {
-			if (yych <= 's') goto yy386;
-			if (yych <= 't') goto yy387;
+			if (yych <= 's') goto yy387;
+			if (yych <= 't') goto yy388;
 		}
 	}
 yy214:
 	YYDEBUG(214, *YYCURSOR);
-#line 1316 "parse_date.re"
+#line 1326 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("americanshort | american");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		if (*ptr == '/') {
-			s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
+			s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
 			TIMELIB_PROCESS_YEAR(s->time->y, length);
 		}
 		TIMELIB_DEINIT;
 		return TIMELIB_AMERICAN;
 	}
-#line 6570 "<stdout>"
+#line 6567 "<stdout>"
 yy215:
 	YYDEBUG(215, *YYCURSOR);
-	yyaccept = 6;
+	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
 		if (yych <= '/') {
 			if (yych <= '.') goto yy214;
-			goto yy384;
+			goto yy385;
 		} else {
 			if (yych <= '1') goto yy216;
 			if (yych <= 'm') goto yy214;
-			goto yy385;
+			goto yy386;
 		}
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy214;
-			goto yy385;
+			goto yy386;
 		} else {
-			if (yych <= 's') goto yy386;
-			if (yych <= 't') goto yy387;
+			if (yych <= 's') goto yy387;
+			if (yych <= 't') goto yy388;
 			goto yy214;
 		}
 	}
 yy216:
 	YYDEBUG(216, *YYCURSOR);
-	yyaccept = 6;
+	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych == '/') goto yy384;
+		if (yych == '/') goto yy385;
 		if (yych <= 'm') goto yy214;
-		goto yy385;
+		goto yy386;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy214;
-			goto yy385;
+			goto yy386;
 		} else {
-			if (yych <= 's') goto yy386;
-			if (yych <= 't') goto yy387;
+			if (yych <= 's') goto yy387;
+			if (yych <= 't') goto yy388;
 			goto yy214;
 		}
 	}
@@ -6612,158 +6609,158 @@ yy217:
 	YYDEBUG(217, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'P') goto yy388;
+		if (yych == 'P') goto yy389;
 		if (yych <= 'T') goto yy56;
-		goto yy389;
+		goto yy390;
 	} else {
 		if (yych <= 'p') {
 			if (yych <= 'o') goto yy56;
-			goto yy388;
+			goto yy389;
 		} else {
-			if (yych == 'u') goto yy389;
+			if (yych == 'u') goto yy390;
 			goto yy56;
 		}
 	}
 yy218:
 	YYDEBUG(218, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy390;
-	if (yych == 'e') goto yy390;
+	if (yych == 'E') goto yy391;
+	if (yych == 'e') goto yy391;
 	goto yy56;
 yy219:
 	YYDEBUG(219, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy391;
-	if (yych == 'e') goto yy391;
+	if (yych == 'E') goto yy392;
+	if (yych == 'e') goto yy392;
 	goto yy56;
 yy220:
 	YYDEBUG(220, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'A') goto yy392;
+		if (yych == 'A') goto yy393;
 		if (yych <= 'T') goto yy56;
-		goto yy393;
+		goto yy394;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
-			goto yy392;
+			goto yy393;
 		} else {
-			if (yych == 'u') goto yy393;
+			if (yych == 'u') goto yy394;
 			goto yy56;
 		}
 	}
 yy221:
 	YYDEBUG(221, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy394;
-	if (yych == 'a') goto yy394;
+	if (yych == 'A') goto yy395;
+	if (yych == 'a') goto yy395;
 	goto yy56;
 yy222:
 	YYDEBUG(222, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy395;
-	if (yych == 'o') goto yy395;
+	if (yych == 'O') goto yy396;
+	if (yych == 'o') goto yy396;
 	goto yy56;
 yy223:
 	YYDEBUG(223, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy396;
-	if (yych == 'c') goto yy396;
+	if (yych == 'C') goto yy397;
+	if (yych == 'c') goto yy397;
 	goto yy56;
 yy224:
 	YYDEBUG(224, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy397;
-	if (yych == 'e') goto yy397;
+	if (yych == 'E') goto yy398;
+	if (yych == 'e') goto yy398;
 	goto yy56;
 yy225:
 	YYDEBUG(225, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy197;
-	if (yych <= '0') goto yy398;
-	if (yych <= '1') goto yy399;
+	if (yych <= '0') goto yy399;
+	if (yych <= '1') goto yy400;
 	if (yych <= '9') goto yy203;
 	goto yy197;
 yy226:
 	YYDEBUG(226, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy400;
+	if (yych == '-') goto yy401;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy401;
+	if (yych <= '9') goto yy402;
 	goto yy186;
 yy227:
 	YYDEBUG(227, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy400;
+	if (yych == '-') goto yy401;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy403;
+	if (yych <= '9') goto yy404;
 	goto yy186;
 yy228:
 	YYDEBUG(228, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy383;
+		if (yych == '.') goto yy384;
 		goto yy209;
 	} else {
 		if (yych <= '9') goto yy229;
-		if (yych <= ':') goto yy383;
+		if (yych <= ':') goto yy384;
 		goto yy209;
 	}
 yy229:
 	YYDEBUG(229, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy383;
-	if (yych == ':') goto yy383;
+	if (yych == '.') goto yy384;
+	if (yych == ':') goto yy384;
 	goto yy209;
 yy230:
 	YYDEBUG(230, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy405;
-	if (yych == 'r') goto yy405;
+	if (yych == 'R') goto yy406;
+	if (yych == 'r') goto yy406;
 	goto yy56;
 yy231:
 	YYDEBUG(231, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy406;
-	if (yych == 'g') goto yy406;
+	if (yych == 'G') goto yy407;
+	if (yych == 'g') goto yy407;
 	goto yy56;
 yy232:
 	YYDEBUG(232, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy407;
-	if (yych == 'y') goto yy407;
+	if (yych == 'Y') goto yy408;
+	if (yych == 'y') goto yy408;
 	goto yy56;
 yy233:
 	YYDEBUG(233, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy408;
-	if (yych == 'c') goto yy408;
+	if (yych == 'C') goto yy409;
+	if (yych == 'c') goto yy409;
 	goto yy56;
 yy234:
 	YYDEBUG(234, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy409;
-	if (yych == 'b') goto yy409;
+	if (yych == 'B') goto yy410;
+	if (yych == 'b') goto yy410;
 	goto yy56;
 yy235:
 	YYDEBUG(235, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy410;
-	if (yych == 'r') goto yy410;
+	if (yych == 'R') goto yy411;
+	if (yych == 'r') goto yy411;
 	goto yy56;
 yy236:
 	YYDEBUG(236, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy411;
-	if (yych == 'i') goto yy411;
+	if (yych == 'I') goto yy412;
+	if (yych == 'i') goto yy412;
 	goto yy56;
 yy237:
 	YYDEBUG(237, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy412;
-	if (yych == 'u') goto yy412;
+	if (yych == 'U') goto yy413;
+	if (yych == 'u') goto yy413;
 	goto yy56;
 yy238:
 	YYDEBUG(238, *YYCURSOR);
@@ -6788,24 +6785,24 @@ yy240:
 	YYDEBUG(240, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy241;
-	if (yych <= '9') goto yy413;
+	if (yych <= '9') goto yy414;
 yy241:
 	YYDEBUG(241, *YYCURSOR);
-#line 1386 "parse_date.re"
+#line 1408 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datefull");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		timelib_skip_day_suffix((char **) &ptr);
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		timelib_skip_day_suffix(&ptr);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL;
 	}
-#line 6809 "<stdout>"
+#line 6806 "<stdout>"
 yy242:
 	YYDEBUG(242, *YYCURSOR);
 	yyaccept = 3;
@@ -6848,22 +6845,22 @@ yy243:
 yy244:
 	YYDEBUG(244, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy414;
-	if (yych == 'n') goto yy414;
+	if (yych == 'N') goto yy415;
+	if (yych == 'n') goto yy415;
 	goto yy56;
 yy245:
 	YYDEBUG(245, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'L') goto yy415;
+		if (yych == 'L') goto yy416;
 		if (yych <= 'M') goto yy56;
-		goto yy416;
+		goto yy417;
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'k') goto yy56;
-			goto yy415;
+			goto yy416;
 		} else {
-			if (yych == 'n') goto yy416;
+			if (yych == 'n') goto yy417;
 			goto yy56;
 		}
 	}
@@ -6871,13 +6868,13 @@ yy246:
 	YYDEBUG(246, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
-		if (yych == 'R') goto yy417;
+		if (yych == 'R') goto yy418;
 		if (yych <= 'X') goto yy56;
 		goto yy243;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy56;
-			goto yy417;
+			goto yy418;
 		} else {
 			if (yych == 'y') goto yy243;
 			goto yy56;
@@ -6888,38 +6885,38 @@ yy247:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= 'K') {
-			if (yych == 'C') goto yy418;
+			if (yych == 'C') goto yy419;
 			goto yy56;
 		} else {
-			if (yych <= 'L') goto yy419;
+			if (yych <= 'L') goto yy420;
 			if (yych <= 'M') goto yy56;
-			goto yy420;
+			goto yy421;
 		}
 	} else {
 		if (yych <= 'k') {
-			if (yych == 'c') goto yy418;
+			if (yych == 'c') goto yy419;
 			goto yy56;
 		} else {
-			if (yych <= 'l') goto yy419;
-			if (yych == 'n') goto yy420;
+			if (yych <= 'l') goto yy420;
+			if (yych == 'n') goto yy421;
 			goto yy56;
 		}
 	}
 yy248:
 	YYDEBUG(248, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy421;
-	if (yych == 'n') goto yy421;
+	if (yych == 'N') goto yy422;
+	if (yych == 'n') goto yy422;
 	goto yy56;
 yy249:
 	YYDEBUG(249, *YYCURSOR);
-	yyaccept = 7;
+	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy422;
-	if (yych == 'e') goto yy422;
+	if (yych == 'E') goto yy423;
+	if (yych == 'e') goto yy423;
 yy250:
 	YYDEBUG(250, *YYCURSOR);
-#line 1787 "parse_date.re"
+#line 1809 "parse_date.re"
 	{
 		timelib_ull i;
 		DEBUG_OUTPUT("relative");
@@ -6927,90 +6924,90 @@ yy250:
 		TIMELIB_HAVE_RELATIVE();
 
 		while(*ptr) {
-			i = timelib_get_unsigned_nr((char **) &ptr, 24);
-			timelib_eat_spaces((char **) &ptr);
-			timelib_set_relative((char **) &ptr, i, 1, s);
+			i = timelib_get_unsigned_nr(&ptr, 24);
+			timelib_eat_spaces(&ptr);
+			timelib_set_relative(&ptr, i, 1, s);
 		}
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 6938 "<stdout>"
+#line 6935 "<stdout>"
 yy251:
 	YYDEBUG(251, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'V') goto yy408;
-	if (yych == 'v') goto yy408;
+	if (yych == 'V') goto yy409;
+	if (yych == 'v') goto yy409;
 	goto yy56;
 yy252:
 	YYDEBUG(252, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy423;
-	if (yych == 't') goto yy423;
+	if (yych == 'T') goto yy424;
+	if (yych == 't') goto yy424;
 	goto yy56;
 yy253:
 	YYDEBUG(253, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy424;
-	if (yych == 't') goto yy424;
+	if (yych == 'T') goto yy425;
+	if (yych == 't') goto yy425;
 	goto yy56;
 yy254:
 	YYDEBUG(254, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'P') {
-		if (yych == 'C') goto yy425;
+		if (yych == 'C') goto yy426;
 		if (yych <= 'O') goto yy56;
-		goto yy426;
+		goto yy427;
 	} else {
 		if (yych <= 'c') {
 			if (yych <= 'b') goto yy56;
-			goto yy425;
+			goto yy426;
 		} else {
-			if (yych == 'p') goto yy426;
+			if (yych == 'p') goto yy427;
 			goto yy56;
 		}
 	}
 yy255:
 	YYDEBUG(255, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy411;
-	if (yych == 'n') goto yy411;
+	if (yych == 'N') goto yy412;
+	if (yych == 'n') goto yy412;
 	goto yy56;
 yy256:
 	YYDEBUG(256, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy427;
-	if (yych == 'u') goto yy427;
+	if (yych == 'U') goto yy428;
+	if (yych == 'u') goto yy428;
 	goto yy56;
 yy257:
 	YYDEBUG(257, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy428;
-	if (yych == 'e') goto yy428;
+	if (yych == 'E') goto yy429;
+	if (yych == 'e') goto yy429;
 	goto yy56;
 yy258:
 	YYDEBUG(258, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy422;
-	if (yych == 'e') goto yy422;
+	if (yych == 'E') goto yy423;
+	if (yych == 'e') goto yy423;
 	goto yy56;
 yy259:
 	YYDEBUG(259, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= 'C') goto yy56;
-		if (yych <= 'D') goto yy429;
-		goto yy430;
+		if (yych <= 'D') goto yy430;
+		goto yy431;
 	} else {
 		if (yych <= 'c') goto yy56;
-		if (yych <= 'd') goto yy429;
-		if (yych <= 'e') goto yy430;
+		if (yych <= 'd') goto yy430;
+		if (yych <= 'e') goto yy431;
 		goto yy56;
 	}
 yy260:
 	YYDEBUG(260, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy412;
-	if (yych == 'a') goto yy412;
+	if (yych == 'A') goto yy413;
+	if (yych == 'a') goto yy413;
 	goto yy56;
 yy261:
 	YYDEBUG(261, *YYCURSOR);
@@ -7019,7 +7016,7 @@ yy261:
 		if (yych == '\t') goto yy273;
 		goto yy197;
 	} else {
-		if (yych <= '-') goto yy431;
+		if (yych <= '-') goto yy432;
 		if (yych <= '.') goto yy273;
 		if (yych <= '/') goto yy268;
 		goto yy197;
@@ -7033,16 +7030,16 @@ yy262:
 			goto yy273;
 		} else {
 			if (yych <= ',') goto yy197;
-			if (yych <= '-') goto yy431;
+			if (yych <= '-') goto yy432;
 			goto yy273;
 		}
 	} else {
 		if (yych <= 'U') {
 			if (yych <= '/') goto yy268;
 			if (yych <= 'T') goto yy197;
-			goto yy427;
+			goto yy428;
 		} else {
-			if (yych == 'u') goto yy427;
+			if (yych == 'u') goto yy428;
 			goto yy197;
 		}
 	}
@@ -7054,57 +7051,57 @@ yy263:
 	goto yy56;
 yy264:
 	YYDEBUG(264, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= ',') goto yy209;
-		if (yych <= '-') goto yy378;
-		goto yy432;
+		if (yych <= '-') goto yy379;
+		goto yy433;
 	} else {
 		if (yych <= '/') goto yy209;
-		if (yych <= '9') goto yy433;
-		if (yych <= ':') goto yy434;
+		if (yych <= '9') goto yy434;
+		if (yych <= ':') goto yy435;
 		goto yy209;
 	}
 yy265:
 	YYDEBUG(265, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') goto yy209;
-		if (yych <= '-') goto yy378;
-		if (yych <= '.') goto yy432;
+		if (yych <= '-') goto yy379;
+		if (yych <= '.') goto yy433;
 		goto yy209;
 	} else {
-		if (yych <= '2') goto yy433;
-		if (yych <= '9') goto yy435;
-		if (yych <= ':') goto yy434;
+		if (yych <= '2') goto yy434;
+		if (yych <= '9') goto yy436;
+		if (yych <= ':') goto yy435;
 		goto yy209;
 	}
 yy266:
 	YYDEBUG(266, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= ',') goto yy209;
-		if (yych <= '-') goto yy378;
-		goto yy432;
+		if (yych <= '-') goto yy379;
+		goto yy433;
 	} else {
 		if (yych <= '/') goto yy209;
-		if (yych <= '9') goto yy435;
-		if (yych <= ':') goto yy434;
+		if (yych <= '9') goto yy436;
+		if (yych <= ':') goto yy435;
 		goto yy209;
 	}
 yy267:
 	YYDEBUG(267, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= ',') goto yy209;
-		if (yych <= '-') goto yy378;
-		goto yy432;
+		if (yych <= '-') goto yy379;
+		goto yy433;
 	} else {
-		if (yych == ':') goto yy434;
+		if (yych == ':') goto yy435;
 		goto yy209;
 	}
 yy268:
@@ -7131,22 +7128,22 @@ yy268:
 	}
 yy269:
 	YYDEBUG(269, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy434;
+		if (yych == '.') goto yy435;
 		goto yy209;
 	} else {
-		if (yych <= '9') goto yy436;
-		if (yych <= ':') goto yy434;
+		if (yych <= '9') goto yy437;
+		if (yych <= ':') goto yy435;
 		goto yy209;
 	}
 yy270:
 	YYDEBUG(270, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy434;
-	if (yych == ':') goto yy434;
+	if (yych == '.') goto yy435;
+	if (yych == ':') goto yy435;
 	goto yy209;
 yy271:
 	YYDEBUG(271, *YYCURSOR);
@@ -7157,12 +7154,12 @@ yy272:
 	YYDEBUG(272, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy437;
-		if (yych == '\t') goto yy437;
+		if (yych <= 0x00) goto yy438;
+		if (yych == '\t') goto yy438;
 		goto yy56;
 	} else {
-		if (yych <= ' ') goto yy437;
-		if (yych == '.') goto yy439;
+		if (yych <= ' ') goto yy438;
+		if (yych == '.') goto yy440;
 		goto yy56;
 	}
 yy273:
@@ -7177,8 +7174,8 @@ yy274:
 	YYDEBUG(274, *YYCURSOR);
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':	goto yy440;
-	case '1':	goto yy441;
+	case '0':	goto yy441;
+	case '1':	goto yy442;
 	case '2':
 	case '3':
 	case '4':
@@ -7186,56 +7183,90 @@ yy274:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy442;
+	case '9':	goto yy443;
 	case 'A':
-	case 'a':	goto yy443;
+	case 'a':	goto yy444;
 	case 'D':
-	case 'd':	goto yy444;
+	case 'd':	goto yy445;
 	case 'F':
-	case 'f':	goto yy445;
+	case 'f':	goto yy446;
 	case 'J':
-	case 'j':	goto yy446;
+	case 'j':	goto yy447;
 	case 'M':
-	case 'm':	goto yy447;
+	case 'm':	goto yy448;
 	case 'N':
-	case 'n':	goto yy448;
+	case 'n':	goto yy449;
 	case 'O':
-	case 'o':	goto yy449;
+	case 'o':	goto yy450;
 	case 'S':
-	case 's':	goto yy450;
+	case 's':	goto yy451;
 	default:	goto yy56;
 	}
 yy275:
 	YYDEBUG(275, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy451;
-	goto yy56;
+	if (yych <= '/') goto yy276;
+	if (yych <= '9') goto yy452;
 yy276:
 	YYDEBUG(276, *YYCURSOR);
+#line 1102 "parse_date.re"
+	{
+		timelib_ull i, us;
+		const char *ptr_before;
+
+		TIMELIB_INIT;
+		TIMELIB_HAVE_RELATIVE();
+		TIMELIB_UNHAVE_DATE();
+		TIMELIB_UNHAVE_TIME();
+		TIMELIB_HAVE_TZ();
+
+		i = timelib_get_unsigned_nr(&ptr, 24);
+
+		ptr_before = ptr;
+		us = timelib_get_unsigned_nr(&ptr, 6);
+		us = us * pow(10, 7 - (ptr - ptr_before));
+
+		s->time->y = 1970;
+		s->time->m = 1;
+		s->time->d = 1;
+		s->time->h = s->time->i = s->time->s = 0;
+		s->time->us = 0;
+		s->time->relative.s += i;
+		s->time->relative.us = us;
+		s->time->is_localtime = 1;
+		s->time->zone_type = TIMELIB_ZONETYPE_OFFSET;
+		s->time->z = 0;
+		s->time->dst = 0;
+
+		TIMELIB_DEINIT;
+		return TIMELIB_RELATIVE;
+	}
+#line 7245 "<stdout>"
+yy277:
+	YYDEBUG(277, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'Z') goto yy452;
+		if (yych <= 'Z') goto yy453;
 		if (yych <= '`') goto yy18;
-		if (yych <= 'z') goto yy452;
+		if (yych <= 'z') goto yy453;
 		goto yy18;
 	}
-yy277:
-	YYDEBUG(277, *YYCURSOR);
+yy278:
+	YYDEBUG(278, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
 		if (yych == ')') goto yy108;
 	} else {
-		if (yych <= 'Z') goto yy452;
-		if (yych <= '`') goto yy278;
-		if (yych <= 'z') goto yy452;
+		if (yych <= 'Z') goto yy453;
+		if (yych <= '`') goto yy279;
+		if (yych <= 'z') goto yy453;
 	}
-yy278:
-	YYDEBUG(278, *YYCURSOR);
-#line 1629 "parse_date.re"
+yy279:
+	YYDEBUG(279, *YYCURSOR);
+#line 1651 "parse_date.re"
 	{
 		DEBUG_OUTPUT("ago");
 		TIMELIB_INIT;
@@ -7255,10 +7286,10 @@ yy278:
 		TIMELIB_DEINIT;
 		return TIMELIB_AGO;
 	}
-#line 7259 "<stdout>"
-yy279:
-	YYDEBUG(279, *YYCURSOR);
-	yyaccept = 8;
+#line 7290 "<stdout>"
+yy280:
+	YYDEBUG(280, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
@@ -7271,7 +7302,7 @@ yy279:
 			if (yych <= ',') {
 				if (yych <= ')') goto yy108;
 			} else {
-				if (yych <= '-') goto yy453;
+				if (yych <= '-') goto yy454;
 				if (yych <= '.') goto yy135;
 			}
 		}
@@ -7280,84 +7311,84 @@ yy279:
 			if (yych <= '@') {
 				if (yych <= '9') goto yy135;
 			} else {
-				if (yych == 'I') goto yy454;
-				goto yy452;
+				if (yych == 'I') goto yy455;
+				goto yy453;
 			}
 		} else {
 			if (yych <= 'h') {
-				if (yych >= 'a') goto yy452;
+				if (yych >= 'a') goto yy453;
 			} else {
-				if (yych <= 'i') goto yy454;
-				if (yych <= 'z') goto yy452;
+				if (yych <= 'i') goto yy455;
+				if (yych <= 'z') goto yy453;
 			}
 		}
 	}
-yy280:
-	YYDEBUG(280, *YYCURSOR);
-#line 1709 "parse_date.re"
+yy281:
+	YYDEBUG(281, *YYCURSOR);
+#line 1731 "parse_date.re"
 	{
 		DEBUG_OUTPUT("monthtext");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_lookup_month((char **) &ptr);
+		s->time->m = timelib_lookup_month(&ptr);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 7307 "<stdout>"
-yy281:
-	YYDEBUG(281, *YYCURSOR);
-	yyaccept = 8;
+#line 7338 "<stdout>"
+yy282:
+	YYDEBUG(282, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= ',') {
 				if (yych <= ')') goto yy108;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych <= '-') goto yy453;
+				if (yych <= '-') goto yy454;
 				if (yych <= '.') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') {
 				if (yych <= '9') goto yy135;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych == 'U') goto yy455;
-				goto yy452;
+				if (yych == 'U') goto yy456;
+				goto yy453;
 			}
 		} else {
 			if (yych <= 't') {
-				if (yych <= '`') goto yy280;
-				goto yy452;
+				if (yych <= '`') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'u') goto yy455;
-				if (yych <= 'z') goto yy452;
-				goto yy280;
+				if (yych <= 'u') goto yy456;
+				if (yych <= 'z') goto yy453;
+				goto yy281;
 			}
 		}
 	}
-yy282:
-	YYDEBUG(282, *YYCURSOR);
+yy283:
+	YYDEBUG(283, *YYCURSOR);
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm[0+yych] & 64) {
-		goto yy456;
+		goto yy457;
 	}
 	goto yy56;
-yy283:
-	YYDEBUG(283, *YYCURSOR);
+yy284:
+	YYDEBUG(284, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -7366,136 +7397,136 @@ yy283:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			goto yy282;
+			goto yy283;
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			goto yy18;
 		} else {
-			if (yych <= '_') goto yy282;
+			if (yych <= '_') goto yy283;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy458;
+			if (yych <= 'z') goto yy459;
 			goto yy18;
 		}
 	}
-yy284:
-	YYDEBUG(284, *YYCURSOR);
-	yyaccept = 9;
+yy285:
+	YYDEBUG(285, *YYCURSOR);
+	yyaccept = 8;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
 			if (yych == ')') goto yy108;
-			goto yy278;
+			goto yy279;
 		} else {
-			if (yych == '.') goto yy278;
-			goto yy282;
+			if (yych == '.') goto yy279;
+			goto yy283;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy278;
-			if (yych <= 'Z') goto yy452;
-			goto yy278;
+			if (yych <= '@') goto yy279;
+			if (yych <= 'Z') goto yy453;
+			goto yy279;
 		} else {
-			if (yych <= '_') goto yy282;
-			if (yych <= '`') goto yy278;
-			if (yych <= 'z') goto yy458;
-			goto yy278;
+			if (yych <= '_') goto yy283;
+			if (yych <= '`') goto yy279;
+			if (yych <= 'z') goto yy459;
+			goto yy279;
 		}
 	}
-yy285:
-	YYDEBUG(285, *YYCURSOR);
-	yyaccept = 8;
+yy286:
+	YYDEBUG(286, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= ')') goto yy108;
-				if (yych <= ',') goto yy280;
-				goto yy459;
+				if (yych <= ',') goto yy281;
+				goto yy460;
 			} else {
-				if (yych == '/') goto yy282;
+				if (yych == '/') goto yy283;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'H') {
-				if (yych <= '@') goto yy280;
-				goto yy452;
+				if (yych <= '@') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'I') goto yy454;
-				if (yych <= 'Z') goto yy452;
-				goto yy280;
+				if (yych <= 'I') goto yy455;
+				if (yych <= 'Z') goto yy453;
+				goto yy281;
 			}
 		} else {
 			if (yych <= 'h') {
-				if (yych <= '_') goto yy282;
-				if (yych <= '`') goto yy280;
-				goto yy458;
+				if (yych <= '_') goto yy283;
+				if (yych <= '`') goto yy281;
+				goto yy459;
 			} else {
-				if (yych <= 'i') goto yy460;
-				if (yych <= 'z') goto yy458;
-				goto yy280;
+				if (yych <= 'i') goto yy461;
+				if (yych <= 'z') goto yy459;
+				goto yy281;
 			}
 		}
 	}
-yy286:
-	YYDEBUG(286, *YYCURSOR);
-	yyaccept = 8;
+yy287:
+	YYDEBUG(287, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= ')') goto yy108;
-				if (yych <= ',') goto yy280;
-				goto yy459;
+				if (yych <= ',') goto yy281;
+				goto yy460;
 			} else {
-				if (yych == '/') goto yy282;
+				if (yych == '/') goto yy283;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'T') {
-				if (yych <= '@') goto yy280;
-				goto yy452;
+				if (yych <= '@') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'U') goto yy455;
-				if (yych <= 'Z') goto yy452;
-				goto yy280;
+				if (yych <= 'U') goto yy456;
+				if (yych <= 'Z') goto yy453;
+				goto yy281;
 			}
 		} else {
 			if (yych <= 't') {
-				if (yych <= '_') goto yy282;
-				if (yych <= '`') goto yy280;
-				goto yy458;
+				if (yych <= '_') goto yy283;
+				if (yych <= '`') goto yy281;
+				goto yy459;
 			} else {
-				if (yych <= 'u') goto yy461;
-				if (yych <= 'z') goto yy458;
-				goto yy280;
+				if (yych <= 'u') goto yy462;
+				if (yych <= 'z') goto yy459;
+				goto yy281;
 			}
 		}
 	}
-yy287:
-	YYDEBUG(287, *YYCURSOR);
+yy288:
+	YYDEBUG(288, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'K') {
 		if (yych <= ')') {
@@ -7503,141 +7534,141 @@ yy287:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'J') goto yy452;
-			goto yy462;
+			if (yych <= 'J') goto yy453;
+			goto yy463;
 		}
 	} else {
 		if (yych <= 'j') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'k') goto yy462;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'k') goto yy463;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy288:
-	YYDEBUG(288, *YYCURSOR);
+yy289:
+	YYDEBUG(289, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'J') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'K') goto yy462;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'K') goto yy463;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'j') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'k') goto yy463;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'k') goto yy464;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy289:
-	YYDEBUG(289, *YYCURSOR);
-	yyaccept = 8;
+yy290:
+	YYDEBUG(290, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= ',') {
 				if (yych <= ')') goto yy108;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych <= '-') goto yy453;
+				if (yych <= '-') goto yy454;
 				if (yych <= '.') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') {
 				if (yych <= '9') goto yy135;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych == 'E') goto yy464;
-				goto yy452;
+				if (yych == 'E') goto yy465;
+				goto yy453;
 			}
 		} else {
 			if (yych <= 'd') {
-				if (yych <= '`') goto yy280;
-				goto yy452;
+				if (yych <= '`') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'e') goto yy464;
-				if (yych <= 'z') goto yy452;
-				goto yy280;
+				if (yych <= 'e') goto yy465;
+				if (yych <= 'z') goto yy453;
+				goto yy281;
 			}
 		}
 	}
-yy290:
-	YYDEBUG(290, *YYCURSOR);
-	yyaccept = 8;
+yy291:
+	YYDEBUG(291, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= ')') goto yy108;
-				if (yych <= ',') goto yy280;
-				goto yy459;
+				if (yych <= ',') goto yy281;
+				goto yy460;
 			} else {
-				if (yych == '/') goto yy282;
+				if (yych == '/') goto yy283;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'D') {
-				if (yych <= '@') goto yy280;
-				goto yy452;
+				if (yych <= '@') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'E') goto yy464;
-				if (yych <= 'Z') goto yy452;
-				goto yy280;
+				if (yych <= 'E') goto yy465;
+				if (yych <= 'Z') goto yy453;
+				goto yy281;
 			}
 		} else {
 			if (yych <= 'd') {
-				if (yych <= '_') goto yy282;
-				if (yych <= '`') goto yy280;
-				goto yy458;
+				if (yych <= '_') goto yy283;
+				if (yych <= '`') goto yy281;
+				goto yy459;
 			} else {
-				if (yych <= 'e') goto yy465;
-				if (yych <= 'z') goto yy458;
-				goto yy280;
+				if (yych <= 'e') goto yy466;
+				if (yych <= 'z') goto yy459;
+				goto yy281;
 			}
 		}
 	}
-yy291:
-	YYDEBUG(291, *YYCURSOR);
+yy292:
+	YYDEBUG(292, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -7645,22 +7676,22 @@ yy291:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'G') goto yy452;
-			goto yy466;
+			if (yych <= 'G') goto yy453;
+			goto yy467;
 		}
 	} else {
 		if (yych <= 'g') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'h') goto yy466;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'h') goto yy467;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy292:
-	YYDEBUG(292, *YYCURSOR);
+yy293:
+	YYDEBUG(293, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'V') {
 		if (yych <= ')') {
@@ -7668,127 +7699,127 @@ yy292:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'U') goto yy452;
-			goto yy467;
+			if (yych <= 'U') goto yy453;
+			goto yy468;
 		}
 	} else {
 		if (yych <= 'u') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'v') goto yy467;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'v') goto yy468;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy293:
-	YYDEBUG(293, *YYCURSOR);
+yy294:
+	YYDEBUG(294, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'H') goto yy466;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'H') goto yy467;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'g') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'h') goto yy468;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'h') goto yy469;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy294:
-	YYDEBUG(294, *YYCURSOR);
+yy295:
+	YYDEBUG(295, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'U') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'V') goto yy467;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'V') goto yy468;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'u') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'v') goto yy469;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'v') goto yy470;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy295:
-	YYDEBUG(295, *YYCURSOR);
-	yyaccept = 8;
+yy296:
+	YYDEBUG(296, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= ',') {
 				if (yych <= ')') goto yy108;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych <= '-') goto yy453;
+				if (yych <= '-') goto yy454;
 				if (yych <= '.') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') {
 				if (yych <= '9') goto yy135;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych == 'R') goto yy470;
-				goto yy452;
+				if (yych == 'R') goto yy471;
+				goto yy453;
 			}
 		} else {
 			if (yych <= 'q') {
-				if (yych <= '`') goto yy280;
-				goto yy452;
+				if (yych <= '`') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'r') goto yy470;
-				if (yych <= 'z') goto yy452;
-				goto yy280;
+				if (yych <= 'r') goto yy471;
+				if (yych <= 'z') goto yy453;
+				goto yy281;
 			}
 		}
 	}
-yy296:
-	YYDEBUG(296, *YYCURSOR);
+yy297:
+	YYDEBUG(297, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -7796,22 +7827,22 @@ yy296:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy452;
-			goto yy471;
+			if (yych <= 'S') goto yy453;
+			goto yy472;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 't') goto yy471;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 't') goto yy472;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy297:
-	YYDEBUG(297, *YYCURSOR);
+yy298:
+	YYDEBUG(298, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -7819,22 +7850,22 @@ yy297:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'R') goto yy452;
-			goto yy472;
+			if (yych <= 'R') goto yy453;
+			goto yy473;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 's') goto yy472;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 's') goto yy473;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy298:
-	YYDEBUG(298, *YYCURSOR);
+yy299:
+	YYDEBUG(299, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -7842,43 +7873,43 @@ yy298:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Q') goto yy452;
-			goto yy473;
+			if (yych <= 'Q') goto yy453;
+			goto yy474;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'r') goto yy473;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'r') goto yy474;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy299:
-	YYDEBUG(299, *YYCURSOR);
+yy300:
+	YYDEBUG(300, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
 			if (yych >= ')') goto yy108;
 		} else {
-			if (yych <= '@') goto yy300;
-			if (yych <= 'C') goto yy452;
-			goto yy474;
+			if (yych <= '@') goto yy301;
+			if (yych <= 'C') goto yy453;
+			goto yy475;
 		}
 	} else {
 		if (yych <= 'c') {
-			if (yych <= 'Z') goto yy452;
-			if (yych >= 'a') goto yy452;
+			if (yych <= 'Z') goto yy453;
+			if (yych >= 'a') goto yy453;
 		} else {
-			if (yych <= 'd') goto yy474;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'd') goto yy475;
+			if (yych <= 'z') goto yy453;
 		}
 	}
-yy300:
-	YYDEBUG(300, *YYCURSOR);
-#line 1650 "parse_date.re"
+yy301:
+	YYDEBUG(301, *YYCURSOR);
+#line 1672 "parse_date.re"
 	{
 		const timelib_relunit* relunit;
 		DEBUG_OUTPUT("daytext");
@@ -7886,7 +7917,7 @@ yy300:
 		TIMELIB_HAVE_RELATIVE();
 		TIMELIB_HAVE_WEEKDAY_RELATIVE();
 		TIMELIB_UNHAVE_TIME();
-		relunit = timelib_lookup_relunit((char**) &ptr);
+		relunit = timelib_lookup_relunit(&ptr);
 		s->time->relative.weekday = relunit->multiplier;
 		if (s->time->relative.weekday_behavior != 2) {
 			s->time->relative.weekday_behavior = 1;
@@ -7895,9 +7926,9 @@ yy300:
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEKDAY;
 	}
-#line 7899 "<stdout>"
-yy301:
-	YYDEBUG(301, *YYCURSOR);
+#line 7930 "<stdout>"
+yy302:
+	YYDEBUG(302, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -7905,222 +7936,222 @@ yy301:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'M') goto yy452;
-			goto yy475;
+			if (yych <= 'M') goto yy453;
+			goto yy476;
 		}
 	} else {
 		if (yych <= 'm') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'n') goto yy475;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'n') goto yy476;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy302:
-	YYDEBUG(302, *YYCURSOR);
-	yyaccept = 8;
+yy303:
+	YYDEBUG(303, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= ')') goto yy108;
-				if (yych <= ',') goto yy280;
-				goto yy459;
+				if (yych <= ',') goto yy281;
+				goto yy460;
 			} else {
-				if (yych == '/') goto yy282;
+				if (yych == '/') goto yy283;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'Q') {
-				if (yych <= '@') goto yy280;
-				goto yy452;
+				if (yych <= '@') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'R') goto yy470;
-				if (yych <= 'Z') goto yy452;
-				goto yy280;
+				if (yych <= 'R') goto yy471;
+				if (yych <= 'Z') goto yy453;
+				goto yy281;
 			}
 		} else {
 			if (yych <= 'q') {
-				if (yych <= '_') goto yy282;
-				if (yych <= '`') goto yy280;
-				goto yy458;
+				if (yych <= '_') goto yy283;
+				if (yych <= '`') goto yy281;
+				goto yy459;
 			} else {
-				if (yych <= 'r') goto yy476;
-				if (yych <= 'z') goto yy458;
-				goto yy280;
+				if (yych <= 'r') goto yy477;
+				if (yych <= 'z') goto yy459;
+				goto yy281;
 			}
 		}
 	}
-yy303:
-	YYDEBUG(303, *YYCURSOR);
+yy304:
+	YYDEBUG(304, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy471;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'T') goto yy472;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 't') goto yy477;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 't') goto yy478;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy304:
-	YYDEBUG(304, *YYCURSOR);
+yy305:
+	YYDEBUG(305, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy472;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'S') goto yy473;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'r') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 's') goto yy478;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 's') goto yy479;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy305:
-	YYDEBUG(305, *YYCURSOR);
+yy306:
+	YYDEBUG(306, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy473;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'R') goto yy474;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'q') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'r') goto yy479;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'r') goto yy480;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy306:
-	YYDEBUG(306, *YYCURSOR);
-	yyaccept = 10;
+yy307:
+	YYDEBUG(307, *YYCURSOR);
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
-			if (yych <= ',') goto yy300;
-			goto yy282;
+			if (yych <= ',') goto yy301;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
-			if (yych <= '@') goto yy300;
-			goto yy452;
+			if (yych == '/') goto yy283;
+			if (yych <= '@') goto yy301;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy474;
-			if (yych <= 'Z') goto yy452;
-			if (yych <= '^') goto yy300;
-			goto yy282;
+			if (yych <= 'D') goto yy475;
+			if (yych <= 'Z') goto yy453;
+			if (yych <= '^') goto yy301;
+			goto yy283;
 		} else {
 			if (yych <= 'c') {
-				if (yych <= '`') goto yy300;
-				goto yy458;
+				if (yych <= '`') goto yy301;
+				goto yy459;
 			} else {
-				if (yych <= 'd') goto yy480;
-				if (yych <= 'z') goto yy458;
-				goto yy300;
+				if (yych <= 'd') goto yy481;
+				if (yych <= 'z') goto yy459;
+				goto yy301;
 			}
 		}
 	}
-yy307:
-	YYDEBUG(307, *YYCURSOR);
+yy308:
+	YYDEBUG(308, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy475;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'N') goto yy476;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'm') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'n') goto yy481;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'n') goto yy482;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy308:
-	YYDEBUG(308, *YYCURSOR);
+yy309:
+	YYDEBUG(309, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
@@ -8128,145 +8159,145 @@ yy308:
 			if (yych <= '(') goto yy18;
 			goto yy108;
 		} else {
-			if (yych == '+') goto yy482;
+			if (yych == '+') goto yy483;
 			goto yy18;
 		}
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '-') goto yy482;
+			if (yych <= '-') goto yy483;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy309:
-	YYDEBUG(309, *YYCURSOR);
-	yyaccept = 11;
+yy310:
+	YYDEBUG(310, *YYCURSOR);
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '0') {
-			if (yych >= '0') goto yy483;
+			if (yych >= '0') goto yy484;
 		} else {
-			if (yych <= '1') goto yy484;
-			if (yych <= '2') goto yy485;
-			goto yy486;
+			if (yych <= '1') goto yy485;
+			if (yych <= '2') goto yy486;
+			goto yy487;
 		}
 	} else {
 		if (yych <= 'T') {
-			if (yych >= 'T') goto yy487;
+			if (yych >= 'T') goto yy488;
 		} else {
-			if (yych == 't') goto yy487;
+			if (yych == 't') goto yy488;
 		}
 	}
-yy310:
-	YYDEBUG(310, *YYCURSOR);
-#line 1455 "parse_date.re"
+yy311:
+	YYDEBUG(311, *YYCURSOR);
+#line 1477 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datetextual | datenoyear");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 8180 "<stdout>"
-yy311:
-	YYDEBUG(311, *YYCURSOR);
-	yyaccept = 11;
+#line 8211 "<stdout>"
+yy312:
+	YYDEBUG(312, *YYCURSOR);
+	yyaccept = 10;
 	YYMARKER = ++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 18) YYFILL(18);
 	yych = *YYCURSOR;
-yy312:
-	YYDEBUG(312, *YYCURSOR);
+yy313:
+	YYDEBUG(313, *YYCURSOR);
 	if (yybm[0+yych] & 32) {
-		goto yy311;
+		goto yy312;
 	}
 	if (yych <= '2') {
-		if (yych <= '/') goto yy310;
-		if (yych <= '0') goto yy488;
-		if (yych <= '1') goto yy489;
-		goto yy490;
+		if (yych <= '/') goto yy311;
+		if (yych <= '0') goto yy489;
+		if (yych <= '1') goto yy490;
+		goto yy491;
 	} else {
-		if (yych <= '9') goto yy491;
-		if (yych == 'T') goto yy487;
-		goto yy310;
+		if (yych <= '9') goto yy492;
+		if (yych == 'T') goto yy488;
+		goto yy311;
 	}
-yy313:
-	YYDEBUG(313, *YYCURSOR);
+yy314:
+	YYDEBUG(314, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '9') {
 		if (yych <= ' ') {
 			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy309;
+				if (yych <= 0x00) goto yy310;
 				goto yy56;
 			} else {
-				if (yych <= '\t') goto yy311;
+				if (yych <= '\t') goto yy312;
 				if (yych <= 0x1F) goto yy56;
-				goto yy311;
+				goto yy312;
 			}
 		} else {
 			if (yych <= '-') {
-				if (yych == ',') goto yy311;
+				if (yych == ',') goto yy312;
 				goto yy56;
 			} else {
-				if (yych <= '.') goto yy311;
+				if (yych <= '.') goto yy312;
 				if (yych <= '/') goto yy56;
-				goto yy492;
+				goto yy493;
 			}
 		}
 	} else {
 		if (yych <= 'm') {
 			if (yych <= 'd') {
 				if (yych <= 'c') goto yy56;
-				goto yy311;
+				goto yy312;
 			} else {
-				if (yych == 'h') goto yy311;
+				if (yych == 'h') goto yy312;
 				goto yy56;
 			}
 		} else {
 			if (yych <= 'r') {
-				if (yych <= 'n') goto yy314;
+				if (yych <= 'n') goto yy315;
 				if (yych <= 'q') goto yy56;
 			} else {
-				if (yych <= 's') goto yy315;
-				if (yych <= 't') goto yy316;
+				if (yych <= 's') goto yy316;
+				if (yych <= 't') goto yy317;
 				goto yy56;
 			}
 		}
 	}
-yy314:
-	YYDEBUG(314, *YYCURSOR);
-	yyaccept = 11;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'd') goto yy493;
-	goto yy312;
 yy315:
 	YYDEBUG(315, *YYCURSOR);
-	yyaccept = 11;
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 't') goto yy493;
-	goto yy312;
+	if (yych == 'd') goto yy494;
+	goto yy313;
 yy316:
 	YYDEBUG(316, *YYCURSOR);
-	yyaccept = 11;
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'h') goto yy493;
-	goto yy312;
+	if (yych == 't') goto yy494;
+	goto yy313;
 yy317:
 	YYDEBUG(317, *YYCURSOR);
+	yyaccept = 10;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == 'h') goto yy494;
+	goto yy313;
+yy318:
+	YYDEBUG(318, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy492;
+	if (yych <= '9') goto yy493;
 	goto yy56;
-yy318:
-	YYDEBUG(318, *YYCURSOR);
+yy319:
+	YYDEBUG(319, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
@@ -8284,278 +8315,278 @@ yy318:
 			if (yych <= '9') goto yy135;
 			goto yy18;
 		} else {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy319:
-	YYDEBUG(319, *YYCURSOR);
-	yyaccept = 8;
+yy320:
+	YYDEBUG(320, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= ',') {
 				if (yych <= ')') goto yy108;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych <= '-') goto yy453;
+				if (yych <= '-') goto yy454;
 				if (yych <= '.') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') {
 				if (yych <= '9') goto yy135;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych == 'U') goto yy494;
-				goto yy452;
+				if (yych == 'U') goto yy495;
+				goto yy453;
 			}
 		} else {
 			if (yych <= 't') {
-				if (yych <= '`') goto yy280;
-				goto yy452;
+				if (yych <= '`') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'u') goto yy494;
-				if (yych <= 'z') goto yy452;
-				goto yy280;
+				if (yych <= 'u') goto yy495;
+				if (yych <= 'z') goto yy453;
+				goto yy281;
 			}
 		}
 	}
-yy320:
-	YYDEBUG(320, *YYCURSOR);
-	yyaccept = 8;
+yy321:
+	YYDEBUG(321, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= ',') {
 				if (yych <= ')') goto yy108;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych <= '-') goto yy453;
+				if (yych <= '-') goto yy454;
 				if (yych <= '.') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') {
 				if (yych <= '9') goto yy135;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych == 'Y') goto yy495;
-				goto yy452;
+				if (yych == 'Y') goto yy496;
+				goto yy453;
 			}
 		} else {
 			if (yych <= 'x') {
-				if (yych <= '`') goto yy280;
-				goto yy452;
+				if (yych <= '`') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'y') goto yy495;
-				if (yych <= 'z') goto yy452;
-				goto yy280;
+				if (yych <= 'y') goto yy496;
+				if (yych <= 'z') goto yy453;
+				goto yy281;
 			}
 		}
 	}
-yy321:
-	YYDEBUG(321, *YYCURSOR);
-	yyaccept = 8;
+yy322:
+	YYDEBUG(322, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= ',') {
 				if (yych <= ')') goto yy108;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych <= '-') goto yy453;
+				if (yych <= '-') goto yy454;
 				if (yych <= '.') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') {
 				if (yych <= '9') goto yy135;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych == 'E') goto yy495;
-				goto yy452;
+				if (yych == 'E') goto yy496;
+				goto yy453;
 			}
 		} else {
 			if (yych <= 'd') {
-				if (yych <= '`') goto yy280;
-				goto yy452;
+				if (yych <= '`') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'e') goto yy495;
-				if (yych <= 'z') goto yy452;
-				goto yy280;
+				if (yych <= 'e') goto yy496;
+				if (yych <= 'z') goto yy453;
+				goto yy281;
 			}
 		}
 	}
-yy322:
-	YYDEBUG(322, *YYCURSOR);
-	yyaccept = 8;
+yy323:
+	YYDEBUG(323, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= ')') goto yy108;
-				if (yych <= ',') goto yy280;
-				goto yy459;
+				if (yych <= ',') goto yy281;
+				goto yy460;
 			} else {
-				if (yych == '/') goto yy282;
+				if (yych == '/') goto yy283;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'T') {
-				if (yych <= '@') goto yy280;
-				goto yy452;
+				if (yych <= '@') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'U') goto yy494;
-				if (yych <= 'Z') goto yy452;
-				goto yy280;
+				if (yych <= 'U') goto yy495;
+				if (yych <= 'Z') goto yy453;
+				goto yy281;
 			}
 		} else {
 			if (yych <= 't') {
-				if (yych <= '_') goto yy282;
-				if (yych <= '`') goto yy280;
-				goto yy458;
+				if (yych <= '_') goto yy283;
+				if (yych <= '`') goto yy281;
+				goto yy459;
 			} else {
-				if (yych <= 'u') goto yy496;
-				if (yych <= 'z') goto yy458;
-				goto yy280;
+				if (yych <= 'u') goto yy497;
+				if (yych <= 'z') goto yy459;
+				goto yy281;
 			}
 		}
 	}
-yy323:
-	YYDEBUG(323, *YYCURSOR);
-	yyaccept = 8;
+yy324:
+	YYDEBUG(324, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= ')') goto yy108;
-				if (yych <= ',') goto yy280;
-				goto yy459;
+				if (yych <= ',') goto yy281;
+				goto yy460;
 			} else {
-				if (yych == '/') goto yy282;
+				if (yych == '/') goto yy283;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'X') {
-				if (yych <= '@') goto yy280;
-				goto yy452;
+				if (yych <= '@') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'Y') goto yy495;
-				if (yych <= 'Z') goto yy452;
-				goto yy280;
+				if (yych <= 'Y') goto yy496;
+				if (yych <= 'Z') goto yy453;
+				goto yy281;
 			}
 		} else {
 			if (yych <= 'x') {
-				if (yych <= '_') goto yy282;
-				if (yych <= '`') goto yy280;
-				goto yy458;
+				if (yych <= '_') goto yy283;
+				if (yych <= '`') goto yy281;
+				goto yy459;
 			} else {
-				if (yych <= 'y') goto yy497;
-				if (yych <= 'z') goto yy458;
-				goto yy280;
+				if (yych <= 'y') goto yy498;
+				if (yych <= 'z') goto yy459;
+				goto yy281;
 			}
 		}
 	}
-yy324:
-	YYDEBUG(324, *YYCURSOR);
-	yyaccept = 8;
+yy325:
+	YYDEBUG(325, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= ')') goto yy108;
-				if (yych <= ',') goto yy280;
-				goto yy459;
+				if (yych <= ',') goto yy281;
+				goto yy460;
 			} else {
-				if (yych == '/') goto yy282;
+				if (yych == '/') goto yy283;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'D') {
-				if (yych <= '@') goto yy280;
-				goto yy452;
+				if (yych <= '@') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'E') goto yy495;
-				if (yych <= 'Z') goto yy452;
-				goto yy280;
+				if (yych <= 'E') goto yy496;
+				if (yych <= 'Z') goto yy453;
+				goto yy281;
 			}
 		} else {
 			if (yych <= 'd') {
-				if (yych <= '_') goto yy282;
-				if (yych <= '`') goto yy280;
-				goto yy458;
+				if (yych <= '_') goto yy283;
+				if (yych <= '`') goto yy281;
+				goto yy459;
 			} else {
-				if (yych <= 'e') goto yy497;
-				if (yych <= 'z') goto yy458;
-				goto yy280;
+				if (yych <= 'e') goto yy498;
+				if (yych <= 'z') goto yy459;
+				goto yy281;
 			}
 		}
 	}
-yy325:
-	YYDEBUG(325, *YYCURSOR);
+yy326:
+	YYDEBUG(326, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -8563,122 +8594,122 @@ yy325:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy452;
-			goto yy498;
+			if (yych <= 'S') goto yy453;
+			goto yy499;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 't') goto yy498;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 't') goto yy499;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy326:
-	YYDEBUG(326, *YYCURSOR);
+yy327:
+	YYDEBUG(327, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy498;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'T') goto yy499;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 't') goto yy499;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 't') goto yy500;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy327:
-	YYDEBUG(327, *YYCURSOR);
-	yyaccept = 8;
+yy328:
+	YYDEBUG(328, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= ',') {
 				if (yych <= ')') goto yy108;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych <= '-') goto yy453;
+				if (yych <= '-') goto yy454;
 				if (yych <= '.') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') {
 				if (yych <= '9') goto yy135;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych == 'C') goto yy500;
-				goto yy452;
+				if (yych == 'C') goto yy501;
+				goto yy453;
 			}
 		} else {
 			if (yych <= 'b') {
-				if (yych <= '`') goto yy280;
-				goto yy452;
+				if (yych <= '`') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'c') goto yy500;
-				if (yych <= 'z') goto yy452;
-				goto yy280;
+				if (yych <= 'c') goto yy501;
+				if (yych <= 'z') goto yy453;
+				goto yy281;
 			}
 		}
 	}
-yy328:
-	YYDEBUG(328, *YYCURSOR);
-	yyaccept = 8;
+yy329:
+	YYDEBUG(329, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
 		if (yych <= ' ') {
 			if (yych == '\t') goto yy135;
-			if (yych <= 0x1F) goto yy280;
+			if (yych <= 0x1F) goto yy281;
 			goto yy135;
 		} else {
 			if (yych == ')') goto yy108;
-			if (yych <= ',') goto yy280;
-			goto yy453;
+			if (yych <= ',') goto yy281;
+			goto yy454;
 		}
 	} else {
 		if (yych <= '@') {
-			if (yych == '/') goto yy280;
+			if (yych == '/') goto yy281;
 			if (yych <= '9') goto yy135;
-			goto yy280;
+			goto yy281;
 		} else {
-			if (yych <= 'Z') goto yy452;
-			if (yych <= '`') goto yy280;
-			if (yych <= 'z') goto yy452;
-			goto yy280;
+			if (yych <= 'Z') goto yy453;
+			if (yych <= '`') goto yy281;
+			if (yych <= 'z') goto yy453;
+			goto yy281;
 		}
 	}
-yy329:
-	YYDEBUG(329, *YYCURSOR);
+yy330:
+	YYDEBUG(330, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -8686,134 +8717,134 @@ yy329:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'M') goto yy452;
-			goto yy501;
+			if (yych <= 'M') goto yy453;
+			goto yy502;
 		}
 	} else {
 		if (yych <= 'm') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'n') goto yy501;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'n') goto yy502;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy330:
-	YYDEBUG(330, *YYCURSOR);
-	yyaccept = 8;
+yy331:
+	YYDEBUG(331, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= ')') goto yy108;
-				if (yych <= ',') goto yy280;
-				goto yy459;
+				if (yych <= ',') goto yy281;
+				goto yy460;
 			} else {
-				if (yych == '/') goto yy282;
+				if (yych == '/') goto yy283;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'B') {
-				if (yych <= '@') goto yy280;
-				goto yy452;
+				if (yych <= '@') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'C') goto yy500;
-				if (yych <= 'Z') goto yy452;
-				goto yy280;
+				if (yych <= 'C') goto yy501;
+				if (yych <= 'Z') goto yy453;
+				goto yy281;
 			}
 		} else {
 			if (yych <= 'b') {
-				if (yych <= '_') goto yy282;
-				if (yych <= '`') goto yy280;
-				goto yy458;
+				if (yych <= '_') goto yy283;
+				if (yych <= '`') goto yy281;
+				goto yy459;
 			} else {
-				if (yych <= 'c') goto yy502;
-				if (yych <= 'z') goto yy458;
-				goto yy280;
+				if (yych <= 'c') goto yy503;
+				if (yych <= 'z') goto yy459;
+				goto yy281;
 			}
 		}
 	}
-yy331:
-	YYDEBUG(331, *YYCURSOR);
-	yyaccept = 8;
+yy332:
+	YYDEBUG(332, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= ' ') {
 			if (yych == '\t') goto yy135;
-			if (yych <= 0x1F) goto yy280;
+			if (yych <= 0x1F) goto yy281;
 			goto yy135;
 		} else {
 			if (yych <= ')') {
-				if (yych <= '(') goto yy280;
+				if (yych <= '(') goto yy281;
 				goto yy108;
 			} else {
-				if (yych <= ',') goto yy280;
-				if (yych <= '-') goto yy459;
+				if (yych <= ',') goto yy281;
+				if (yych <= '-') goto yy460;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			if (yych <= '9') goto yy135;
-			if (yych <= '@') goto yy280;
-			goto yy452;
+			if (yych <= '@') goto yy281;
+			goto yy453;
 		} else {
 			if (yych <= '_') {
-				if (yych <= '^') goto yy280;
-				goto yy282;
+				if (yych <= '^') goto yy281;
+				goto yy283;
 			} else {
-				if (yych <= '`') goto yy280;
-				if (yych <= 'z') goto yy458;
-				goto yy280;
+				if (yych <= '`') goto yy281;
+				if (yych <= 'z') goto yy459;
+				goto yy281;
 			}
 		}
 	}
-yy332:
-	YYDEBUG(332, *YYCURSOR);
+yy333:
+	YYDEBUG(333, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy501;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'N') goto yy502;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'm') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'n') goto yy503;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'n') goto yy504;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy333:
-	YYDEBUG(333, *YYCURSOR);
+yy334:
+	YYDEBUG(334, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -8821,22 +8852,22 @@ yy333:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy452;
-			goto yy504;
+			if (yych <= 'S') goto yy453;
+			goto yy505;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 't') goto yy504;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 't') goto yy505;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy334:
-	YYDEBUG(334, *YYCURSOR);
+yy335:
+	YYDEBUG(335, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -8844,33 +8875,33 @@ yy334:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'M') goto yy452;
-			goto yy505;
+			if (yych <= 'M') goto yy453;
+			goto yy506;
 		}
 	} else {
 		if (yych <= 'm') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'n') goto yy505;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'n') goto yy506;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy335:
-	YYDEBUG(335, *YYCURSOR);
+yy336:
+	YYDEBUG(336, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
 		if (yych == ')') goto yy108;
 	} else {
-		if (yych <= 'Z') goto yy452;
-		if (yych <= '`') goto yy336;
-		if (yych <= 'z') goto yy452;
+		if (yych <= 'Z') goto yy453;
+		if (yych <= '`') goto yy337;
+		if (yych <= 'z') goto yy453;
 	}
-yy336:
-	YYDEBUG(336, *YYCURSOR);
-#line 1028 "parse_date.re"
+yy337:
+	YYDEBUG(337, *YYCURSOR);
+#line 1033 "parse_date.re"
 	{
 		DEBUG_OUTPUT("now");
 		TIMELIB_INIT;
@@ -8878,183 +8909,183 @@ yy336:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 8882 "<stdout>"
-yy337:
-	YYDEBUG(337, *YYCURSOR);
+#line 8913 "<stdout>"
+yy338:
+	YYDEBUG(338, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy504;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'T') goto yy505;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 't') goto yy507;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 't') goto yy508;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy338:
-	YYDEBUG(338, *YYCURSOR);
+yy339:
+	YYDEBUG(339, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy505;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'N') goto yy506;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'm') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'n') goto yy508;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'n') goto yy509;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy339:
-	YYDEBUG(339, *YYCURSOR);
-	yyaccept = 12;
+yy340:
+	YYDEBUG(340, *YYCURSOR);
+	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
 			if (yych == ')') goto yy108;
-			goto yy336;
+			goto yy337;
 		} else {
-			if (yych == '.') goto yy336;
-			goto yy282;
+			if (yych == '.') goto yy337;
+			goto yy283;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy336;
-			if (yych <= 'Z') goto yy452;
-			goto yy336;
+			if (yych <= '@') goto yy337;
+			if (yych <= 'Z') goto yy453;
+			goto yy337;
 		} else {
-			if (yych <= '_') goto yy282;
-			if (yych <= '`') goto yy336;
-			if (yych <= 'z') goto yy458;
-			goto yy336;
+			if (yych <= '_') goto yy283;
+			if (yych <= '`') goto yy337;
+			if (yych <= 'z') goto yy459;
+			goto yy337;
 		}
 	}
-yy340:
-	YYDEBUG(340, *YYCURSOR);
-	yyaccept = 8;
+yy341:
+	YYDEBUG(341, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= ',') {
 				if (yych <= ')') goto yy108;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych <= '-') goto yy453;
+				if (yych <= '-') goto yy454;
 				if (yych <= '.') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') {
 				if (yych <= '9') goto yy135;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych == 'O') goto yy509;
-				goto yy452;
+				if (yych == 'O') goto yy510;
+				goto yy453;
 			}
 		} else {
 			if (yych <= 'n') {
-				if (yych <= '`') goto yy280;
-				goto yy452;
+				if (yych <= '`') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'o') goto yy509;
-				if (yych <= 'z') goto yy452;
-				goto yy280;
+				if (yych <= 'o') goto yy510;
+				if (yych <= 'z') goto yy453;
+				goto yy281;
 			}
 		}
 	}
-yy341:
-	YYDEBUG(341, *YYCURSOR);
-	yyaccept = 8;
+yy342:
+	YYDEBUG(342, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= ')') goto yy108;
-				if (yych <= ',') goto yy280;
-				goto yy459;
+				if (yych <= ',') goto yy281;
+				goto yy460;
 			} else {
-				if (yych == '/') goto yy282;
+				if (yych == '/') goto yy283;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'N') {
-				if (yych <= '@') goto yy280;
-				goto yy452;
+				if (yych <= '@') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'O') goto yy509;
-				if (yych <= 'Z') goto yy452;
-				goto yy280;
+				if (yych <= 'O') goto yy510;
+				if (yych <= 'Z') goto yy453;
+				goto yy281;
 			}
 		} else {
 			if (yych <= 'n') {
-				if (yych <= '_') goto yy282;
-				if (yych <= '`') goto yy280;
-				goto yy458;
+				if (yych <= '_') goto yy283;
+				if (yych <= '`') goto yy281;
+				goto yy459;
 			} else {
-				if (yych <= 'o') goto yy510;
-				if (yych <= 'z') goto yy458;
-				goto yy280;
+				if (yych <= 'o') goto yy511;
+				if (yych <= 'z') goto yy459;
+				goto yy281;
 			}
 		}
 	}
-yy342:
-	YYDEBUG(342, *YYCURSOR);
+yy343:
+	YYDEBUG(343, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'V') {
 		if (yych <= ')') {
@@ -9062,76 +9093,76 @@ yy342:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'U') goto yy452;
-			goto yy511;
+			if (yych <= 'U') goto yy453;
+			goto yy512;
 		}
 	} else {
 		if (yych <= 'u') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'v') goto yy511;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'v') goto yy512;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy343:
-	YYDEBUG(343, *YYCURSOR);
+yy344:
+	YYDEBUG(344, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'U') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'V') goto yy511;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'V') goto yy512;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'u') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'v') goto yy512;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'v') goto yy513;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy344:
-	YYDEBUG(344, *YYCURSOR);
+yy345:
+	YYDEBUG(345, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= ')') {
-			if (yych <= '(') goto yy300;
+			if (yych <= '(') goto yy301;
 			goto yy108;
 		} else {
-			if (yych <= '@') goto yy300;
-			if (yych <= 'T') goto yy452;
-			goto yy513;
+			if (yych <= '@') goto yy301;
+			if (yych <= 'T') goto yy453;
+			goto yy514;
 		}
 	} else {
 		if (yych <= 't') {
-			if (yych <= 'Z') goto yy452;
-			if (yych <= '`') goto yy300;
-			goto yy452;
+			if (yych <= 'Z') goto yy453;
+			if (yych <= '`') goto yy301;
+			goto yy453;
 		} else {
-			if (yych <= 'u') goto yy513;
-			if (yych <= 'z') goto yy452;
-			goto yy300;
+			if (yych <= 'u') goto yy514;
+			if (yych <= 'z') goto yy453;
+			goto yy301;
 		}
 	}
-yy345:
-	YYDEBUG(345, *YYCURSOR);
+yy346:
+	YYDEBUG(346, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'O') {
 		if (yych <= ')') {
@@ -9139,65 +9170,65 @@ yy345:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'N') goto yy452;
-			goto yy514;
+			if (yych <= 'N') goto yy453;
+			goto yy515;
 		}
 	} else {
 		if (yych <= 'n') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'o') goto yy514;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'o') goto yy515;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy346:
-	YYDEBUG(346, *YYCURSOR);
-	yyaccept = 8;
+yy347:
+	YYDEBUG(347, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= ',') {
 				if (yych <= ')') goto yy108;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych <= '-') goto yy453;
+				if (yych <= '-') goto yy454;
 				if (yych <= '.') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') {
 				if (yych <= '9') goto yy135;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych == 'T') goto yy515;
-				goto yy452;
+				if (yych == 'T') goto yy516;
+				goto yy453;
 			}
 		} else {
 			if (yych <= 's') {
-				if (yych <= '`') goto yy280;
-				goto yy452;
+				if (yych <= '`') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 't') goto yy515;
-				if (yych <= 'z') goto yy452;
-				goto yy280;
+				if (yych <= 't') goto yy516;
+				if (yych <= 'z') goto yy453;
+				goto yy281;
 			}
 		}
 	}
-yy347:
-	YYDEBUG(347, *YYCURSOR);
+yy348:
+	YYDEBUG(348, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -9205,235 +9236,235 @@ yy347:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'D') goto yy452;
-			goto yy516;
+			if (yych <= 'D') goto yy453;
+			goto yy517;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'e') goto yy516;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'e') goto yy517;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy348:
-	YYDEBUG(348, *YYCURSOR);
-	yyaccept = 10;
+yy349:
+	YYDEBUG(349, *YYCURSOR);
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
-			if (yych <= ',') goto yy300;
-			goto yy282;
+			if (yych <= ',') goto yy301;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
-			if (yych <= '@') goto yy300;
-			goto yy452;
+			if (yych == '/') goto yy283;
+			if (yych <= '@') goto yy301;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'U') goto yy513;
-			if (yych <= 'Z') goto yy452;
-			if (yych <= '^') goto yy300;
-			goto yy282;
+			if (yych <= 'U') goto yy514;
+			if (yych <= 'Z') goto yy453;
+			if (yych <= '^') goto yy301;
+			goto yy283;
 		} else {
 			if (yych <= 't') {
-				if (yych <= '`') goto yy300;
-				goto yy458;
+				if (yych <= '`') goto yy301;
+				goto yy459;
 			} else {
-				if (yych <= 'u') goto yy517;
-				if (yych <= 'z') goto yy458;
-				goto yy300;
+				if (yych <= 'u') goto yy518;
+				if (yych <= 'z') goto yy459;
+				goto yy301;
 			}
 		}
 	}
-yy349:
-	YYDEBUG(349, *YYCURSOR);
+yy350:
+	YYDEBUG(350, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'O') goto yy514;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'O') goto yy515;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'n') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'o') goto yy518;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'o') goto yy519;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy350:
-	YYDEBUG(350, *YYCURSOR);
-	yyaccept = 8;
+yy351:
+	YYDEBUG(351, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= ')') goto yy108;
-				if (yych <= ',') goto yy280;
-				goto yy459;
+				if (yych <= ',') goto yy281;
+				goto yy460;
 			} else {
-				if (yych == '/') goto yy282;
+				if (yych == '/') goto yy283;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'S') {
-				if (yych <= '@') goto yy280;
-				goto yy452;
+				if (yych <= '@') goto yy281;
+				goto yy453;
 			} else {
-				if (yych <= 'T') goto yy515;
-				if (yych <= 'Z') goto yy452;
-				goto yy280;
+				if (yych <= 'T') goto yy516;
+				if (yych <= 'Z') goto yy453;
+				goto yy281;
 			}
 		} else {
 			if (yych <= 's') {
-				if (yych <= '_') goto yy282;
-				if (yych <= '`') goto yy280;
-				goto yy458;
+				if (yych <= '_') goto yy283;
+				if (yych <= '`') goto yy281;
+				goto yy459;
 			} else {
-				if (yych <= 't') goto yy519;
-				if (yych <= 'z') goto yy458;
-				goto yy280;
+				if (yych <= 't') goto yy520;
+				if (yych <= 'z') goto yy459;
+				goto yy281;
 			}
 		}
 	}
-yy351:
-	YYDEBUG(351, *YYCURSOR);
+yy352:
+	YYDEBUG(352, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy516;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'E') goto yy517;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'd') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'e') goto yy520;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'e') goto yy521;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy352:
-	YYDEBUG(352, *YYCURSOR);
+yy353:
+	YYDEBUG(353, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
 		if (yych == '.') goto yy71;
 		goto yy56;
 	} else {
-		if (yych <= '5') goto yy521;
+		if (yych <= '5') goto yy522;
 		if (yych == ':') goto yy71;
 		goto yy56;
 	}
-yy353:
-	YYDEBUG(353, *YYCURSOR);
+yy354:
+	YYDEBUG(354, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= '@') {
 			if (yych == ')') goto yy108;
 			goto yy18;
 		} else {
-			if (yych <= 'Q') goto yy452;
-			if (yych <= 'R') goto yy522;
-			goto yy504;
+			if (yych <= 'Q') goto yy453;
+			if (yych <= 'R') goto yy523;
+			goto yy505;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'r') goto yy522;
-			if (yych <= 's') goto yy504;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'r') goto yy523;
+			if (yych <= 's') goto yy505;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy354:
-	YYDEBUG(354, *YYCURSOR);
+yy355:
+	YYDEBUG(355, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
-			if (yych <= '(') goto yy300;
+			if (yych <= '(') goto yy301;
 			goto yy108;
 		} else {
-			if (yych <= '@') goto yy300;
-			if (yych <= 'Q') goto yy452;
-			goto yy523;
+			if (yych <= '@') goto yy301;
+			if (yych <= 'Q') goto yy453;
+			goto yy524;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= 'Z') goto yy452;
-			if (yych <= '`') goto yy300;
-			goto yy452;
+			if (yych <= 'Z') goto yy453;
+			if (yych <= '`') goto yy301;
+			goto yy453;
 		} else {
-			if (yych <= 'r') goto yy523;
-			if (yych <= 'z') goto yy452;
-			goto yy300;
+			if (yych <= 'r') goto yy524;
+			if (yych <= 'z') goto yy453;
+			goto yy301;
 		}
 	}
-yy355:
-	YYDEBUG(355, *YYCURSOR);
+yy356:
+	YYDEBUG(356, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy108;
 		if (yych <= '@') goto yy18;
-		goto yy524;
+		goto yy525;
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			goto yy18;
 		} else {
-			if (yych <= 'a') goto yy524;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'a') goto yy525;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy356:
-	YYDEBUG(356, *YYCURSOR);
+yy357:
+	YYDEBUG(357, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'O') {
 		if (yych <= ')') {
@@ -9441,45 +9472,45 @@ yy356:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'N') goto yy452;
-			goto yy525;
+			if (yych <= 'N') goto yy453;
+			goto yy526;
 		}
 	} else {
 		if (yych <= 'n') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'o') goto yy525;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'o') goto yy526;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy357:
-	YYDEBUG(357, *YYCURSOR);
+yy358:
+	YYDEBUG(358, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
-			if (yych <= '(') goto yy300;
+			if (yych <= '(') goto yy301;
 			goto yy108;
 		} else {
-			if (yych <= '@') goto yy300;
-			if (yych <= 'R') goto yy452;
-			goto yy526;
+			if (yych <= '@') goto yy301;
+			if (yych <= 'R') goto yy453;
+			goto yy527;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'Z') goto yy452;
-			if (yych <= '`') goto yy300;
-			goto yy452;
+			if (yych <= 'Z') goto yy453;
+			if (yych <= '`') goto yy301;
+			goto yy453;
 		} else {
-			if (yych <= 's') goto yy526;
-			if (yych <= 'z') goto yy452;
-			goto yy300;
+			if (yych <= 's') goto yy527;
+			if (yych <= 'z') goto yy453;
+			goto yy301;
 		}
 	}
-yy358:
-	YYDEBUG(358, *YYCURSOR);
+yy359:
+	YYDEBUG(359, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych <= ')') {
@@ -9487,92 +9518,92 @@ yy358:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'K') goto yy452;
-			goto yy527;
+			if (yych <= 'K') goto yy453;
+			goto yy528;
 		}
 	} else {
 		if (yych <= 'k') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'l') goto yy527;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'l') goto yy528;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy359:
-	YYDEBUG(359, *YYCURSOR);
+yy360:
+	YYDEBUG(360, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= '/') {
 				if (yych <= '.') goto yy18;
-				goto yy282;
+				goto yy283;
 			} else {
 				if (yych <= '@') goto yy18;
-				if (yych <= 'Q') goto yy452;
-				goto yy522;
+				if (yych <= 'Q') goto yy453;
+				goto yy523;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'S') goto yy504;
-				goto yy452;
+				if (yych <= 'S') goto yy505;
+				goto yy453;
 			} else {
-				if (yych == '_') goto yy282;
+				if (yych == '_') goto yy283;
 				goto yy18;
 			}
 		} else {
 			if (yych <= 'r') {
-				if (yych <= 'q') goto yy458;
-				goto yy528;
+				if (yych <= 'q') goto yy459;
+				goto yy529;
 			} else {
-				if (yych <= 's') goto yy507;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 's') goto yy508;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy360:
-	YYDEBUG(360, *YYCURSOR);
-	yyaccept = 10;
+yy361:
+	YYDEBUG(361, *YYCURSOR);
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
-			if (yych <= ',') goto yy300;
-			goto yy282;
+			if (yych <= ',') goto yy301;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
-			if (yych <= '@') goto yy300;
-			goto yy452;
+			if (yych == '/') goto yy283;
+			if (yych <= '@') goto yy301;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy523;
-			if (yych <= 'Z') goto yy452;
-			if (yych <= '^') goto yy300;
-			goto yy282;
+			if (yych <= 'R') goto yy524;
+			if (yych <= 'Z') goto yy453;
+			if (yych <= '^') goto yy301;
+			goto yy283;
 		} else {
 			if (yych <= 'q') {
-				if (yych <= '`') goto yy300;
-				goto yy458;
+				if (yych <= '`') goto yy301;
+				goto yy459;
 			} else {
-				if (yych <= 'r') goto yy529;
-				if (yych <= 'z') goto yy458;
-				goto yy300;
+				if (yych <= 'r') goto yy530;
+				if (yych <= 'z') goto yy459;
+				goto yy301;
 			}
 		}
 	}
-yy361:
-	YYDEBUG(361, *YYCURSOR);
+yy362:
+	YYDEBUG(362, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -9581,117 +9612,117 @@ yy361:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy524;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'A') goto yy525;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'a') goto yy530;
-			if (yych <= 'z') goto yy458;
+			if (yych <= 'a') goto yy531;
+			if (yych <= 'z') goto yy459;
 			goto yy18;
 		}
 	}
-yy362:
-	YYDEBUG(362, *YYCURSOR);
+yy363:
+	YYDEBUG(363, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'O') goto yy525;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'O') goto yy526;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'n') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'o') goto yy531;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'o') goto yy532;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy363:
-	YYDEBUG(363, *YYCURSOR);
-	yyaccept = 10;
+yy364:
+	YYDEBUG(364, *YYCURSOR);
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
-			if (yych <= ',') goto yy300;
-			goto yy282;
+			if (yych <= ',') goto yy301;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
-			if (yych <= '@') goto yy300;
-			goto yy452;
+			if (yych == '/') goto yy283;
+			if (yych <= '@') goto yy301;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy526;
-			if (yych <= 'Z') goto yy452;
-			if (yych <= '^') goto yy300;
-			goto yy282;
+			if (yych <= 'S') goto yy527;
+			if (yych <= 'Z') goto yy453;
+			if (yych <= '^') goto yy301;
+			goto yy283;
 		} else {
 			if (yych <= 'r') {
-				if (yych <= '`') goto yy300;
-				goto yy458;
+				if (yych <= '`') goto yy301;
+				goto yy459;
 			} else {
-				if (yych <= 's') goto yy532;
-				if (yych <= 'z') goto yy458;
-				goto yy300;
+				if (yych <= 's') goto yy533;
+				if (yych <= 'z') goto yy459;
+				goto yy301;
 			}
 		}
 	}
-yy364:
-	YYDEBUG(364, *YYCURSOR);
+yy365:
+	YYDEBUG(365, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'K') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'L') goto yy527;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'L') goto yy528;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'k') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'l') goto yy533;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'l') goto yy534;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy365:
-	YYDEBUG(365, *YYCURSOR);
+yy366:
+	YYDEBUG(366, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -9709,43 +9740,43 @@ yy365:
 			if (yych <= '/') goto yy18;
 			if (yych <= '9') goto yy135;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
 			if (yych <= 'Z') {
-				if (yych <= 'I') goto yy534;
-				goto yy452;
+				if (yych <= 'I') goto yy535;
+				goto yy453;
 			} else {
 				if (yych <= '`') goto yy18;
-				if (yych <= 'z') goto yy452;
+				if (yych <= 'z') goto yy453;
 				goto yy18;
 			}
 		}
 	}
-yy366:
-	YYDEBUG(366, *YYCURSOR);
+yy367:
+	YYDEBUG(367, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
-			if (yych <= '(') goto yy300;
+			if (yych <= '(') goto yy301;
 			goto yy108;
 		} else {
-			if (yych <= '@') goto yy300;
-			if (yych <= 'M') goto yy452;
-			goto yy535;
+			if (yych <= '@') goto yy301;
+			if (yych <= 'M') goto yy453;
+			goto yy536;
 		}
 	} else {
 		if (yych <= 'm') {
-			if (yych <= 'Z') goto yy452;
-			if (yych <= '`') goto yy300;
-			goto yy452;
+			if (yych <= 'Z') goto yy453;
+			if (yych <= '`') goto yy301;
+			goto yy453;
 		} else {
-			if (yych <= 'n') goto yy535;
-			if (yych <= 'z') goto yy452;
-			goto yy300;
+			if (yych <= 'n') goto yy536;
+			if (yych <= 'z') goto yy453;
+			goto yy301;
 		}
 	}
-yy367:
-	YYDEBUG(367, *YYCURSOR);
+yy368:
+	YYDEBUG(368, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'K') {
 		if (yych <= ')') {
@@ -9753,84 +9784,84 @@ yy367:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'J') goto yy452;
-			goto yy536;
+			if (yych <= 'J') goto yy453;
+			goto yy537;
 		}
 	} else {
 		if (yych <= 'j') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 'k') goto yy536;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 'k') goto yy537;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy368:
-	YYDEBUG(368, *YYCURSOR);
-	yyaccept = 10;
+yy369:
+	YYDEBUG(369, *YYCURSOR);
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
-			if (yych <= ',') goto yy300;
-			goto yy282;
+			if (yych <= ',') goto yy301;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
-			if (yych <= '@') goto yy300;
-			goto yy452;
+			if (yych == '/') goto yy283;
+			if (yych <= '@') goto yy301;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy535;
-			if (yych <= 'Z') goto yy452;
-			if (yych <= '^') goto yy300;
-			goto yy282;
+			if (yych <= 'N') goto yy536;
+			if (yych <= 'Z') goto yy453;
+			if (yych <= '^') goto yy301;
+			goto yy283;
 		} else {
 			if (yych <= 'm') {
-				if (yych <= '`') goto yy300;
-				goto yy458;
+				if (yych <= '`') goto yy301;
+				goto yy459;
 			} else {
-				if (yych <= 'n') goto yy537;
-				if (yych <= 'z') goto yy458;
-				goto yy300;
+				if (yych <= 'n') goto yy538;
+				if (yych <= 'z') goto yy459;
+				goto yy301;
 			}
 		}
 	}
-yy369:
-	YYDEBUG(369, *YYCURSOR);
+yy370:
+	YYDEBUG(370, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'J') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'K') goto yy536;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'K') goto yy537;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'j') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 'k') goto yy538;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 'k') goto yy539;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy370:
-	YYDEBUG(370, *YYCURSOR);
+yy371:
+	YYDEBUG(371, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -9838,65 +9869,65 @@ yy370:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy452;
-			goto yy539;
+			if (yych <= 'S') goto yy453;
+			goto yy540;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '`') goto yy18;
-			goto yy452;
+			goto yy453;
 		} else {
-			if (yych <= 't') goto yy539;
-			if (yych <= 'z') goto yy452;
+			if (yych <= 't') goto yy540;
+			if (yych <= 'z') goto yy453;
 			goto yy18;
 		}
 	}
-yy371:
-	YYDEBUG(371, *YYCURSOR);
+yy372:
+	YYDEBUG(372, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy452;
+			goto yy453;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy539;
-			if (yych <= 'Z') goto yy452;
+			if (yych <= 'T') goto yy540;
+			if (yych <= 'Z') goto yy453;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy458;
+				goto yy459;
 			} else {
-				if (yych <= 't') goto yy540;
-				if (yych <= 'z') goto yy458;
+				if (yych <= 't') goto yy541;
+				if (yych <= 'z') goto yy459;
 				goto yy18;
 			}
 		}
 	}
-yy372:
-	YYDEBUG(372, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy541;
-	goto yy186;
 yy373:
 	YYDEBUG(373, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy425;
-	if (yych == 'c') goto yy425;
-	goto yy56;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy542;
+	goto yy186;
 yy374:
 	YYDEBUG(374, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'C') goto yy426;
+	if (yych == 'c') goto yy426;
+	goto yy56;
+yy375:
+	YYDEBUG(375, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
@@ -9908,7 +9939,7 @@ yy374:
 			} else {
 				if (yych <= '9') {
 					if (yych <= '/') goto yy18;
-					goto yy542;
+					goto yy543;
 				} else {
 					if (yych == 'D') goto yy186;
 					goto yy18;
@@ -9964,8 +9995,8 @@ yy374:
 			}
 		}
 	}
-yy375:
-	YYDEBUG(375, *YYCURSOR);
+yy376:
+	YYDEBUG(376, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
@@ -9977,7 +10008,7 @@ yy375:
 			} else {
 				if (yych <= '9') {
 					if (yych <= '/') goto yy18;
-					goto yy543;
+					goto yy544;
 				} else {
 					if (yych == 'D') goto yy186;
 					goto yy18;
@@ -10033,24 +10064,18 @@ yy375:
 			}
 		}
 	}
-yy376:
-	YYDEBUG(376, *YYCURSOR);
+yy377:
+	YYDEBUG(377, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy18;
 	if (yych <= '9') goto yy108;
 	goto yy18;
-yy377:
-	YYDEBUG(377, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy543;
-	goto yy186;
 yy378:
 	YYDEBUG(378, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
+	if (yych <= '/') goto yy186;
 	if (yych <= '9') goto yy544;
-	goto yy56;
+	goto yy186;
 yy379:
 	YYDEBUG(379, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -10061,163 +10086,169 @@ yy380:
 	YYDEBUG(380, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy546;
-	if (yych <= '3') goto yy548;
-	if (yych <= '9') goto yy549;
+	if (yych <= '9') goto yy546;
 	goto yy56;
 yy381:
 	YYDEBUG(381, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy426;
-	if (yych == 'p') goto yy426;
+	if (yych <= '/') goto yy56;
+	if (yych <= '2') goto yy547;
+	if (yych <= '3') goto yy549;
+	if (yych <= '9') goto yy550;
 	goto yy56;
 yy382:
 	YYDEBUG(382, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy550;
-	if (yych <= '6') goto yy551;
-	if (yych <= '9') goto yy552;
+	if (yych == 'P') goto yy427;
+	if (yych == 'p') goto yy427;
 	goto yy56;
 yy383:
 	YYDEBUG(383, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy553;
-	if (yych <= '6') goto yy554;
-	if (yych <= '9') goto yy555;
+	if (yych <= '5') goto yy551;
+	if (yych <= '6') goto yy552;
+	if (yych <= '9') goto yy553;
 	goto yy56;
 yy384:
 	YYDEBUG(384, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
+	if (yych <= '5') goto yy554;
+	if (yych <= '6') goto yy555;
 	if (yych <= '9') goto yy556;
 	goto yy56;
 yy385:
 	YYDEBUG(385, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy557;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy557;
 	goto yy56;
 yy386:
 	YYDEBUG(386, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 't') goto yy557;
+	if (yych == 'd') goto yy558;
 	goto yy56;
 yy387:
 	YYDEBUG(387, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'h') goto yy557;
+	if (yych == 't') goto yy558;
 	goto yy56;
 yy388:
 	YYDEBUG(388, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy558;
-	if (yych == 'r') goto yy558;
+	if (yych == 'h') goto yy558;
 	goto yy56;
 yy389:
 	YYDEBUG(389, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy558;
-	if (yych == 'g') goto yy558;
+	if (yych == 'R') goto yy559;
+	if (yych == 'r') goto yy559;
 	goto yy56;
 yy390:
 	YYDEBUG(390, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy558;
-	if (yych == 'c') goto yy558;
+	if (yych == 'G') goto yy559;
+	if (yych == 'g') goto yy559;
 	goto yy56;
 yy391:
 	YYDEBUG(391, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy558;
-	if (yych == 'b') goto yy558;
+	if (yych == 'C') goto yy559;
+	if (yych == 'c') goto yy559;
 	goto yy56;
 yy392:
 	YYDEBUG(392, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy558;
-	if (yych == 'n') goto yy558;
+	if (yych == 'B') goto yy559;
+	if (yych == 'b') goto yy559;
 	goto yy56;
 yy393:
 	YYDEBUG(393, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == 'N') goto yy559;
+	if (yych == 'n') goto yy559;
+	goto yy56;
+yy394:
+	YYDEBUG(394, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'L') goto yy558;
+		if (yych == 'L') goto yy559;
 		if (yych <= 'M') goto yy56;
-		goto yy558;
+		goto yy559;
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'k') goto yy56;
-			goto yy558;
+			goto yy559;
 		} else {
-			if (yych == 'n') goto yy558;
+			if (yych == 'n') goto yy559;
 			goto yy56;
 		}
 	}
-yy394:
-	YYDEBUG(394, *YYCURSOR);
+yy395:
+	YYDEBUG(395, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
-		if (yych == 'R') goto yy558;
+		if (yych == 'R') goto yy559;
 		if (yych <= 'X') goto yy56;
-		goto yy558;
+		goto yy559;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy56;
-			goto yy558;
+			goto yy559;
 		} else {
-			if (yych == 'y') goto yy558;
+			if (yych == 'y') goto yy559;
 			goto yy56;
 		}
 	}
-yy395:
-	YYDEBUG(395, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'V') goto yy558;
-	if (yych == 'v') goto yy558;
-	goto yy56;
 yy396:
 	YYDEBUG(396, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy558;
-	if (yych == 't') goto yy558;
+	if (yych == 'V') goto yy559;
+	if (yych == 'v') goto yy559;
 	goto yy56;
 yy397:
 	YYDEBUG(397, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy559;
-	if (yych == 'p') goto yy559;
+	if (yych == 'T') goto yy559;
+	if (yych == 't') goto yy559;
 	goto yy56;
 yy398:
 	YYDEBUG(398, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == 'P') goto yy560;
+	if (yych == 'p') goto yy560;
+	goto yy56;
+yy399:
+	YYDEBUG(399, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy380;
-		goto yy378;
+		if (yych <= '-') goto yy381;
+		goto yy379;
 	} else {
 		if (yych <= '/') goto yy56;
-		if (yych <= '9') goto yy560;
+		if (yych <= '9') goto yy561;
 		goto yy56;
 	}
-yy399:
-	YYDEBUG(399, *YYCURSOR);
+yy400:
+	YYDEBUG(400, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '.') {
 		if (yych <= ',') goto yy56;
-		if (yych <= '-') goto yy380;
-		goto yy378;
+		if (yych <= '-') goto yy381;
+		goto yy379;
 	} else {
 		if (yych <= '/') goto yy56;
-		if (yych <= '2') goto yy560;
+		if (yych <= '2') goto yy561;
 		goto yy56;
 	}
-yy400:
-	YYDEBUG(400, *YYCURSOR);
+yy401:
+	YYDEBUG(401, *YYCURSOR);
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':	goto yy561;
-	case '1':	goto yy562;
+	case '0':	goto yy562;
+	case '1':	goto yy563;
 	case '2':
 	case '3':
 	case '4':
@@ -10225,65 +10256,65 @@ yy400:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy442;
+	case '9':	goto yy443;
 	case 'A':
-	case 'a':	goto yy443;
+	case 'a':	goto yy444;
 	case 'D':
-	case 'd':	goto yy444;
+	case 'd':	goto yy445;
 	case 'F':
-	case 'f':	goto yy445;
+	case 'f':	goto yy446;
 	case 'J':
-	case 'j':	goto yy446;
+	case 'j':	goto yy447;
 	case 'M':
-	case 'm':	goto yy447;
+	case 'm':	goto yy448;
 	case 'N':
-	case 'n':	goto yy448;
+	case 'n':	goto yy449;
 	case 'O':
-	case 'o':	goto yy449;
+	case 'o':	goto yy450;
 	case 'S':
-	case 's':	goto yy450;
+	case 's':	goto yy451;
 	default:	goto yy56;
 	}
-yy401:
-	YYDEBUG(401, *YYCURSOR);
-	yyaccept = 13;
+yy402:
+	YYDEBUG(402, *YYCURSOR);
+	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
 		if (yych <= '3') {
 			if (yych <= '-') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy564;
+					if (yych == '\t') goto yy565;
 				} else {
-					if (yych <= ' ') goto yy564;
-					if (yych >= '-') goto yy565;
+					if (yych <= ' ') goto yy565;
+					if (yych >= '-') goto yy566;
 				}
 			} else {
 				if (yych <= '0') {
-					if (yych <= '.') goto yy566;
-					if (yych <= '/') goto yy567;
-					goto yy568;
+					if (yych <= '.') goto yy567;
+					if (yych <= '/') goto yy568;
+					goto yy569;
 				} else {
-					if (yych <= '1') goto yy569;
-					if (yych <= '2') goto yy570;
-					goto yy571;
+					if (yych <= '1') goto yy570;
+					if (yych <= '2') goto yy571;
+					goto yy572;
 				}
 			}
 		} else {
 			if (yych <= 'A') {
 				if (yych <= '9') {
-					if (yych <= '5') goto yy572;
-					if (yych <= '6') goto yy573;
-					goto yy574;
+					if (yych <= '5') goto yy573;
+					if (yych <= '6') goto yy574;
+					goto yy575;
 				} else {
-					if (yych <= ':') goto yy575;
-					if (yych >= 'A') goto yy564;
+					if (yych <= ':') goto yy576;
+					if (yych >= 'A') goto yy565;
 				}
 			} else {
 				if (yych <= 'E') {
-					if (yych == 'D') goto yy564;
+					if (yych == 'D') goto yy565;
 				} else {
-					if (yych == 'G') goto yy402;
-					if (yych <= 'J') goto yy564;
+					if (yych == 'G') goto yy403;
+					if (yych <= 'J') goto yy565;
 				}
 			}
 		}
@@ -10291,53 +10322,53 @@ yy401:
 		if (yych <= 'h') {
 			if (yych <= '`') {
 				if (yych <= 'V') {
-					if (yych <= 'O') goto yy564;
-					if (yych >= 'S') goto yy564;
+					if (yych <= 'O') goto yy565;
+					if (yych >= 'S') goto yy565;
 				} else {
-					if (yych <= 'W') goto yy587;
-					if (yych <= 'Y') goto yy564;
+					if (yych <= 'W') goto yy588;
+					if (yych <= 'Y') goto yy565;
 				}
 			} else {
 				if (yych <= 'd') {
-					if (yych <= 'a') goto yy564;
-					if (yych >= 'd') goto yy564;
+					if (yych <= 'a') goto yy565;
+					if (yych >= 'd') goto yy565;
 				} else {
-					if (yych == 'f') goto yy564;
-					if (yych >= 'h') goto yy564;
+					if (yych == 'f') goto yy565;
+					if (yych >= 'h') goto yy565;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'l') {
-					if (yych == 'j') goto yy564;
+					if (yych == 'j') goto yy565;
 				} else {
-					if (yych <= 'o') goto yy564;
-					if (yych >= 's') goto yy564;
+					if (yych <= 'o') goto yy565;
+					if (yych >= 's') goto yy565;
 				}
 			} else {
 				if (yych <= 'x') {
-					if (yych == 'w') goto yy564;
+					if (yych == 'w') goto yy565;
 				} else {
-					if (yych <= 'y') goto yy564;
-					if (yych == 0xC2) goto yy564;
+					if (yych <= 'y') goto yy565;
+					if (yych == 0xC2) goto yy565;
 				}
 			}
 		}
 	}
-yy402:
-	YYDEBUG(402, *YYCURSOR);
-#line 1250 "parse_date.re"
+yy403:
+	YYDEBUG(403, *YYCURSOR);
+#line 1260 "parse_date.re"
 	{
 		DEBUG_OUTPUT("gnunocolon");
 		TIMELIB_INIT;
 		switch (s->time->have_time) {
 			case 0:
-				s->time->h = timelib_get_nr((char **) &ptr, 2);
-				s->time->i = timelib_get_nr((char **) &ptr, 2);
+				s->time->h = timelib_get_nr(&ptr, 2);
+				s->time->i = timelib_get_nr(&ptr, 2);
 				s->time->s = 0;
 				break;
 			case 1:
-				s->time->y = timelib_get_nr((char **) &ptr, 4);
+				s->time->y = timelib_get_nr(&ptr, 4);
 				break;
 			default:
 				TIMELIB_DEINIT;
@@ -10348,46 +10379,46 @@ yy402:
 		TIMELIB_DEINIT;
 		return TIMELIB_GNU_NOCOLON;
 	}
-#line 10352 "<stdout>"
-yy403:
-	YYDEBUG(403, *YYCURSOR);
-	yyaccept = 14;
+#line 10383 "<stdout>"
+yy404:
+	YYDEBUG(404, *YYCURSOR);
+	yyaccept = 13;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'O') {
 		if (yych <= '3') {
 			if (yych <= '-') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy564;
+					if (yych == '\t') goto yy565;
 				} else {
-					if (yych <= ' ') goto yy564;
-					if (yych >= '-') goto yy565;
+					if (yych <= ' ') goto yy565;
+					if (yych >= '-') goto yy566;
 				}
 			} else {
 				if (yych <= '0') {
-					if (yych <= '.') goto yy566;
-					if (yych <= '/') goto yy567;
-					goto yy589;
+					if (yych <= '.') goto yy567;
+					if (yych <= '/') goto yy568;
+					goto yy590;
 				} else {
-					if (yych <= '1') goto yy590;
-					if (yych <= '2') goto yy591;
-					goto yy592;
+					if (yych <= '1') goto yy591;
+					if (yych <= '2') goto yy592;
+					goto yy593;
 				}
 			}
 		} else {
 			if (yych <= 'D') {
 				if (yych <= '@') {
-					if (yych <= '9') goto yy574;
-					if (yych <= ':') goto yy575;
+					if (yych <= '9') goto yy575;
+					if (yych <= ':') goto yy576;
 				} else {
-					if (yych <= 'A') goto yy564;
-					if (yych >= 'D') goto yy564;
+					if (yych <= 'A') goto yy565;
+					if (yych >= 'D') goto yy565;
 				}
 			} else {
 				if (yych <= 'G') {
-					if (yych == 'F') goto yy564;
+					if (yych == 'F') goto yy565;
 				} else {
-					if (yych <= 'J') goto yy564;
-					if (yych >= 'M') goto yy564;
+					if (yych <= 'J') goto yy565;
+					if (yych >= 'M') goto yy565;
 				}
 			}
 		}
@@ -10395,51 +10426,51 @@ yy403:
 		if (yych <= 'h') {
 			if (yych <= 'a') {
 				if (yych <= 'W') {
-					if (yych <= 'R') goto yy404;
-					if (yych <= 'V') goto yy564;
-					goto yy587;
+					if (yych <= 'R') goto yy405;
+					if (yych <= 'V') goto yy565;
+					goto yy588;
 				} else {
-					if (yych <= 'Y') goto yy564;
-					if (yych >= 'a') goto yy564;
+					if (yych <= 'Y') goto yy565;
+					if (yych >= 'a') goto yy565;
 				}
 			} else {
 				if (yych <= 'e') {
-					if (yych == 'd') goto yy564;
+					if (yych == 'd') goto yy565;
 				} else {
-					if (yych != 'g') goto yy564;
+					if (yych != 'g') goto yy565;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'l') {
-					if (yych == 'j') goto yy564;
+					if (yych == 'j') goto yy565;
 				} else {
-					if (yych <= 'o') goto yy564;
-					if (yych >= 's') goto yy564;
+					if (yych <= 'o') goto yy565;
+					if (yych >= 's') goto yy565;
 				}
 			} else {
 				if (yych <= 'x') {
-					if (yych == 'w') goto yy564;
+					if (yych == 'w') goto yy565;
 				} else {
-					if (yych <= 'y') goto yy564;
-					if (yych == 0xC2) goto yy564;
+					if (yych <= 'y') goto yy565;
+					if (yych == 0xC2) goto yy565;
 				}
 			}
 		}
 	}
-yy404:
-	YYDEBUG(404, *YYCURSOR);
-#line 1620 "parse_date.re"
+yy405:
+	YYDEBUG(405, *YYCURSOR);
+#line 1642 "parse_date.re"
 	{
 		DEBUG_OUTPUT("year4");
 		TIMELIB_INIT;
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
+		s->time->y = timelib_get_nr(&ptr, 4);
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 10441 "<stdout>"
-yy405:
-	YYDEBUG(405, *YYCURSOR);
+#line 10472 "<stdout>"
+yy406:
+	YYDEBUG(406, *YYCURSOR);
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -10457,13 +10488,13 @@ yy405:
 			if (yych <= '9') goto yy240;
 			goto yy77;
 		} else {
-			if (yych <= 'I') goto yy593;
-			if (yych == 'i') goto yy593;
+			if (yych <= 'I') goto yy594;
+			if (yych == 'i') goto yy594;
 			goto yy77;
 		}
 	}
-yy406:
-	YYDEBUG(406, *YYCURSOR);
+yy407:
+	YYDEBUG(407, *YYCURSOR);
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -10481,19 +10512,19 @@ yy406:
 			if (yych <= '9') goto yy240;
 			goto yy77;
 		} else {
-			if (yych <= 'U') goto yy594;
-			if (yych == 'u') goto yy594;
+			if (yych <= 'U') goto yy595;
+			if (yych == 'u') goto yy595;
 			goto yy77;
 		}
 	}
-yy407:
-	YYDEBUG(407, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy595;
-	if (yych == 's') goto yy595;
-	goto yy250;
 yy408:
 	YYDEBUG(408, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'S') goto yy596;
+	if (yych == 's') goto yy596;
+	goto yy250;
+yy409:
+	YYDEBUG(409, *YYCURSOR);
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -10511,13 +10542,13 @@ yy408:
 			if (yych <= '9') goto yy240;
 			goto yy77;
 		} else {
-			if (yych <= 'E') goto yy596;
-			if (yych == 'e') goto yy596;
+			if (yych <= 'E') goto yy597;
+			if (yych == 'e') goto yy597;
 			goto yy77;
 		}
 	}
-yy409:
-	YYDEBUG(409, *YYCURSOR);
+yy410:
+	YYDEBUG(410, *YYCURSOR);
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -10535,38 +10566,38 @@ yy409:
 			if (yych <= '9') goto yy240;
 			goto yy77;
 		} else {
-			if (yych <= 'R') goto yy597;
-			if (yych == 'r') goto yy597;
+			if (yych <= 'R') goto yy598;
+			if (yych == 'r') goto yy598;
 			goto yy77;
 		}
 	}
-yy410:
-	YYDEBUG(410, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy598;
-	if (yych == 't') goto yy598;
-	goto yy56;
 yy411:
 	YYDEBUG(411, *YYCURSOR);
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy599;
-	if (yych == 'd') goto yy599;
-	goto yy250;
-yy412:
-	YYDEBUG(412, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy407;
-	if (yych == 'r') goto yy407;
+	if (yych == 'T') goto yy599;
+	if (yych == 't') goto yy599;
 	goto yy56;
+yy412:
+	YYDEBUG(412, *YYCURSOR);
+	yyaccept = 6;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == 'D') goto yy600;
+	if (yych == 'd') goto yy600;
+	goto yy250;
 yy413:
 	YYDEBUG(413, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy241;
-	if (yych <= '9') goto yy600;
-	goto yy241;
+	if (yych == 'R') goto yy408;
+	if (yych == 'r') goto yy408;
+	goto yy56;
 yy414:
 	YYDEBUG(414, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy241;
+	if (yych <= '9') goto yy601;
+	goto yy241;
+yy415:
+	YYDEBUG(415, *YYCURSOR);
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -10584,13 +10615,13 @@ yy414:
 			if (yych <= '9') goto yy240;
 			goto yy77;
 		} else {
-			if (yych <= 'U') goto yy601;
-			if (yych == 'u') goto yy601;
+			if (yych <= 'U') goto yy602;
+			if (yych == 'u') goto yy602;
 			goto yy77;
 		}
 	}
-yy415:
-	YYDEBUG(415, *YYCURSOR);
+yy416:
+	YYDEBUG(416, *YYCURSOR);
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -10613,8 +10644,8 @@ yy415:
 			goto yy77;
 		}
 	}
-yy416:
-	YYDEBUG(416, *YYCURSOR);
+yy417:
+	YYDEBUG(417, *YYCURSOR);
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -10637,8 +10668,8 @@ yy416:
 			goto yy77;
 		}
 	}
-yy417:
-	YYDEBUG(417, *YYCURSOR);
+yy418:
+	YYDEBUG(418, *YYCURSOR);
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -10656,65 +10687,65 @@ yy417:
 			if (yych <= '9') goto yy240;
 			goto yy77;
 		} else {
-			if (yych <= 'C') goto yy602;
-			if (yych == 'c') goto yy602;
+			if (yych <= 'C') goto yy603;
+			if (yych == 'c') goto yy603;
 			goto yy77;
 		}
 	}
-yy418:
-	YYDEBUG(418, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy603;
-	if (yych == 'r') goto yy603;
-	goto yy56;
 yy419:
 	YYDEBUG(419, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy604;
-	if (yych == 'l') goto yy604;
+	if (yych == 'R') goto yy604;
+	if (yych == 'r') goto yy604;
 	goto yy56;
 yy420:
 	YYDEBUG(420, *YYCURSOR);
-	yyaccept = 7;
+	yych = *++YYCURSOR;
+	if (yych == 'L') goto yy605;
+	if (yych == 'l') goto yy605;
+	goto yy56;
+yy421:
+	YYDEBUG(421, *YYCURSOR);
+	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'U') {
-		if (yych == 'S') goto yy595;
+		if (yych == 'S') goto yy596;
 		if (yych <= 'T') goto yy250;
-		goto yy605;
+		goto yy606;
 	} else {
 		if (yych <= 's') {
 			if (yych <= 'r') goto yy250;
-			goto yy595;
+			goto yy596;
 		} else {
-			if (yych == 'u') goto yy605;
+			if (yych == 'u') goto yy606;
 			goto yy250;
 		}
 	}
-yy421:
-	YYDEBUG(421, *YYCURSOR);
-	yyaccept = 7;
+yy422:
+	YYDEBUG(422, *YYCURSOR);
+	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
-		if (yych == 'D') goto yy599;
+		if (yych == 'D') goto yy600;
 		if (yych <= 'S') goto yy250;
-		goto yy606;
+		goto yy607;
 	} else {
 		if (yych <= 'd') {
 			if (yych <= 'c') goto yy250;
-			goto yy599;
+			goto yy600;
 		} else {
-			if (yych == 't') goto yy606;
+			if (yych == 't') goto yy607;
 			goto yy250;
 		}
 	}
-yy422:
-	YYDEBUG(422, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy407;
-	if (yych == 'c') goto yy407;
-	goto yy56;
 yy423:
 	YYDEBUG(423, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'C') goto yy408;
+	if (yych == 'c') goto yy408;
+	goto yy56;
+yy424:
+	YYDEBUG(424, *YYCURSOR);
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -10732,37 +10763,37 @@ yy423:
 			if (yych <= '9') goto yy240;
 			goto yy77;
 		} else {
-			if (yych <= 'O') goto yy607;
-			if (yych == 'o') goto yy607;
+			if (yych <= 'O') goto yy608;
+			if (yych == 'o') goto yy608;
 			goto yy77;
 		}
 	}
-yy424:
-	YYDEBUG(424, *YYCURSOR);
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy608;
-	if (yych == 'u') goto yy608;
-	goto yy250;
 yy425:
 	YYDEBUG(425, *YYCURSOR);
-	yyaccept = 7;
+	yyaccept = 6;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == 'U') goto yy609;
+	if (yych == 'u') goto yy609;
+	goto yy250;
+yy426:
+	YYDEBUG(426, *YYCURSOR);
+	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
-		if (yych == 'O') goto yy609;
+		if (yych == 'O') goto yy610;
 		if (yych <= 'R') goto yy250;
-		goto yy595;
+		goto yy596;
 	} else {
 		if (yych <= 'o') {
 			if (yych <= 'n') goto yy250;
-			goto yy609;
+			goto yy610;
 		} else {
-			if (yych == 's') goto yy595;
+			if (yych == 's') goto yy596;
 			goto yy250;
 		}
 	}
-yy426:
-	YYDEBUG(426, *YYCURSOR);
+yy427:
+	YYDEBUG(427, *YYCURSOR);
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -10780,69 +10811,69 @@ yy426:
 			if (yych <= '9') goto yy240;
 			goto yy77;
 		} else {
-			if (yych <= 'T') goto yy408;
-			if (yych == 't') goto yy408;
+			if (yych <= 'T') goto yy409;
+			if (yych == 't') goto yy409;
 			goto yy77;
 		}
 	}
-yy427:
-	YYDEBUG(427, *YYCURSOR);
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy610;
-	if (yych == 'r') goto yy610;
-	goto yy250;
 yy428:
 	YYDEBUG(428, *YYCURSOR);
-	yyaccept = 7;
+	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy611;
-	if (yych == 's') goto yy611;
+	if (yych == 'R') goto yy611;
+	if (yych == 'r') goto yy611;
 	goto yy250;
 yy429:
 	YYDEBUG(429, *YYCURSOR);
-	yyaccept = 7;
+	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy612;
-	if (yych == 'n') goto yy612;
+	if (yych == 'S') goto yy612;
+	if (yych == 's') goto yy612;
 	goto yy250;
 yy430:
 	YYDEBUG(430, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'K') goto yy613;
-	if (yych == 'k') goto yy613;
-	goto yy56;
+	yyaccept = 6;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == 'N') goto yy613;
+	if (yych == 'n') goto yy613;
+	goto yy250;
 yy431:
 	YYDEBUG(431, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy197;
-	if (yych <= '0') goto yy614;
-	if (yych <= '1') goto yy615;
-	if (yych <= '9') goto yy616;
-	goto yy197;
+	if (yych == 'K') goto yy614;
+	if (yych == 'k') goto yy614;
+	goto yy56;
 yy432:
 	YYDEBUG(432, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy617;
-	if (yych <= '6') goto yy618;
-	if (yych <= '9') goto yy552;
-	goto yy56;
+	if (yych <= '/') goto yy197;
+	if (yych <= '0') goto yy615;
+	if (yych <= '1') goto yy616;
+	if (yych <= '9') goto yy617;
+	goto yy197;
 yy433:
 	YYDEBUG(433, *YYCURSOR);
-	yyaccept = 5;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '5') goto yy618;
+	if (yych <= '6') goto yy619;
+	if (yych <= '9') goto yy553;
+	goto yy56;
+yy434:
+	YYDEBUG(434, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ':') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy619;
+			if (yych == '\t') goto yy620;
 			if (yych <= 0x1F) goto yy209;
-			goto yy619;
+			goto yy620;
 		} else {
 			if (yych <= '-') {
 				if (yych <= ',') goto yy209;
-				goto yy378;
+				goto yy379;
 			} else {
-				if (yych <= '.') goto yy432;
+				if (yych <= '.') goto yy433;
 				if (yych <= '9') goto yy209;
 			}
 		}
@@ -10861,27 +10892,27 @@ yy433:
 			}
 		}
 	}
-yy434:
-	YYDEBUG(434, *YYCURSOR);
+yy435:
+	YYDEBUG(435, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy621;
-	if (yych <= '6') goto yy622;
-	if (yych <= '9') goto yy555;
+	if (yych <= '5') goto yy622;
+	if (yych <= '6') goto yy623;
+	if (yych <= '9') goto yy556;
 	goto yy56;
-yy435:
-	YYDEBUG(435, *YYCURSOR);
-	yyaccept = 5;
+yy436:
+	YYDEBUG(436, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ':') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy619;
+			if (yych == '\t') goto yy620;
 			if (yych <= 0x1F) goto yy209;
-			goto yy619;
+			goto yy620;
 		} else {
-			if (yych == '.') goto yy434;
+			if (yych == '.') goto yy435;
 			if (yych <= '9') goto yy209;
-			goto yy434;
+			goto yy435;
 		}
 	} else {
 		if (yych <= 'P') {
@@ -10898,19 +10929,19 @@ yy435:
 			}
 		}
 	}
-yy436:
-	YYDEBUG(436, *YYCURSOR);
-	yyaccept = 5;
+yy437:
+	YYDEBUG(437, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ':') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy619;
+			if (yych == '\t') goto yy620;
 			if (yych <= 0x1F) goto yy209;
-			goto yy619;
+			goto yy620;
 		} else {
-			if (yych == '.') goto yy434;
+			if (yych == '.') goto yy435;
 			if (yych <= '9') goto yy209;
-			goto yy623;
+			goto yy624;
 		}
 	} else {
 		if (yych <= 'P') {
@@ -10927,79 +10958,73 @@ yy436:
 			}
 		}
 	}
-yy437:
-	YYDEBUG(437, *YYCURSOR);
-	++YYCURSOR;
+yy438:
 	YYDEBUG(438, *YYCURSOR);
-#line 1187 "parse_date.re"
+	++YYCURSOR;
+	YYDEBUG(439, *YYCURSOR);
+#line 1197 "parse_date.re"
 	{
 		DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
 		if (*ptr == ':' || *ptr == '.') {
-			s->time->i = timelib_get_nr((char **) &ptr, 2);
+			s->time->i = timelib_get_nr(&ptr, 2);
 			if (*ptr == ':' || *ptr == '.') {
-				s->time->s = timelib_get_nr((char **) &ptr, 2);
+				s->time->s = timelib_get_nr(&ptr, 2);
 			}
 		}
-		s->time->h += timelib_meridian((char **) &ptr, s->time->h);
+		s->time->h += timelib_meridian(&ptr, s->time->h);
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME12;
 	}
-#line 10951 "<stdout>"
-yy439:
-	YYDEBUG(439, *YYCURSOR);
+#line 10982 "<stdout>"
+yy440:
+	YYDEBUG(440, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy437;
+		if (yych <= 0x00) goto yy438;
 		if (yych <= 0x08) goto yy56;
-		goto yy437;
+		goto yy438;
 	} else {
-		if (yych == ' ') goto yy437;
+		if (yych == ' ') goto yy438;
 		goto yy56;
 	}
-yy440:
-	YYDEBUG(440, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '-') goto yy624;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy625;
-	goto yy56;
 yy441:
 	YYDEBUG(441, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy624;
+	if (yych == '-') goto yy625;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy625;
+	if (yych <= '9') goto yy626;
 	goto yy56;
 yy442:
 	YYDEBUG(442, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy624;
+	if (yych == '-') goto yy625;
+	if (yych <= '/') goto yy56;
+	if (yych <= '2') goto yy626;
 	goto yy56;
 yy443:
 	YYDEBUG(443, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == '-') goto yy625;
+	goto yy56;
+yy444:
+	YYDEBUG(444, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'P') goto yy626;
+		if (yych == 'P') goto yy627;
 		if (yych <= 'T') goto yy56;
-		goto yy627;
+		goto yy628;
 	} else {
 		if (yych <= 'p') {
 			if (yych <= 'o') goto yy56;
-			goto yy626;
+			goto yy627;
 		} else {
-			if (yych == 'u') goto yy627;
+			if (yych == 'u') goto yy628;
 			goto yy56;
 		}
 	}
-yy444:
-	YYDEBUG(444, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy628;
-	if (yych == 'e') goto yy628;
-	goto yy56;
 yy445:
 	YYDEBUG(445, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -11009,70 +11034,76 @@ yy445:
 yy446:
 	YYDEBUG(446, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == 'E') goto yy630;
+	if (yych == 'e') goto yy630;
+	goto yy56;
+yy447:
+	YYDEBUG(447, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'A') goto yy630;
+		if (yych == 'A') goto yy631;
 		if (yych <= 'T') goto yy56;
-		goto yy631;
+		goto yy632;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
-			goto yy630;
+			goto yy631;
 		} else {
-			if (yych == 'u') goto yy631;
+			if (yych == 'u') goto yy632;
 			goto yy56;
 		}
 	}
-yy447:
-	YYDEBUG(447, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy632;
-	if (yych == 'a') goto yy632;
-	goto yy56;
 yy448:
 	YYDEBUG(448, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy633;
-	if (yych == 'o') goto yy633;
+	if (yych == 'A') goto yy633;
+	if (yych == 'a') goto yy633;
 	goto yy56;
 yy449:
 	YYDEBUG(449, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy634;
-	if (yych == 'c') goto yy634;
+	if (yych == 'O') goto yy634;
+	if (yych == 'o') goto yy634;
 	goto yy56;
 yy450:
 	YYDEBUG(450, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy635;
-	if (yych == 'e') goto yy635;
+	if (yych == 'C') goto yy635;
+	if (yych == 'c') goto yy635;
 	goto yy56;
 yy451:
 	YYDEBUG(451, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy636;
+	if (yych == 'E') goto yy636;
+	if (yych == 'e') goto yy636;
 	goto yy56;
 yy452:
 	YYDEBUG(452, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy276;
+	if (yych <= '9') goto yy637;
+	goto yy276;
+yy453:
+	YYDEBUG(453, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= '@') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'Z') goto yy637;
+		if (yych <= 'Z') goto yy638;
 		if (yych <= '`') goto yy18;
-		if (yych <= 'z') goto yy637;
+		if (yych <= 'z') goto yy638;
 		goto yy18;
 	}
-yy453:
-	YYDEBUG(453, *YYCURSOR);
+yy454:
+	YYDEBUG(454, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy135;
-	if (yych <= '2') goto yy638;
-	if (yych <= '3') goto yy639;
+	if (yych <= '2') goto yy639;
+	if (yych <= '3') goto yy640;
 	goto yy135;
-yy454:
-	YYDEBUG(454, *YYCURSOR);
+yy455:
+	YYDEBUG(455, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych <= ')') {
@@ -11080,22 +11111,22 @@ yy454:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'K') goto yy637;
-			goto yy640;
+			if (yych <= 'K') goto yy638;
+			goto yy641;
 		}
 	} else {
 		if (yych <= 'k') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'l') goto yy640;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'l') goto yy641;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy455:
-	YYDEBUG(455, *YYCURSOR);
+yy456:
+	YYDEBUG(456, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -11103,40 +11134,40 @@ yy455:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'R') goto yy637;
-			goto yy641;
+			if (yych <= 'R') goto yy638;
+			goto yy642;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 's') goto yy641;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 's') goto yy642;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy456:
-	YYDEBUG(456, *YYCURSOR);
+yy457:
+	YYDEBUG(457, *YYCURSOR);
 	yyaccept = 2;
 	YYMARKER = ++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	YYDEBUG(457, *YYCURSOR);
+	YYDEBUG(458, *YYCURSOR);
 	if (yybm[0+yych] & 64) {
-		goto yy456;
+		goto yy457;
 	}
 	if (yych <= '.') {
-		if (yych == '-') goto yy282;
+		if (yych == '-') goto yy283;
 		goto yy18;
 	} else {
-		if (yych <= '/') goto yy282;
-		if (yych == '_') goto yy282;
+		if (yych <= '/') goto yy283;
+		if (yych == '_') goto yy283;
 		goto yy18;
 	}
-yy458:
-	YYDEBUG(458, *YYCURSOR);
+yy459:
+	YYDEBUG(459, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -11145,138 +11176,138 @@ yy458:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			goto yy282;
+			goto yy283;
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			goto yy18;
 		} else {
-			if (yych <= '_') goto yy282;
+			if (yych <= '_') goto yy283;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy642;
+			if (yych <= 'z') goto yy643;
 			goto yy18;
 		}
 	}
-yy459:
-	YYDEBUG(459, *YYCURSOR);
+yy460:
+	YYDEBUG(460, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yybm[0+yych] & 64) {
-		goto yy456;
+		goto yy457;
 	}
 	if (yych <= '/') goto yy135;
-	if (yych <= '2') goto yy638;
-	if (yych <= '3') goto yy639;
+	if (yych <= '2') goto yy639;
+	if (yych <= '3') goto yy640;
 	goto yy135;
-yy460:
-	YYDEBUG(460, *YYCURSOR);
+yy461:
+	YYDEBUG(461, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'K') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'L') goto yy640;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'L') goto yy641;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'k') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'l') goto yy643;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'l') goto yy644;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy461:
-	YYDEBUG(461, *YYCURSOR);
+yy462:
+	YYDEBUG(462, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy641;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'S') goto yy642;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'r') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 's') goto yy644;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 's') goto yy645;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy462:
-	YYDEBUG(462, *YYCURSOR);
+yy463:
+	YYDEBUG(463, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ')') {
-		if (yych == ' ') goto yy645;
+		if (yych == ' ') goto yy646;
 		if (yych <= '(') goto yy18;
 		goto yy108;
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy463:
-	YYDEBUG(463, *YYCURSOR);
+yy464:
+	YYDEBUG(464, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= '(') {
-			if (yych == ' ') goto yy645;
+			if (yych == ' ') goto yy646;
 			goto yy18;
 		} else {
 			if (yych <= ')') goto yy108;
-			if (yych == '-') goto yy282;
+			if (yych == '-') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			goto yy18;
 		} else {
-			if (yych <= '_') goto yy282;
+			if (yych <= '_') goto yy283;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy642;
+			if (yych <= 'z') goto yy643;
 			goto yy18;
 		}
 	}
-yy464:
-	YYDEBUG(464, *YYCURSOR);
+yy465:
+	YYDEBUG(465, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'M') {
 		if (yych <= ')') {
@@ -11284,53 +11315,53 @@ yy464:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'L') goto yy637;
-			goto yy646;
+			if (yych <= 'L') goto yy638;
+			goto yy647;
 		}
 	} else {
 		if (yych <= 'l') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'm') goto yy646;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'm') goto yy647;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy465:
-	YYDEBUG(465, *YYCURSOR);
+yy466:
+	YYDEBUG(466, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'M') goto yy646;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'M') goto yy647;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'l') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'm') goto yy647;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'm') goto yy648;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy466:
-	YYDEBUG(466, *YYCURSOR);
+yy467:
+	YYDEBUG(467, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -11338,22 +11369,22 @@ yy466:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy637;
-			goto yy648;
+			if (yych <= 'S') goto yy638;
+			goto yy649;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 't') goto yy648;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 't') goto yy649;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy467:
-	YYDEBUG(467, *YYCURSOR);
+yy468:
+	YYDEBUG(468, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -11361,84 +11392,84 @@ yy467:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'D') goto yy637;
-			goto yy649;
+			if (yych <= 'D') goto yy638;
+			goto yy650;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'e') goto yy649;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'e') goto yy650;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy468:
-	YYDEBUG(468, *YYCURSOR);
+yy469:
+	YYDEBUG(469, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy648;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'T') goto yy649;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 't') goto yy650;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 't') goto yy651;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy469:
-	YYDEBUG(469, *YYCURSOR);
+yy470:
+	YYDEBUG(470, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy649;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'E') goto yy650;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'd') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'e') goto yy651;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'e') goto yy652;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy470:
-	YYDEBUG(470, *YYCURSOR);
+yy471:
+	YYDEBUG(471, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= ')') {
@@ -11446,22 +11477,22 @@ yy470:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'T') goto yy637;
-			goto yy652;
+			if (yych <= 'T') goto yy638;
+			goto yy653;
 		}
 	} else {
 		if (yych <= 't') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'u') goto yy652;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'u') goto yy653;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy471:
-	YYDEBUG(471, *YYCURSOR);
+yy472:
+	YYDEBUG(472, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -11469,22 +11500,22 @@ yy471:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'G') goto yy637;
-			goto yy653;
+			if (yych <= 'G') goto yy638;
+			goto yy654;
 		}
 	} else {
 		if (yych <= 'g') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'h') goto yy653;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'h') goto yy654;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy472:
-	YYDEBUG(472, *YYCURSOR);
+yy473:
+	YYDEBUG(473, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -11492,22 +11523,22 @@ yy472:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy637;
-			goto yy654;
+			if (yych <= 'S') goto yy638;
+			goto yy655;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 't') goto yy654;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 't') goto yy655;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy473:
-	YYDEBUG(473, *YYCURSOR);
+yy474:
+	YYDEBUG(474, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -11515,39 +11546,39 @@ yy473:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy637;
-			goto yy655;
+			if (yych <= 'S') goto yy638;
+			goto yy656;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 't') goto yy655;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 't') goto yy656;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy474:
-	YYDEBUG(474, *YYCURSOR);
+yy475:
+	YYDEBUG(475, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy108;
 		if (yych <= '@') goto yy18;
-		goto yy656;
+		goto yy657;
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			goto yy18;
 		} else {
-			if (yych <= 'a') goto yy656;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'a') goto yy657;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy475:
-	YYDEBUG(475, *YYCURSOR);
+yy476:
+	YYDEBUG(476, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -11555,146 +11586,146 @@ yy475:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy637;
-			goto yy657;
+			if (yych <= 'S') goto yy638;
+			goto yy658;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 't') goto yy657;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 't') goto yy658;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy476:
-	YYDEBUG(476, *YYCURSOR);
+yy477:
+	YYDEBUG(477, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'U') goto yy652;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'U') goto yy653;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 't') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'u') goto yy658;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'u') goto yy659;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy477:
-	YYDEBUG(477, *YYCURSOR);
+yy478:
+	YYDEBUG(478, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'H') goto yy653;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'H') goto yy654;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'g') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'h') goto yy659;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'h') goto yy660;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy478:
-	YYDEBUG(478, *YYCURSOR);
+yy479:
+	YYDEBUG(479, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy654;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'T') goto yy655;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 't') goto yy660;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 't') goto yy661;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy479:
-	YYDEBUG(479, *YYCURSOR);
+yy480:
+	YYDEBUG(480, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy655;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'T') goto yy656;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 't') goto yy661;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 't') goto yy662;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy480:
-	YYDEBUG(480, *YYCURSOR);
+yy481:
+	YYDEBUG(481, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -11703,217 +11734,217 @@ yy480:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy656;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'A') goto yy657;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'a') goto yy662;
-			if (yych <= 'z') goto yy642;
+			if (yych <= 'a') goto yy663;
+			if (yych <= 'z') goto yy643;
 			goto yy18;
 		}
 	}
-yy481:
-	YYDEBUG(481, *YYCURSOR);
+yy482:
+	YYDEBUG(482, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy657;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'T') goto yy658;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 't') goto yy663;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 't') goto yy664;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy482:
-	YYDEBUG(482, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy664;
-	if (yych <= '2') goto yy665;
-	if (yych <= '9') goto yy666;
-	goto yy56;
 yy483:
 	YYDEBUG(483, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy667;
-		goto yy56;
-	} else {
-		if (yych <= '0') goto yy668;
-		if (yych <= '9') goto yy486;
-		if (yych <= ':') goto yy667;
-		goto yy56;
-	}
+	if (yych <= '/') goto yy56;
+	if (yych <= '1') goto yy665;
+	if (yych <= '2') goto yy666;
+	if (yych <= '9') goto yy667;
+	goto yy56;
 yy484:
 	YYDEBUG(484, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych == '.') goto yy669;
+		if (yych == '.') goto yy668;
 		goto yy56;
 	} else {
-		if (yych <= '2') goto yy486;
-		if (yych <= '9') goto yy668;
-		if (yych <= ':') goto yy669;
+		if (yych <= '0') goto yy669;
+		if (yych <= '9') goto yy487;
+		if (yych <= ':') goto yy668;
 		goto yy56;
 	}
 yy485:
 	YYDEBUG(485, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych == '.') goto yy669;
+		if (yych == '.') goto yy670;
 		goto yy56;
 	} else {
-		if (yych <= '4') goto yy668;
-		if (yych == ':') goto yy669;
+		if (yych <= '2') goto yy487;
+		if (yych <= '9') goto yy669;
+		if (yych <= ':') goto yy670;
 		goto yy56;
 	}
 yy486:
 	YYDEBUG(486, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '.') goto yy669;
-	if (yych == ':') goto yy669;
-	goto yy56;
+	if (yych <= '/') {
+		if (yych == '.') goto yy670;
+		goto yy56;
+	} else {
+		if (yych <= '4') goto yy669;
+		if (yych == ':') goto yy670;
+		goto yy56;
+	}
 yy487:
 	YYDEBUG(487, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy670;
-	if (yych <= '2') goto yy671;
-	if (yych <= '9') goto yy668;
+	if (yych == '.') goto yy670;
+	if (yych == ':') goto yy670;
 	goto yy56;
 yy488:
 	YYDEBUG(488, *YYCURSOR);
-	yyaccept = 11;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy667;
-		goto yy310;
-	} else {
-		if (yych <= '0') goto yy672;
-		if (yych <= '9') goto yy673;
-		if (yych <= ':') goto yy667;
-		goto yy310;
-	}
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '1') goto yy671;
+	if (yych <= '2') goto yy672;
+	if (yych <= '9') goto yy669;
+	goto yy56;
 yy489:
 	YYDEBUG(489, *YYCURSOR);
-	yyaccept = 11;
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy669;
-		goto yy310;
+		if (yych == '.') goto yy668;
+		goto yy311;
 	} else {
-		if (yych <= '2') goto yy673;
-		if (yych <= '9') goto yy672;
-		if (yych <= ':') goto yy669;
-		goto yy310;
+		if (yych <= '0') goto yy673;
+		if (yych <= '9') goto yy674;
+		if (yych <= ':') goto yy668;
+		goto yy311;
 	}
 yy490:
 	YYDEBUG(490, *YYCURSOR);
-	yyaccept = 11;
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy669;
-		goto yy310;
+		if (yych == '.') goto yy670;
+		goto yy311;
 	} else {
-		if (yych <= '4') goto yy672;
-		if (yych <= '9') goto yy674;
-		if (yych <= ':') goto yy669;
-		goto yy310;
+		if (yych <= '2') goto yy674;
+		if (yych <= '9') goto yy673;
+		if (yych <= ':') goto yy670;
+		goto yy311;
 	}
 yy491:
 	YYDEBUG(491, *YYCURSOR);
-	yyaccept = 11;
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy669;
-		goto yy310;
+		if (yych == '.') goto yy670;
+		goto yy311;
 	} else {
-		if (yych <= '9') goto yy674;
-		if (yych <= ':') goto yy669;
-		goto yy310;
+		if (yych <= '4') goto yy673;
+		if (yych <= '9') goto yy675;
+		if (yych <= ':') goto yy670;
+		goto yy311;
 	}
 yy492:
 	YYDEBUG(492, *YYCURSOR);
+	yyaccept = 10;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') {
+		if (yych == '.') goto yy670;
+		goto yy311;
+	} else {
+		if (yych <= '9') goto yy675;
+		if (yych <= ':') goto yy670;
+		goto yy311;
+	}
+yy493:
+	YYDEBUG(493, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy675;
+	if (yych <= '9') goto yy676;
 	goto yy56;
-yy493:
-	YYDEBUG(493, *YYCURSOR);
-	yyaccept = 11;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x00) goto yy309;
-	goto yy312;
 yy494:
 	YYDEBUG(494, *YYCURSOR);
+	yyaccept = 10;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= 0x00) goto yy310;
+	goto yy313;
+yy495:
+	YYDEBUG(495, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy108;
 		if (yych <= '@') goto yy18;
-		goto yy677;
+		goto yy678;
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			goto yy18;
 		} else {
-			if (yych <= 'a') goto yy677;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'a') goto yy678;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy495:
-	YYDEBUG(495, *YYCURSOR);
-	yyaccept = 8;
+yy496:
+	YYDEBUG(496, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
 		if (yych <= 0x1F) {
 			if (yych == '\t') goto yy135;
-			goto yy280;
+			goto yy281;
 		} else {
 			if (yych <= ' ') goto yy135;
 			if (yych == ')') goto yy108;
-			goto yy280;
+			goto yy281;
 		}
 	} else {
 		if (yych <= '@') {
-			if (yych == '/') goto yy280;
+			if (yych == '/') goto yy281;
 			if (yych <= '9') goto yy135;
-			goto yy280;
+			goto yy281;
 		} else {
-			if (yych <= 'Z') goto yy637;
-			if (yych <= '`') goto yy280;
-			if (yych <= 'z') goto yy637;
-			goto yy280;
+			if (yych <= 'Z') goto yy638;
+			if (yych <= '`') goto yy281;
+			if (yych <= 'z') goto yy638;
+			goto yy281;
 		}
 	}
-yy496:
-	YYDEBUG(496, *YYCURSOR);
+yy497:
+	YYDEBUG(497, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -11922,113 +11953,113 @@ yy496:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy677;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'A') goto yy678;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'a') goto yy678;
-			if (yych <= 'z') goto yy642;
+			if (yych <= 'a') goto yy679;
+			if (yych <= 'z') goto yy643;
 			goto yy18;
 		}
 	}
-yy497:
-	YYDEBUG(497, *YYCURSOR);
-	yyaccept = 8;
+yy498:
+	YYDEBUG(498, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= ' ') {
 			if (yych == '\t') goto yy135;
-			if (yych <= 0x1F) goto yy280;
+			if (yych <= 0x1F) goto yy281;
 			goto yy135;
 		} else {
 			if (yych <= ')') {
-				if (yych <= '(') goto yy280;
+				if (yych <= '(') goto yy281;
 				goto yy108;
 			} else {
-				if (yych <= ',') goto yy280;
-				if (yych <= '-') goto yy679;
+				if (yych <= ',') goto yy281;
+				if (yych <= '-') goto yy680;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			if (yych <= '9') goto yy135;
-			if (yych <= '@') goto yy280;
-			goto yy637;
+			if (yych <= '@') goto yy281;
+			goto yy638;
 		} else {
 			if (yych <= '_') {
-				if (yych <= '^') goto yy280;
-				goto yy282;
+				if (yych <= '^') goto yy281;
+				goto yy283;
 			} else {
-				if (yych <= '`') goto yy280;
-				if (yych <= 'z') goto yy642;
-				goto yy280;
+				if (yych <= '`') goto yy281;
+				if (yych <= 'z') goto yy643;
+				goto yy281;
 			}
 		}
 	}
-yy498:
-	YYDEBUG(498, *YYCURSOR);
+yy499:
+	YYDEBUG(499, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '(') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy18;
-			goto yy680;
+			goto yy681;
 		} else {
-			if (yych == ' ') goto yy682;
+			if (yych == ' ') goto yy683;
 			goto yy18;
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= ')') goto yy108;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy499:
-	YYDEBUG(499, *YYCURSOR);
+yy500:
+	YYDEBUG(500, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy680;
+			if (yych == '\t') goto yy681;
 			if (yych <= 0x1F) goto yy18;
-			goto yy682;
+			goto yy683;
 		} else {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		}
 	} else {
 		if (yych <= 'Z') {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
 			if (yych <= '_') {
 				if (yych <= '^') goto yy18;
-				goto yy282;
+				goto yy283;
 			} else {
 				if (yych <= '`') goto yy18;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy500:
-	YYDEBUG(500, *YYCURSOR);
+yy501:
+	YYDEBUG(501, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -12036,22 +12067,22 @@ yy500:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'G') goto yy637;
-			goto yy640;
+			if (yych <= 'G') goto yy638;
+			goto yy641;
 		}
 	} else {
 		if (yych <= 'g') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'h') goto yy640;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'h') goto yy641;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy501:
-	YYDEBUG(501, *YYCURSOR);
+yy502:
+	YYDEBUG(502, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'I') {
 		if (yych <= ')') {
@@ -12059,118 +12090,118 @@ yy501:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'H') goto yy637;
-			goto yy683;
+			if (yych <= 'H') goto yy638;
+			goto yy684;
 		}
 	} else {
 		if (yych <= 'h') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'i') goto yy683;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'i') goto yy684;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy502:
-	YYDEBUG(502, *YYCURSOR);
+yy503:
+	YYDEBUG(503, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'H') goto yy640;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'H') goto yy641;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'g') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'h') goto yy643;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'h') goto yy644;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy503:
-	YYDEBUG(503, *YYCURSOR);
+yy504:
+	YYDEBUG(504, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'H') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'I') goto yy683;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'I') goto yy684;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'h') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'i') goto yy684;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'i') goto yy685;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy504:
-	YYDEBUG(504, *YYCURSOR);
+yy505:
+	YYDEBUG(505, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '(') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy18;
-			goto yy680;
+			goto yy681;
 		} else {
-			if (yych == ' ') goto yy680;
+			if (yych == ' ') goto yy681;
 			goto yy18;
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= ')') goto yy108;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy505:
-	YYDEBUG(505, *YYCURSOR);
+yy506:
+	YYDEBUG(506, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
 		if (yych == ')') goto yy108;
 	} else {
-		if (yych <= 'Z') goto yy637;
-		if (yych <= '`') goto yy506;
-		if (yych <= 'z') goto yy637;
+		if (yych <= 'Z') goto yy638;
+		if (yych <= '`') goto yy507;
+		if (yych <= 'z') goto yy638;
 	}
-yy506:
-	YYDEBUG(506, *YYCURSOR);
-#line 1037 "parse_date.re"
+yy507:
+	YYDEBUG(507, *YYCURSOR);
+#line 1042 "parse_date.re"
 	{
 		DEBUG_OUTPUT("noon");
 		TIMELIB_INIT;
@@ -12181,63 +12212,63 @@ yy506:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 12185 "<stdout>"
-yy507:
-	YYDEBUG(507, *YYCURSOR);
+#line 12216 "<stdout>"
+yy508:
+	YYDEBUG(508, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy680;
+			if (yych == '\t') goto yy681;
 			if (yych <= 0x1F) goto yy18;
-			goto yy680;
+			goto yy681;
 		} else {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		}
 	} else {
 		if (yych <= 'Z') {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
 			if (yych <= '_') {
 				if (yych <= '^') goto yy18;
-				goto yy282;
+				goto yy283;
 			} else {
 				if (yych <= '`') goto yy18;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy508:
-	YYDEBUG(508, *YYCURSOR);
-	yyaccept = 15;
+yy509:
+	YYDEBUG(509, *YYCURSOR);
+	yyaccept = 14;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
 			if (yych == ')') goto yy108;
-			goto yy506;
+			goto yy507;
 		} else {
-			if (yych == '.') goto yy506;
-			goto yy282;
+			if (yych == '.') goto yy507;
+			goto yy283;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy506;
-			if (yych <= 'Z') goto yy637;
-			goto yy506;
+			if (yych <= '@') goto yy507;
+			if (yych <= 'Z') goto yy638;
+			goto yy507;
 		} else {
-			if (yych <= '_') goto yy282;
-			if (yych <= '`') goto yy506;
-			if (yych <= 'z') goto yy642;
-			goto yy506;
+			if (yych <= '_') goto yy283;
+			if (yych <= '`') goto yy507;
+			if (yych <= 'z') goto yy643;
+			goto yy507;
 		}
 	}
-yy509:
-	YYDEBUG(509, *YYCURSOR);
+yy510:
+	YYDEBUG(510, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'B') {
 		if (yych <= ')') {
@@ -12245,53 +12276,53 @@ yy509:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'A') goto yy637;
-			goto yy685;
+			if (yych <= 'A') goto yy638;
+			goto yy686;
 		}
 	} else {
 		if (yych <= 'a') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'b') goto yy685;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'b') goto yy686;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy510:
-	YYDEBUG(510, *YYCURSOR);
+yy511:
+	YYDEBUG(511, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'B') goto yy685;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'B') goto yy686;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'a') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'b') goto yy686;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'b') goto yy687;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy511:
-	YYDEBUG(511, *YYCURSOR);
+yy512:
+	YYDEBUG(512, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'I') {
 		if (yych <= ')') {
@@ -12299,53 +12330,53 @@ yy511:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'H') goto yy637;
-			goto yy687;
+			if (yych <= 'H') goto yy638;
+			goto yy688;
 		}
 	} else {
 		if (yych <= 'h') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'i') goto yy687;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'i') goto yy688;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy512:
-	YYDEBUG(512, *YYCURSOR);
+yy513:
+	YYDEBUG(513, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'H') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'I') goto yy687;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'I') goto yy688;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'h') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'i') goto yy688;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'i') goto yy689;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy513:
-	YYDEBUG(513, *YYCURSOR);
+yy514:
+	YYDEBUG(514, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -12353,22 +12384,22 @@ yy513:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Q') goto yy637;
-			goto yy689;
+			if (yych <= 'Q') goto yy638;
+			goto yy690;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'r') goto yy689;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'r') goto yy690;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy514:
-	YYDEBUG(514, *YYCURSOR);
+yy515:
+	YYDEBUG(515, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -12376,65 +12407,65 @@ yy514:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'M') goto yy637;
-			goto yy690;
+			if (yych <= 'M') goto yy638;
+			goto yy691;
 		}
 	} else {
 		if (yych <= 'm') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'n') goto yy690;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'n') goto yy691;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy515:
-	YYDEBUG(515, *YYCURSOR);
-	yyaccept = 8;
+yy516:
+	YYDEBUG(516, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= ',') {
 				if (yych <= ')') goto yy108;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych <= '-') goto yy453;
+				if (yych <= '-') goto yy454;
 				if (yych <= '.') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') {
 				if (yych <= '9') goto yy135;
-				goto yy280;
+				goto yy281;
 			} else {
-				if (yych == 'E') goto yy691;
-				goto yy637;
+				if (yych == 'E') goto yy692;
+				goto yy638;
 			}
 		} else {
 			if (yych <= 'd') {
-				if (yych <= '`') goto yy280;
-				goto yy637;
+				if (yych <= '`') goto yy281;
+				goto yy638;
 			} else {
-				if (yych <= 'e') goto yy691;
-				if (yych <= 'z') goto yy637;
-				goto yy280;
+				if (yych <= 'e') goto yy692;
+				if (yych <= 'z') goto yy638;
+				goto yy281;
 			}
 		}
 	}
-yy516:
-	YYDEBUG(516, *YYCURSOR);
+yy517:
+	YYDEBUG(517, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -12442,166 +12473,166 @@ yy516:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'M') goto yy637;
-			goto yy692;
+			if (yych <= 'M') goto yy638;
+			goto yy693;
 		}
 	} else {
 		if (yych <= 'm') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'n') goto yy692;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'n') goto yy693;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy517:
-	YYDEBUG(517, *YYCURSOR);
+yy518:
+	YYDEBUG(518, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy689;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'R') goto yy690;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'q') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'r') goto yy693;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'r') goto yy694;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy518:
-	YYDEBUG(518, *YYCURSOR);
+yy519:
+	YYDEBUG(519, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy690;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'N') goto yy691;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'm') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'n') goto yy694;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'n') goto yy695;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy519:
-	YYDEBUG(519, *YYCURSOR);
-	yyaccept = 8;
+yy520:
+	YYDEBUG(520, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
-				if (yych <= 0x08) goto yy280;
+				if (yych <= 0x08) goto yy281;
 				goto yy135;
 			} else {
 				if (yych == ' ') goto yy135;
-				goto yy280;
+				goto yy281;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= ')') goto yy108;
-				if (yych <= ',') goto yy280;
-				goto yy459;
+				if (yych <= ',') goto yy281;
+				goto yy460;
 			} else {
-				if (yych == '/') goto yy282;
+				if (yych == '/') goto yy283;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'D') {
-				if (yych <= '@') goto yy280;
-				goto yy637;
+				if (yych <= '@') goto yy281;
+				goto yy638;
 			} else {
-				if (yych <= 'E') goto yy691;
-				if (yych <= 'Z') goto yy637;
-				goto yy280;
+				if (yych <= 'E') goto yy692;
+				if (yych <= 'Z') goto yy638;
+				goto yy281;
 			}
 		} else {
 			if (yych <= 'd') {
-				if (yych <= '_') goto yy282;
-				if (yych <= '`') goto yy280;
-				goto yy642;
+				if (yych <= '_') goto yy283;
+				if (yych <= '`') goto yy281;
+				goto yy643;
 			} else {
-				if (yych <= 'e') goto yy695;
-				if (yych <= 'z') goto yy642;
-				goto yy280;
+				if (yych <= 'e') goto yy696;
+				if (yych <= 'z') goto yy643;
+				goto yy281;
 			}
 		}
 	}
-yy520:
-	YYDEBUG(520, *YYCURSOR);
+yy521:
+	YYDEBUG(521, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy692;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'N') goto yy693;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'm') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'n') goto yy696;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'n') goto yy697;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy521:
-	YYDEBUG(521, *YYCURSOR);
+yy522:
+	YYDEBUG(522, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy697;
+	if (yych <= '9') goto yy698;
 	goto yy56;
-yy522:
-	YYDEBUG(522, *YYCURSOR);
+yy523:
+	YYDEBUG(523, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -12609,22 +12640,22 @@ yy522:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'C') goto yy637;
-			goto yy653;
+			if (yych <= 'C') goto yy638;
+			goto yy654;
 		}
 	} else {
 		if (yych <= 'c') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'd') goto yy653;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'd') goto yy654;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy523:
-	YYDEBUG(523, *YYCURSOR);
+yy524:
+	YYDEBUG(524, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -12632,22 +12663,22 @@ yy523:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'R') goto yy637;
-			goto yy689;
+			if (yych <= 'R') goto yy638;
+			goto yy690;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 's') goto yy689;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 's') goto yy690;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy524:
-	YYDEBUG(524, *YYCURSOR);
+yy525:
+	YYDEBUG(525, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
 		if (yych <= ')') {
@@ -12655,22 +12686,22 @@ yy524:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'X') goto yy637;
-			goto yy698;
+			if (yych <= 'X') goto yy638;
+			goto yy699;
 		}
 	} else {
 		if (yych <= 'x') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'y') goto yy698;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'y') goto yy699;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy525:
-	YYDEBUG(525, *YYCURSOR);
+yy526:
+	YYDEBUG(526, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -12678,22 +12709,22 @@ yy525:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Q') goto yy637;
-			goto yy700;
+			if (yych <= 'Q') goto yy638;
+			goto yy701;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'r') goto yy700;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'r') goto yy701;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy526:
-	YYDEBUG(526, *YYCURSOR);
+yy527:
+	YYDEBUG(527, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -12701,22 +12732,22 @@ yy526:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'C') goto yy637;
-			goto yy701;
+			if (yych <= 'C') goto yy638;
+			goto yy702;
 		}
 	} else {
 		if (yych <= 'c') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'd') goto yy701;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'd') goto yy702;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy527:
-	YYDEBUG(527, *YYCURSOR);
+yy528:
+	YYDEBUG(528, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'F') {
 		if (yych <= ')') {
@@ -12724,208 +12755,208 @@ yy527:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'E') goto yy637;
-			goto yy692;
+			if (yych <= 'E') goto yy638;
+			goto yy693;
 		}
 	} else {
 		if (yych <= 'e') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'f') goto yy692;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'f') goto yy693;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy528:
-	YYDEBUG(528, *YYCURSOR);
+yy529:
+	YYDEBUG(529, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy653;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'D') goto yy654;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'c') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'd') goto yy659;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'd') goto yy660;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy529:
-	YYDEBUG(529, *YYCURSOR);
+yy530:
+	YYDEBUG(530, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy689;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'S') goto yy690;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'r') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 's') goto yy693;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 's') goto yy694;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy530:
-	YYDEBUG(530, *YYCURSOR);
+yy531:
+	YYDEBUG(531, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'Y') goto yy698;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Y') goto yy699;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'x') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'y') goto yy702;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'y') goto yy703;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy531:
-	YYDEBUG(531, *YYCURSOR);
+yy532:
+	YYDEBUG(532, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy700;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'R') goto yy701;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'q') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'r') goto yy703;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'r') goto yy704;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy532:
-	YYDEBUG(532, *YYCURSOR);
+yy533:
+	YYDEBUG(533, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy701;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'D') goto yy702;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'c') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'd') goto yy704;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'd') goto yy705;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy533:
-	YYDEBUG(533, *YYCURSOR);
+yy534:
+	YYDEBUG(534, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'E') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'F') goto yy692;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'F') goto yy693;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'e') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'f') goto yy696;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'f') goto yy697;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy534:
-	YYDEBUG(534, *YYCURSOR);
+yy535:
+	YYDEBUG(535, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
@@ -12943,14 +12974,14 @@ yy534:
 			if (yych <= '9') goto yy135;
 			goto yy18;
 		} else {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy535:
-	YYDEBUG(535, *YYCURSOR);
+yy536:
+	YYDEBUG(536, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -12958,22 +12989,22 @@ yy535:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'D') goto yy637;
-			goto yy705;
+			if (yych <= 'D') goto yy638;
+			goto yy706;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'e') goto yy705;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'e') goto yy706;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy536:
-	YYDEBUG(536, *YYCURSOR);
+yy537:
+	YYDEBUG(537, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -12981,84 +13012,84 @@ yy536:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'C') goto yy637;
-			goto yy706;
+			if (yych <= 'C') goto yy638;
+			goto yy707;
 		}
 	} else {
 		if (yych <= 'c') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'd') goto yy706;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'd') goto yy707;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy537:
-	YYDEBUG(537, *YYCURSOR);
+yy538:
+	YYDEBUG(538, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy705;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'E') goto yy706;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'd') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'e') goto yy707;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'e') goto yy708;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy538:
-	YYDEBUG(538, *YYCURSOR);
+yy539:
+	YYDEBUG(539, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy706;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'D') goto yy707;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'c') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'd') goto yy708;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'd') goto yy709;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy539:
-	YYDEBUG(539, *YYCURSOR);
+yy540:
+	YYDEBUG(540, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -13066,59 +13097,59 @@ yy539:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'D') goto yy637;
-			goto yy709;
+			if (yych <= 'D') goto yy638;
+			goto yy710;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '`') goto yy18;
-			goto yy637;
+			goto yy638;
 		} else {
-			if (yych <= 'e') goto yy709;
-			if (yych <= 'z') goto yy637;
+			if (yych <= 'e') goto yy710;
+			if (yych <= 'z') goto yy638;
 			goto yy18;
 		}
 	}
-yy540:
-	YYDEBUG(540, *YYCURSOR);
+yy541:
+	YYDEBUG(541, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy637;
+			goto yy638;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy709;
-			if (yych <= 'Z') goto yy637;
+			if (yych <= 'E') goto yy710;
+			if (yych <= 'Z') goto yy638;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'd') {
 				if (yych <= '`') goto yy18;
-				goto yy642;
+				goto yy643;
 			} else {
-				if (yych <= 'e') goto yy710;
-				if (yych <= 'z') goto yy642;
+				if (yych <= 'e') goto yy711;
+				if (yych <= 'z') goto yy643;
 				goto yy18;
 			}
 		}
 	}
-yy541:
-	YYDEBUG(541, *YYCURSOR);
+yy542:
+	YYDEBUG(542, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy574;
+	if (yych <= '9') goto yy575;
 	goto yy186;
-yy542:
-	YYDEBUG(542, *YYCURSOR);
+yy543:
+	YYDEBUG(543, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'V') {
@@ -13130,10 +13161,10 @@ yy542:
 			} else {
 				if (yych <= '-') {
 					if (yych <= ',') goto yy18;
-					goto yy711;
+					goto yy712;
 				} else {
 					if (yych <= '/') goto yy18;
-					if (yych <= '9') goto yy574;
+					if (yych <= '9') goto yy713;
 					goto yy18;
 				}
 			}
@@ -13197,221 +13228,221 @@ yy542:
 			}
 		}
 	}
-yy543:
-	YYDEBUG(543, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '-') goto yy711;
-	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy574;
-	goto yy186;
 yy544:
 	YYDEBUG(544, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy712;
-	goto yy56;
+	if (yych == '-') goto yy712;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy713;
+	goto yy186;
 yy545:
 	YYDEBUG(545, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy713;
+	if (yych <= '9') goto yy714;
 	goto yy56;
 yy546:
 	YYDEBUG(546, *YYCURSOR);
-	yyaccept = 16;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy715;
+	goto yy56;
+yy547:
+	YYDEBUG(547, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy547;
-		if (yych <= '9') goto yy715;
-		if (yych >= 'n') goto yy716;
+		if (yych <= '/') goto yy548;
+		if (yych <= '9') goto yy717;
+		if (yych >= 'n') goto yy718;
 	} else {
 		if (yych <= 'r') {
-			if (yych >= 'r') goto yy716;
+			if (yych >= 'r') goto yy718;
 		} else {
-			if (yych <= 's') goto yy717;
-			if (yych <= 't') goto yy718;
+			if (yych <= 's') goto yy719;
+			if (yych <= 't') goto yy720;
 		}
 	}
-yy547:
-	YYDEBUG(547, *YYCURSOR);
-#line 1372 "parse_date.re"
+yy548:
+	YYDEBUG(548, *YYCURSOR);
+#line 1394 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshort");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 13251 "<stdout>"
-yy548:
-	YYDEBUG(548, *YYCURSOR);
-	yyaccept = 16;
+#line 13282 "<stdout>"
+yy549:
+	YYDEBUG(549, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
 		if (yych <= '1') {
-			if (yych <= '/') goto yy547;
-			goto yy715;
+			if (yych <= '/') goto yy548;
+			goto yy717;
 		} else {
-			if (yych <= '9') goto yy712;
-			if (yych <= 'm') goto yy547;
-			goto yy716;
+			if (yych <= '9') goto yy714;
+			if (yych <= 'm') goto yy548;
+			goto yy718;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy547;
-			goto yy716;
+			if (yych <= 'q') goto yy548;
+			goto yy718;
 		} else {
-			if (yych <= 's') goto yy717;
-			if (yych <= 't') goto yy718;
-			goto yy547;
+			if (yych <= 's') goto yy719;
+			if (yych <= 't') goto yy720;
+			goto yy548;
 		}
 	}
-yy549:
-	YYDEBUG(549, *YYCURSOR);
-	yyaccept = 16;
+yy550:
+	YYDEBUG(550, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy547;
-		if (yych <= '9') goto yy712;
-		if (yych <= 'm') goto yy547;
-		goto yy716;
+		if (yych <= '/') goto yy548;
+		if (yych <= '9') goto yy714;
+		if (yych <= 'm') goto yy548;
+		goto yy718;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy547;
-			goto yy716;
+			if (yych <= 'q') goto yy548;
+			goto yy718;
 		} else {
-			if (yych <= 's') goto yy717;
-			if (yych <= 't') goto yy718;
-			goto yy547;
+			if (yych <= 's') goto yy719;
+			if (yych <= 't') goto yy720;
+			goto yy548;
 		}
 	}
-yy550:
-	YYDEBUG(550, *YYCURSOR);
-	yyaccept = 5;
+yy551:
+	YYDEBUG(551, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy719;
+	if (yych == '.') goto yy721;
 	if (yych <= '/') goto yy209;
-	if (yych <= '9') goto yy720;
+	if (yych <= '9') goto yy722;
 	goto yy209;
-yy551:
-	YYDEBUG(551, *YYCURSOR);
-	yyaccept = 5;
+yy552:
+	YYDEBUG(552, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy719;
+		if (yych == '.') goto yy721;
 		goto yy209;
 	} else {
-		if (yych <= '0') goto yy720;
-		if (yych <= '9') goto yy713;
+		if (yych <= '0') goto yy722;
+		if (yych <= '9') goto yy715;
 		goto yy209;
 	}
-yy552:
-	YYDEBUG(552, *YYCURSOR);
-	yyaccept = 5;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy719;
-	if (yych <= '/') goto yy209;
-	if (yych <= '9') goto yy713;
-	goto yy209;
 yy553:
 	YYDEBUG(553, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy719;
+	if (yych == '.') goto yy721;
 	if (yych <= '/') goto yy209;
-	if (yych <= '9') goto yy555;
+	if (yych <= '9') goto yy715;
 	goto yy209;
 yy554:
 	YYDEBUG(554, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy719;
-	if (yych != '0') goto yy209;
+	if (yych == '.') goto yy721;
+	if (yych <= '/') goto yy209;
+	if (yych <= '9') goto yy556;
+	goto yy209;
 yy555:
 	YYDEBUG(555, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy719;
-	goto yy209;
+	if (yych == '.') goto yy721;
+	if (yych != '0') goto yy209;
 yy556:
 	YYDEBUG(556, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy214;
-	if (yych <= '9') goto yy721;
-	goto yy214;
+	yyaccept = 4;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == '.') goto yy721;
+	goto yy209;
 yy557:
 	YYDEBUG(557, *YYCURSOR);
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '/') goto yy384;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy214;
+	if (yych <= '9') goto yy723;
 	goto yy214;
 yy558:
 	YYDEBUG(558, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy722;
-	goto yy56;
+	yyaccept = 5;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == '/') goto yy385;
+	goto yy214;
 yy559:
 	YYDEBUG(559, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == '/') goto yy724;
+	goto yy56;
+yy560:
+	YYDEBUG(560, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'S') {
-		if (yych == '/') goto yy722;
+		if (yych == '/') goto yy724;
 		goto yy56;
 	} else {
-		if (yych <= 'T') goto yy558;
-		if (yych == 't') goto yy558;
+		if (yych <= 'T') goto yy559;
+		if (yych == 't') goto yy559;
 		goto yy56;
 	}
-yy560:
-	YYDEBUG(560, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= ',') goto yy56;
-	if (yych <= '-') goto yy723;
-	if (yych <= '.') goto yy378;
-	goto yy56;
 yy561:
 	YYDEBUG(561, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy624;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy442;
+	if (yych <= ',') goto yy56;
+	if (yych <= '-') goto yy725;
+	if (yych <= '.') goto yy379;
 	goto yy56;
 yy562:
 	YYDEBUG(562, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy624;
+	if (yych == '-') goto yy625;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy442;
+	if (yych <= '9') goto yy443;
 	goto yy56;
 yy563:
 	YYDEBUG(563, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy625;
+	if (yych <= '/') goto yy56;
+	if (yych <= '2') goto yy443;
+	goto yy56;
+yy564:
+	YYDEBUG(564, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
 	yych = *YYCURSOR;
-yy564:
-	YYDEBUG(564, *YYCURSOR);
+yy565:
+	YYDEBUG(565, *YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'G') {
 			if (yych <= '.') {
 				if (yych <= 0x1F) {
-					if (yych == '\t') goto yy563;
+					if (yych == '\t') goto yy564;
 					goto yy56;
 				} else {
-					if (yych <= ' ') goto yy563;
+					if (yych <= ' ') goto yy564;
 					if (yych <= ',') goto yy56;
-					goto yy724;
+					goto yy726;
 				}
 			} else {
 				if (yych <= 'C') {
-					if (yych == 'A') goto yy576;
+					if (yych == 'A') goto yy577;
 					goto yy56;
 				} else {
-					if (yych <= 'D') goto yy577;
-					if (yych == 'F') goto yy578;
+					if (yych <= 'D') goto yy578;
+					if (yych == 'F') goto yy579;
 					goto yy56;
 				}
 			}
@@ -13419,22 +13450,22 @@ yy564:
 			if (yych <= 'N') {
 				if (yych <= 'J') {
 					if (yych <= 'H') goto yy75;
-					if (yych <= 'I') goto yy579;
-					goto yy581;
+					if (yych <= 'I') goto yy580;
+					goto yy582;
 				} else {
 					if (yych <= 'L') goto yy56;
-					if (yych <= 'M') goto yy582;
-					goto yy583;
+					if (yych <= 'M') goto yy583;
+					goto yy584;
 				}
 			} else {
 				if (yych <= 'S') {
-					if (yych <= 'O') goto yy584;
+					if (yych <= 'O') goto yy585;
 					if (yych <= 'R') goto yy56;
-					goto yy585;
+					goto yy586;
 				} else {
 					if (yych <= 'T') goto yy83;
 					if (yych <= 'U') goto yy84;
-					if (yych <= 'V') goto yy586;
+					if (yych <= 'V') goto yy587;
 					goto yy86;
 				}
 			}
@@ -13443,33 +13474,33 @@ yy564:
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych <= '`') {
-					if (yych <= 'X') goto yy588;
+					if (yych <= 'X') goto yy589;
 					if (yych <= 'Y') goto yy88;
 					goto yy56;
 				} else {
-					if (yych <= 'a') goto yy576;
+					if (yych <= 'a') goto yy577;
 					if (yych <= 'c') goto yy56;
-					goto yy577;
+					goto yy578;
 				}
 			} else {
 				if (yych <= 'g') {
-					if (yych == 'f') goto yy578;
+					if (yych == 'f') goto yy579;
 					goto yy56;
 				} else {
 					if (yych <= 'h') goto yy75;
-					if (yych == 'j') goto yy581;
+					if (yych == 'j') goto yy582;
 					goto yy56;
 				}
 			}
 		} else {
 			if (yych <= 'u') {
 				if (yych <= 'o') {
-					if (yych <= 'm') goto yy582;
-					if (yych <= 'n') goto yy583;
-					goto yy584;
+					if (yych <= 'm') goto yy583;
+					if (yych <= 'n') goto yy584;
+					goto yy585;
 				} else {
 					if (yych <= 'r') goto yy56;
-					if (yych <= 's') goto yy585;
+					if (yych <= 's') goto yy586;
 					if (yych <= 't') goto yy83;
 					goto yy84;
 				}
@@ -13485,12 +13516,12 @@ yy564:
 			}
 		}
 	}
-yy565:
-	YYDEBUG(565, *YYCURSOR);
+yy566:
+	YYDEBUG(566, *YYCURSOR);
 	yych = *++YYCURSOR;
 	switch (yych) {
-	case '0':	goto yy726;
-	case '1':	goto yy728;
+	case '0':	goto yy728;
+	case '1':	goto yy730;
 	case '2':
 	case '3':
 	case '4':
@@ -13498,134 +13529,134 @@ yy565:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy729;
+	case '9':	goto yy731;
 	case 'A':
-	case 'a':	goto yy730;
+	case 'a':	goto yy732;
 	case 'D':
-	case 'd':	goto yy731;
+	case 'd':	goto yy733;
 	case 'F':
-	case 'f':	goto yy732;
+	case 'f':	goto yy734;
 	case 'J':
-	case 'j':	goto yy733;
+	case 'j':	goto yy735;
 	case 'M':
-	case 'm':	goto yy734;
+	case 'm':	goto yy736;
 	case 'N':
-	case 'n':	goto yy735;
+	case 'n':	goto yy737;
 	case 'O':
-	case 'o':	goto yy736;
+	case 'o':	goto yy738;
 	case 'S':
-	case 's':	goto yy737;
-	case 'W':	goto yy738;
-	default:	goto yy725;
+	case 's':	goto yy739;
+	case 'W':	goto yy740;
+	default:	goto yy727;
 	}
-yy566:
-	YYDEBUG(566, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy725;
-	if (yych <= '0') goto yy739;
-	if (yych <= '2') goto yy740;
-	if (yych <= '3') goto yy741;
-	goto yy725;
 yy567:
 	YYDEBUG(567, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy746;
-	if (yych <= '1') goto yy747;
-	if (yych <= '9') goto yy748;
-	goto yy56;
+	if (yych <= '/') goto yy727;
+	if (yych <= '0') goto yy741;
+	if (yych <= '2') goto yy742;
+	if (yych <= '3') goto yy743;
+	goto yy727;
 yy568:
 	YYDEBUG(568, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy186;
-	if (yych <= '0') goto yy749;
-	if (yych <= '9') goto yy751;
-	goto yy186;
+	if (yych <= '/') goto yy56;
+	if (yych <= '0') goto yy748;
+	if (yych <= '1') goto yy749;
+	if (yych <= '9') goto yy750;
+	goto yy56;
 yy569:
 	YYDEBUG(569, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '2') goto yy751;
-	if (yych <= '9') goto yy752;
+	if (yych <= '0') goto yy751;
+	if (yych <= '9') goto yy753;
 	goto yy186;
 yy570:
 	YYDEBUG(570, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy752;
+	if (yych <= '2') goto yy753;
+	if (yych <= '9') goto yy754;
 	goto yy186;
 yy571:
 	YYDEBUG(571, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '5') goto yy752;
-	if (yych <= '6') goto yy753;
 	if (yych <= '9') goto yy754;
 	goto yy186;
 yy572:
 	YYDEBUG(572, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy754;
+	if (yych <= '5') goto yy754;
+	if (yych <= '6') goto yy755;
+	if (yych <= '9') goto yy756;
 	goto yy186;
 yy573:
 	YYDEBUG(573, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '0') goto yy754;
-	if (yych <= '9') goto yy755;
+	if (yych <= '9') goto yy756;
 	goto yy186;
 yy574:
 	YYDEBUG(574, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy755;
+	if (yych <= '0') goto yy756;
+	if (yych <= '9') goto yy757;
 	goto yy186;
 yy575:
 	YYDEBUG(575, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy756;
-	if (yych <= '1') goto yy757;
-	goto yy56;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy757;
+	goto yy186;
 yy576:
 	YYDEBUG(576, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '0') goto yy758;
+	if (yych <= '1') goto yy759;
+	goto yy56;
+yy577:
+	YYDEBUG(577, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'P') goto yy758;
+		if (yych == 'P') goto yy760;
 		if (yych <= 'T') goto yy56;
-		goto yy759;
+		goto yy761;
 	} else {
 		if (yych <= 'p') {
 			if (yych <= 'o') goto yy56;
-			goto yy758;
+			goto yy760;
 		} else {
-			if (yych == 'u') goto yy759;
+			if (yych == 'u') goto yy761;
 			goto yy56;
 		}
 	}
-yy577:
-	YYDEBUG(577, *YYCURSOR);
+yy578:
+	YYDEBUG(578, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych == 'A') goto yy232;
 		if (yych <= 'D') goto yy56;
-		goto yy760;
+		goto yy762;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
 			goto yy232;
 		} else {
-			if (yych == 'e') goto yy760;
+			if (yych == 'e') goto yy762;
 			goto yy56;
 		}
 	}
-yy578:
-	YYDEBUG(578, *YYCURSOR);
+yy579:
+	YYDEBUG(579, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= 'N') {
-			if (yych == 'E') goto yy761;
+			if (yych == 'E') goto yy763;
 			goto yy56;
 		} else {
 			if (yych <= 'O') goto yy235;
@@ -13634,7 +13665,7 @@ yy578:
 		}
 	} else {
 		if (yych <= 'n') {
-			if (yych == 'e') goto yy761;
+			if (yych == 'e') goto yy763;
 			goto yy56;
 		} else {
 			if (yych <= 'o') goto yy235;
@@ -13642,53 +13673,53 @@ yy578:
 			goto yy56;
 		}
 	}
-yy579:
-	YYDEBUG(579, *YYCURSOR);
+yy580:
+	YYDEBUG(580, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'I') goto yy762;
+		if (yych == 'I') goto yy764;
 	} else {
-		if (yych == 'W') goto yy580;
-		if (yych <= 'X') goto yy763;
+		if (yych == 'W') goto yy581;
+		if (yych <= 'X') goto yy765;
 	}
-yy580:
-	YYDEBUG(580, *YYCURSOR);
-#line 1441 "parse_date.re"
+yy581:
+	YYDEBUG(581, *YYCURSOR);
+#line 1463 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenodayrev");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->m = timelib_get_month((char **) &ptr);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->m = timelib_get_month(&ptr);
 		s->time->d = 1;
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 13670 "<stdout>"
-yy581:
-	YYDEBUG(581, *YYCURSOR);
+#line 13701 "<stdout>"
+yy582:
+	YYDEBUG(582, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'A') goto yy764;
+		if (yych == 'A') goto yy766;
 		if (yych <= 'T') goto yy56;
-		goto yy765;
+		goto yy767;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
-			goto yy764;
+			goto yy766;
 		} else {
-			if (yych == 'u') goto yy765;
+			if (yych == 'u') goto yy767;
 			goto yy56;
 		}
 	}
-yy582:
-	YYDEBUG(582, *YYCURSOR);
+yy583:
+	YYDEBUG(583, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= 'I') {
-			if (yych == 'A') goto yy766;
+			if (yych == 'A') goto yy768;
 			if (yych <= 'H') goto yy56;
 			goto yy247;
 		} else {
@@ -13698,7 +13729,7 @@ yy582:
 		}
 	} else {
 		if (yych <= 'i') {
-			if (yych == 'a') goto yy766;
+			if (yych == 'a') goto yy768;
 			if (yych <= 'h') goto yy56;
 			goto yy247;
 		} else {
@@ -13711,27 +13742,27 @@ yy582:
 			}
 		}
 	}
-yy583:
-	YYDEBUG(583, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy767;
-	if (yych == 'o') goto yy767;
-	goto yy56;
 yy584:
 	YYDEBUG(584, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy768;
-	if (yych == 'c') goto yy768;
+	if (yych == 'O') goto yy769;
+	if (yych == 'o') goto yy769;
 	goto yy56;
 yy585:
 	YYDEBUG(585, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == 'C') goto yy770;
+	if (yych == 'c') goto yy770;
+	goto yy56;
+yy586:
+	YYDEBUG(586, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= 'D') {
 			if (yych == 'A') goto yy253;
 			goto yy56;
 		} else {
-			if (yych <= 'E') goto yy769;
+			if (yych <= 'E') goto yy771;
 			if (yych <= 'T') goto yy56;
 			goto yy255;
 		}
@@ -13740,24 +13771,24 @@ yy585:
 			if (yych == 'a') goto yy253;
 			goto yy56;
 		} else {
-			if (yych <= 'e') goto yy769;
+			if (yych <= 'e') goto yy771;
 			if (yych == 'u') goto yy255;
 			goto yy56;
 		}
 	}
-yy586:
-	YYDEBUG(586, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy588;
-	goto yy580;
 yy587:
 	YYDEBUG(587, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == 'I') goto yy589;
+	goto yy581;
+yy588:
+	YYDEBUG(588, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= '5') {
 		if (yych <= '/') goto yy56;
-		if (yych <= '0') goto yy770;
-		if (yych <= '4') goto yy771;
-		goto yy772;
+		if (yych <= '0') goto yy772;
+		if (yych <= '4') goto yy773;
+		goto yy774;
 	} else {
 		if (yych <= 'E') {
 			if (yych <= 'D') goto yy56;
@@ -13767,236 +13798,236 @@ yy587:
 			goto yy56;
 		}
 	}
-yy588:
-	YYDEBUG(588, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy762;
-	goto yy580;
 yy589:
 	YYDEBUG(589, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy186;
-	if (yych <= '0') goto yy773;
-	if (yych <= '9') goto yy774;
-	goto yy186;
+	if (yych == 'I') goto yy764;
+	goto yy581;
 yy590:
 	YYDEBUG(590, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '2') goto yy774;
-	if (yych <= '9') goto yy775;
+	if (yych <= '0') goto yy775;
+	if (yych <= '9') goto yy776;
 	goto yy186;
 yy591:
 	YYDEBUG(591, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy775;
+	if (yych <= '2') goto yy776;
+	if (yych <= '9') goto yy777;
 	goto yy186;
 yy592:
 	YYDEBUG(592, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '5') goto yy775;
-	if (yych <= '6') goto yy776;
-	if (yych <= '9') goto yy755;
+	if (yych <= '9') goto yy777;
 	goto yy186;
 yy593:
 	YYDEBUG(593, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy243;
-	if (yych == 'l') goto yy243;
-	goto yy56;
+	if (yych <= '/') goto yy186;
+	if (yych <= '5') goto yy777;
+	if (yych <= '6') goto yy778;
+	if (yych <= '9') goto yy757;
+	goto yy186;
 yy594:
 	YYDEBUG(594, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy777;
-	if (yych == 's') goto yy777;
+	if (yych == 'L') goto yy243;
+	if (yych == 'l') goto yy243;
 	goto yy56;
 yy595:
 	YYDEBUG(595, *YYCURSOR);
-	++YYCURSOR;
-	goto yy250;
-yy596:
-	YYDEBUG(596, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy607;
-	if (yych == 'm') goto yy607;
+	if (yych == 'S') goto yy779;
+	if (yych == 's') goto yy779;
 	goto yy56;
+yy596:
+	YYDEBUG(596, *YYCURSOR);
+	++YYCURSOR;
+	goto yy250;
 yy597:
 	YYDEBUG(597, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy601;
-	if (yych == 'u') goto yy601;
+	if (yych == 'M') goto yy608;
+	if (yych == 'm') goto yy608;
 	goto yy56;
 yy598:
 	YYDEBUG(598, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == 'U') goto yy602;
+	if (yych == 'u') goto yy602;
+	goto yy56;
+yy599:
+	YYDEBUG(599, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'H') goto yy778;
+		if (yych == 'H') goto yy780;
 		if (yych <= 'M') goto yy56;
-		goto yy779;
+		goto yy781;
 	} else {
 		if (yych <= 'h') {
 			if (yych <= 'g') goto yy56;
-			goto yy778;
+			goto yy780;
 		} else {
-			if (yych == 'n') goto yy779;
+			if (yych == 'n') goto yy781;
 			goto yy56;
 		}
 	}
-yy599:
-	YYDEBUG(599, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy780;
-	if (yych == 'a') goto yy780;
-	goto yy56;
 yy600:
 	YYDEBUG(600, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy241;
-	if (yych <= '9') goto yy781;
-	goto yy241;
-yy601:
-	YYDEBUG(601, *YYCURSOR);
-	yych = *++YYCURSOR;
 	if (yych == 'A') goto yy782;
 	if (yych == 'a') goto yy782;
 	goto yy56;
+yy601:
+	YYDEBUG(601, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy241;
+	if (yych <= '9') goto yy783;
+	goto yy241;
 yy602:
 	YYDEBUG(602, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy243;
-	if (yych == 'h') goto yy243;
+	if (yych == 'A') goto yy784;
+	if (yych == 'a') goto yy784;
 	goto yy56;
 yy603:
 	YYDEBUG(603, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy783;
-	if (yych == 'o') goto yy783;
+	if (yych == 'H') goto yy243;
+	if (yych == 'h') goto yy243;
 	goto yy56;
 yy604:
 	YYDEBUG(604, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy783;
-	if (yych == 'i') goto yy783;
+	if (yych == 'O') goto yy785;
+	if (yych == 'o') goto yy785;
 	goto yy56;
 yy605:
 	YYDEBUG(605, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy784;
-	if (yych == 't') goto yy784;
+	if (yych == 'I') goto yy785;
+	if (yych == 'i') goto yy785;
 	goto yy56;
 yy606:
 	YYDEBUG(606, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy407;
-	if (yych == 'h') goto yy407;
+	if (yych == 'T') goto yy786;
+	if (yych == 't') goto yy786;
 	goto yy56;
 yy607:
 	YYDEBUG(607, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy785;
-	if (yych == 'b') goto yy785;
+	if (yych == 'H') goto yy408;
+	if (yych == 'h') goto yy408;
 	goto yy56;
 yy608:
 	YYDEBUG(608, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy611;
-	if (yych == 'r') goto yy611;
+	if (yych == 'B') goto yy787;
+	if (yych == 'b') goto yy787;
 	goto yy56;
 yy609:
 	YYDEBUG(609, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy786;
-	if (yych == 'n') goto yy786;
+	if (yych == 'R') goto yy612;
+	if (yych == 'r') goto yy612;
 	goto yy56;
 yy610:
 	YYDEBUG(610, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy611;
-	if (yych != 's') goto yy56;
+	if (yych == 'N') goto yy788;
+	if (yych == 'n') goto yy788;
+	goto yy56;
 yy611:
 	YYDEBUG(611, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy599;
-	if (yych == 'd') goto yy599;
-	goto yy56;
+	if (yych == 'S') goto yy612;
+	if (yych != 's') goto yy56;
 yy612:
 	YYDEBUG(612, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy610;
-	if (yych == 'e') goto yy610;
+	if (yych == 'D') goto yy600;
+	if (yych == 'd') goto yy600;
 	goto yy56;
 yy613:
 	YYDEBUG(613, *YYCURSOR);
-	yyaccept = 7;
+	yych = *++YYCURSOR;
+	if (yych == 'E') goto yy611;
+	if (yych == 'e') goto yy611;
+	goto yy56;
+yy614:
+	YYDEBUG(614, *YYCURSOR);
+	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych == 'D') goto yy188;
 		if (yych <= 'R') goto yy250;
-		goto yy595;
+		goto yy596;
 	} else {
 		if (yych <= 'd') {
 			if (yych <= 'c') goto yy250;
 			goto yy188;
 		} else {
-			if (yych == 's') goto yy595;
+			if (yych == 's') goto yy596;
 			goto yy250;
 		}
 	}
-yy614:
-	YYDEBUG(614, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= ',') goto yy56;
-	if (yych <= '.') goto yy378;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy616;
-	goto yy56;
 yy615:
 	YYDEBUG(615, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= ',') goto yy56;
-	if (yych <= '.') goto yy378;
+	if (yych <= '.') goto yy379;
 	if (yych <= '/') goto yy56;
-	if (yych >= '3') goto yy56;
+	if (yych <= '9') goto yy617;
+	goto yy56;
 yy616:
 	YYDEBUG(616, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= ',') goto yy56;
-	if (yych <= '.') goto yy378;
-	goto yy56;
+	if (yych <= '.') goto yy379;
+	if (yych <= '/') goto yy56;
+	if (yych >= '3') goto yy56;
 yy617:
 	YYDEBUG(617, *YYCURSOR);
-	yyaccept = 5;
+	yych = *++YYCURSOR;
+	if (yych <= ',') goto yy56;
+	if (yych <= '.') goto yy379;
+	goto yy56;
+yy618:
+	YYDEBUG(618, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy719;
+	if (yych == '.') goto yy721;
 	if (yych <= '/') goto yy209;
-	if (yych <= '9') goto yy787;
+	if (yych <= '9') goto yy789;
 	goto yy209;
-yy618:
-	YYDEBUG(618, *YYCURSOR);
-	yyaccept = 5;
+yy619:
+	YYDEBUG(619, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy719;
+		if (yych == '.') goto yy721;
 		goto yy209;
 	} else {
-		if (yych <= '0') goto yy787;
-		if (yych <= '9') goto yy713;
+		if (yych <= '0') goto yy789;
+		if (yych <= '9') goto yy715;
 		goto yy209;
 	}
-yy619:
-	YYDEBUG(619, *YYCURSOR);
+yy620:
+	YYDEBUG(620, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
-	YYDEBUG(620, *YYCURSOR);
+	YYDEBUG(621, *YYCURSOR);
 	if (yych <= 'A') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy619;
+			if (yych == '\t') goto yy620;
 			goto yy56;
 		} else {
-			if (yych <= ' ') goto yy619;
+			if (yych <= ' ') goto yy620;
 			if (yych <= '@') goto yy56;
 			goto yy101;
 		}
@@ -14010,256 +14041,256 @@ yy619:
 			goto yy56;
 		}
 	}
-yy621:
-	YYDEBUG(621, *YYCURSOR);
-	yyaccept = 5;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy719;
-	if (yych <= '/') goto yy209;
-	if (yych <= '9') goto yy788;
-	goto yy209;
 yy622:
 	YYDEBUG(622, *YYCURSOR);
-	yyaccept = 5;
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy719;
-	if (yych == '0') goto yy788;
+	if (yych == '.') goto yy721;
+	if (yych <= '/') goto yy209;
+	if (yych <= '9') goto yy790;
 	goto yy209;
 yy623:
 	YYDEBUG(623, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy789;
-	if (yych <= '6') goto yy790;
-	if (yych <= '9') goto yy555;
-	goto yy56;
+	yyaccept = 4;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == '.') goto yy721;
+	if (yych == '0') goto yy790;
+	goto yy209;
 yy624:
 	YYDEBUG(624, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy791;
-	if (yych <= '3') goto yy792;
-	if (yych <= '9') goto yy793;
+	if (yych <= '5') goto yy791;
+	if (yych <= '6') goto yy792;
+	if (yych <= '9') goto yy556;
 	goto yy56;
 yy625:
 	YYDEBUG(625, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy794;
+	if (yych <= '/') goto yy56;
+	if (yych <= '2') goto yy793;
+	if (yych <= '3') goto yy794;
+	if (yych <= '9') goto yy795;
 	goto yy56;
 yy626:
 	YYDEBUG(626, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy795;
-	if (yych == 'r') goto yy795;
+	if (yych == '-') goto yy796;
 	goto yy56;
 yy627:
 	YYDEBUG(627, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy795;
-	if (yych == 'g') goto yy795;
+	if (yych == 'R') goto yy797;
+	if (yych == 'r') goto yy797;
 	goto yy56;
 yy628:
 	YYDEBUG(628, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy795;
-	if (yych == 'c') goto yy795;
+	if (yych == 'G') goto yy797;
+	if (yych == 'g') goto yy797;
 	goto yy56;
 yy629:
 	YYDEBUG(629, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy795;
-	if (yych == 'b') goto yy795;
+	if (yych == 'C') goto yy797;
+	if (yych == 'c') goto yy797;
 	goto yy56;
 yy630:
 	YYDEBUG(630, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy795;
-	if (yych == 'n') goto yy795;
+	if (yych == 'B') goto yy797;
+	if (yych == 'b') goto yy797;
 	goto yy56;
 yy631:
 	YYDEBUG(631, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == 'N') goto yy797;
+	if (yych == 'n') goto yy797;
+	goto yy56;
+yy632:
+	YYDEBUG(632, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'L') goto yy795;
+		if (yych == 'L') goto yy797;
 		if (yych <= 'M') goto yy56;
-		goto yy795;
+		goto yy797;
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'k') goto yy56;
-			goto yy795;
+			goto yy797;
 		} else {
-			if (yych == 'n') goto yy795;
+			if (yych == 'n') goto yy797;
 			goto yy56;
 		}
 	}
-yy632:
-	YYDEBUG(632, *YYCURSOR);
+yy633:
+	YYDEBUG(633, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
-		if (yych == 'R') goto yy795;
+		if (yych == 'R') goto yy797;
 		if (yych <= 'X') goto yy56;
-		goto yy795;
+		goto yy797;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy56;
-			goto yy795;
+			goto yy797;
 		} else {
-			if (yych == 'y') goto yy795;
+			if (yych == 'y') goto yy797;
 			goto yy56;
 		}
 	}
-yy633:
-	YYDEBUG(633, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'V') goto yy795;
-	if (yych == 'v') goto yy795;
-	goto yy56;
 yy634:
 	YYDEBUG(634, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy795;
-	if (yych == 't') goto yy795;
+	if (yych == 'V') goto yy797;
+	if (yych == 'v') goto yy797;
 	goto yy56;
 yy635:
 	YYDEBUG(635, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy796;
-	if (yych == 'p') goto yy796;
+	if (yych == 'T') goto yy797;
+	if (yych == 't') goto yy797;
 	goto yy56;
 yy636:
 	YYDEBUG(636, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy797;
+	if (yych == 'P') goto yy798;
+	if (yych == 'p') goto yy798;
 	goto yy56;
 yy637:
 	YYDEBUG(637, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy276;
+	if (yych <= '9') goto yy799;
+	goto yy276;
+yy638:
+	YYDEBUG(638, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= '@') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'Z') goto yy798;
+		if (yych <= 'Z') goto yy800;
 		if (yych <= '`') goto yy18;
-		if (yych <= 'z') goto yy798;
+		if (yych <= 'z') goto yy800;
 		goto yy18;
 	}
-yy638:
-	YYDEBUG(638, *YYCURSOR);
+yy639:
+	YYDEBUG(639, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '9') {
 		if (yych <= ' ') {
 			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy309;
+				if (yych <= 0x00) goto yy310;
 				goto yy56;
 			} else {
-				if (yych <= '\t') goto yy311;
+				if (yych <= '\t') goto yy312;
 				if (yych <= 0x1F) goto yy56;
-				goto yy311;
+				goto yy312;
 			}
 		} else {
 			if (yych <= '-') {
-				if (yych == ',') goto yy311;
+				if (yych == ',') goto yy312;
 				goto yy56;
 			} else {
-				if (yych <= '.') goto yy311;
+				if (yych <= '.') goto yy312;
 				if (yych <= '/') goto yy56;
-				goto yy799;
+				goto yy801;
 			}
 		}
 	} else {
 		if (yych <= 'm') {
 			if (yych <= 'd') {
 				if (yych <= 'c') goto yy56;
-				goto yy311;
+				goto yy312;
 			} else {
-				if (yych == 'h') goto yy311;
+				if (yych == 'h') goto yy312;
 				goto yy56;
 			}
 		} else {
 			if (yych <= 'r') {
-				if (yych <= 'n') goto yy314;
+				if (yych <= 'n') goto yy315;
 				if (yych <= 'q') goto yy56;
-				goto yy314;
+				goto yy315;
 			} else {
-				if (yych <= 's') goto yy315;
-				if (yych <= 't') goto yy316;
+				if (yych <= 's') goto yy316;
+				if (yych <= 't') goto yy317;
 				goto yy56;
 			}
 		}
 	}
-yy639:
-	YYDEBUG(639, *YYCURSOR);
+yy640:
+	YYDEBUG(640, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '1') {
 		if (yych <= ' ') {
 			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy309;
+				if (yych <= 0x00) goto yy310;
 				goto yy56;
 			} else {
-				if (yych <= '\t') goto yy311;
+				if (yych <= '\t') goto yy312;
 				if (yych <= 0x1F) goto yy56;
-				goto yy311;
+				goto yy312;
 			}
 		} else {
 			if (yych <= '-') {
-				if (yych == ',') goto yy311;
+				if (yych == ',') goto yy312;
 				goto yy56;
 			} else {
-				if (yych <= '.') goto yy311;
+				if (yych <= '.') goto yy312;
 				if (yych <= '/') goto yy56;
-				goto yy799;
+				goto yy801;
 			}
 		}
 	} else {
 		if (yych <= 'm') {
 			if (yych <= 'd') {
-				if (yych <= '9') goto yy317;
+				if (yych <= '9') goto yy318;
 				if (yych <= 'c') goto yy56;
-				goto yy311;
+				goto yy312;
 			} else {
-				if (yych == 'h') goto yy311;
+				if (yych == 'h') goto yy312;
 				goto yy56;
 			}
 		} else {
 			if (yych <= 'r') {
-				if (yych <= 'n') goto yy314;
+				if (yych <= 'n') goto yy315;
 				if (yych <= 'q') goto yy56;
-				goto yy314;
+				goto yy315;
 			} else {
-				if (yych <= 's') goto yy315;
-				if (yych <= 't') goto yy316;
+				if (yych <= 's') goto yy316;
+				if (yych <= 't') goto yy317;
 				goto yy56;
 			}
 		}
 	}
-yy640:
-	YYDEBUG(640, *YYCURSOR);
-	yyaccept = 8;
+yy641:
+	YYDEBUG(641, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
 		if (yych <= 0x1F) {
 			if (yych == '\t') goto yy135;
-			goto yy280;
+			goto yy281;
 		} else {
 			if (yych <= ' ') goto yy135;
 			if (yych == ')') goto yy108;
-			goto yy280;
+			goto yy281;
 		}
 	} else {
 		if (yych <= '@') {
-			if (yych == '/') goto yy280;
+			if (yych == '/') goto yy281;
 			if (yych <= '9') goto yy135;
-			goto yy280;
+			goto yy281;
 		} else {
-			if (yych <= 'Z') goto yy798;
-			if (yych <= '`') goto yy280;
-			if (yych <= 'z') goto yy798;
-			goto yy280;
+			if (yych <= 'Z') goto yy800;
+			if (yych <= '`') goto yy281;
+			if (yych <= 'z') goto yy800;
+			goto yy281;
 		}
 	}
-yy641:
-	YYDEBUG(641, *YYCURSOR);
+yy642:
+	YYDEBUG(642, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -14267,22 +14298,22 @@ yy641:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy798;
-			goto yy800;
+			if (yych <= 'S') goto yy800;
+			goto yy802;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 't') goto yy800;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 't') goto yy802;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy642:
-	YYDEBUG(642, *YYCURSOR);
+yy643:
+	YYDEBUG(643, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -14291,205 +14322,205 @@ yy642:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			goto yy282;
+			goto yy283;
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			goto yy18;
 		} else {
-			if (yych <= '_') goto yy282;
+			if (yych <= '_') goto yy283;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy801;
+			if (yych <= 'z') goto yy803;
 			goto yy18;
 		}
 	}
-yy643:
-	YYDEBUG(643, *YYCURSOR);
-	yyaccept = 8;
+yy644:
+	YYDEBUG(644, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= ' ') {
 			if (yych == '\t') goto yy135;
-			if (yych <= 0x1F) goto yy280;
+			if (yych <= 0x1F) goto yy281;
 			goto yy135;
 		} else {
 			if (yych <= ')') {
-				if (yych <= '(') goto yy280;
+				if (yych <= '(') goto yy281;
 				goto yy108;
 			} else {
-				if (yych <= ',') goto yy280;
-				if (yych <= '-') goto yy679;
+				if (yych <= ',') goto yy281;
+				if (yych <= '-') goto yy680;
 				goto yy135;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			if (yych <= '9') goto yy135;
-			if (yych <= '@') goto yy280;
-			goto yy798;
+			if (yych <= '@') goto yy281;
+			goto yy800;
 		} else {
 			if (yych <= '_') {
-				if (yych <= '^') goto yy280;
-				goto yy282;
+				if (yych <= '^') goto yy281;
+				goto yy283;
 			} else {
-				if (yych <= '`') goto yy280;
-				if (yych <= 'z') goto yy801;
-				goto yy280;
+				if (yych <= '`') goto yy281;
+				if (yych <= 'z') goto yy803;
+				goto yy281;
 			}
 		}
 	}
-yy644:
-	YYDEBUG(644, *YYCURSOR);
+yy645:
+	YYDEBUG(645, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy800;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'T') goto yy802;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 't') goto yy802;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 't') goto yy804;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy645:
-	YYDEBUG(645, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy803;
-	if (yych == 'o') goto yy803;
-	goto yy56;
 yy646:
 	YYDEBUG(646, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == 'O') goto yy805;
+	if (yych == 'o') goto yy805;
+	goto yy56;
+yy647:
+	YYDEBUG(647, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'B') {
 		if (yych <= ')') {
 			if (yych <= '(') goto yy18;
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'A') goto yy798;
-			goto yy804;
+			if (yych <= 'A') goto yy800;
+			goto yy806;
 		}
 	} else {
 		if (yych <= 'a') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'b') goto yy804;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'b') goto yy806;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy647:
-	YYDEBUG(647, *YYCURSOR);
+yy648:
+	YYDEBUG(648, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'B') goto yy804;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'B') goto yy806;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'a') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'b') goto yy805;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'b') goto yy807;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy648:
-	YYDEBUG(648, *YYCURSOR);
+yy649:
+	YYDEBUG(649, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy806;
+			if (yych == '\t') goto yy808;
 			goto yy18;
 		} else {
-			if (yych <= ' ') goto yy806;
+			if (yych <= ' ') goto yy808;
 			if (yych == ')') goto yy108;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych == 'H') goto yy808;
-			if (yych <= 'Z') goto yy798;
+			if (yych == 'H') goto yy810;
+			if (yych <= 'Z') goto yy800;
 			goto yy18;
 		} else {
-			if (yych == 'h') goto yy808;
-			if (yych <= 'z') goto yy798;
+			if (yych == 'h') goto yy810;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy649:
-	YYDEBUG(649, *YYCURSOR);
-	yych = *++YYCURSOR;
+yy650:
+	YYDEBUG(650, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
 			if (yych <= '(') goto yy18;
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'M') goto yy798;
-			goto yy809;
+			if (yych <= 'M') goto yy800;
+			goto yy811;
 		}
 	} else {
 		if (yych <= 'm') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'n') goto yy809;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'n') goto yy811;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy650:
-	YYDEBUG(650, *YYCURSOR);
+yy651:
+	YYDEBUG(651, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= '(') {
 			if (yych <= '\t') {
 				if (yych <= 0x08) goto yy18;
-				goto yy806;
+				goto yy808;
 			} else {
-				if (yych == ' ') goto yy806;
+				if (yych == ' ') goto yy808;
 				goto yy18;
 			}
 		} else {
@@ -14498,127 +14529,127 @@ yy650:
 				goto yy18;
 			} else {
 				if (yych == '.') goto yy18;
-				goto yy282;
+				goto yy283;
 			}
 		}
 	} else {
 		if (yych <= '^') {
 			if (yych <= 'G') {
 				if (yych <= '@') goto yy18;
-				goto yy798;
+				goto yy800;
 			} else {
-				if (yych <= 'H') goto yy808;
-				if (yych <= 'Z') goto yy798;
+				if (yych <= 'H') goto yy810;
+				if (yych <= 'Z') goto yy800;
 				goto yy18;
 			}
 		} else {
 			if (yych <= 'g') {
-				if (yych <= '_') goto yy282;
+				if (yych <= '_') goto yy283;
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'h') goto yy810;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'h') goto yy812;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy651:
-	YYDEBUG(651, *YYCURSOR);
+yy652:
+	YYDEBUG(652, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy809;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'N') goto yy811;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'm') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'n') goto yy811;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'n') goto yy813;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy652:
-	YYDEBUG(652, *YYCURSOR);
+yy653:
+	YYDEBUG(653, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy108;
 		if (yych <= '@') goto yy18;
-		goto yy812;
+		goto yy814;
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			goto yy18;
 		} else {
-			if (yych <= 'a') goto yy812;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'a') goto yy814;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy653:
-	YYDEBUG(653, *YYCURSOR);
+yy654:
+	YYDEBUG(654, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '(') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy18;
-			goto yy806;
+			goto yy808;
 		} else {
-			if (yych == ' ') goto yy806;
+			if (yych == ' ') goto yy808;
 			goto yy18;
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= ')') goto yy108;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy654:
-	YYDEBUG(654, *YYCURSOR);
+yy655:
+	YYDEBUG(655, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '(') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy18;
-			goto yy806;
+			goto yy808;
 		} else {
-			if (yych == ' ') goto yy813;
+			if (yych == ' ') goto yy815;
 			goto yy18;
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= ')') goto yy108;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy655:
-	YYDEBUG(655, *YYCURSOR);
+yy656:
+	YYDEBUG(656, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -14626,22 +14657,22 @@ yy655:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'G') goto yy798;
-			goto yy808;
+			if (yych <= 'G') goto yy800;
+			goto yy810;
 		}
 	} else {
 		if (yych <= 'g') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'h') goto yy808;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'h') goto yy810;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy656:
-	YYDEBUG(656, *YYCURSOR);
+yy657:
+	YYDEBUG(657, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
 		if (yych <= ')') {
@@ -14649,40 +14680,40 @@ yy656:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'X') goto yy798;
-			goto yy814;
+			if (yych <= 'X') goto yy800;
+			goto yy816;
 		}
 	} else {
 		if (yych <= 'x') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'y') goto yy814;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'y') goto yy816;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy657:
-	YYDEBUG(657, *YYCURSOR);
+yy658:
+	YYDEBUG(658, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ')') {
-		if (yych == ' ') goto yy645;
+		if (yych == ' ') goto yy646;
 		if (yych <= '(') goto yy18;
 		goto yy108;
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy658:
-	YYDEBUG(658, *YYCURSOR);
+yy659:
+	YYDEBUG(659, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -14691,288 +14722,288 @@ yy658:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy812;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'A') goto yy814;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'a') goto yy815;
-			if (yych <= 'z') goto yy801;
+			if (yych <= 'a') goto yy817;
+			if (yych <= 'z') goto yy803;
 			goto yy18;
 		}
 	}
-yy659:
-	YYDEBUG(659, *YYCURSOR);
+yy660:
+	YYDEBUG(660, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy806;
+			if (yych == '\t') goto yy808;
 			if (yych <= 0x1F) goto yy18;
-			goto yy806;
+			goto yy808;
 		} else {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		}
 	} else {
 		if (yych <= 'Z') {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
 			if (yych <= '_') {
 				if (yych <= '^') goto yy18;
-				goto yy282;
+				goto yy283;
 			} else {
 				if (yych <= '`') goto yy18;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy660:
-	YYDEBUG(660, *YYCURSOR);
+yy661:
+	YYDEBUG(661, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy806;
+			if (yych == '\t') goto yy808;
 			if (yych <= 0x1F) goto yy18;
-			goto yy813;
+			goto yy815;
 		} else {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		}
 	} else {
 		if (yych <= 'Z') {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
 			if (yych <= '_') {
 				if (yych <= '^') goto yy18;
-				goto yy282;
+				goto yy283;
 			} else {
 				if (yych <= '`') goto yy18;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy661:
-	YYDEBUG(661, *YYCURSOR);
+yy662:
+	YYDEBUG(662, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'H') goto yy808;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'H') goto yy810;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'g') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'h') goto yy810;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'h') goto yy812;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy662:
-	YYDEBUG(662, *YYCURSOR);
+yy663:
+	YYDEBUG(663, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'Y') goto yy814;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Y') goto yy816;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'x') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'y') goto yy816;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'y') goto yy818;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy663:
-	YYDEBUG(663, *YYCURSOR);
+yy664:
+	YYDEBUG(664, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= '(') {
-			if (yych == ' ') goto yy645;
+			if (yych == ' ') goto yy646;
 			goto yy18;
 		} else {
 			if (yych <= ')') goto yy108;
-			if (yych == '-') goto yy282;
+			if (yych == '-') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			goto yy18;
 		} else {
-			if (yych <= '_') goto yy282;
+			if (yych <= '_') goto yy283;
 			if (yych <= '`') goto yy18;
-			if (yych <= 'z') goto yy801;
+			if (yych <= 'z') goto yy803;
 			goto yy18;
 		}
 	}
-yy664:
-	YYDEBUG(664, *YYCURSOR);
+yy665:
+	YYDEBUG(665, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy18;
-	if (yych <= '9') goto yy666;
+	if (yych <= '9') goto yy667;
 	if (yych <= ':') goto yy193;
 	goto yy18;
-yy665:
-	YYDEBUG(665, *YYCURSOR);
+yy666:
+	YYDEBUG(666, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '5') {
 		if (yych <= '/') goto yy18;
-		if (yych >= '5') goto yy376;
+		if (yych >= '5') goto yy377;
 	} else {
 		if (yych <= '9') goto yy108;
 		if (yych <= ':') goto yy193;
 		goto yy18;
 	}
-yy666:
-	YYDEBUG(666, *YYCURSOR);
+yy667:
+	YYDEBUG(667, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy18;
-	if (yych <= '5') goto yy376;
+	if (yych <= '5') goto yy377;
 	if (yych <= '9') goto yy108;
 	if (yych <= ':') goto yy193;
 	goto yy18;
-yy667:
-	YYDEBUG(667, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy817;
-	if (yych <= '9') goto yy819;
-	goto yy56;
 yy668:
 	YYDEBUG(668, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '.') goto yy667;
-	if (yych == ':') goto yy667;
+	if (yych <= '/') goto yy56;
+	if (yych <= '5') goto yy819;
+	if (yych <= '9') goto yy821;
 	goto yy56;
 yy669:
 	YYDEBUG(669, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy820;
-	if (yych <= '9') goto yy821;
+	if (yych == '.') goto yy668;
+	if (yych == ':') goto yy668;
 	goto yy56;
 yy670:
 	YYDEBUG(670, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '.') goto yy667;
-		goto yy56;
-	} else {
-		if (yych <= '9') goto yy668;
-		if (yych <= ':') goto yy667;
-		goto yy56;
-	}
+	if (yych <= '/') goto yy56;
+	if (yych <= '5') goto yy822;
+	if (yych <= '9') goto yy823;
+	goto yy56;
 yy671:
 	YYDEBUG(671, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych == '.') goto yy667;
+		if (yych == '.') goto yy668;
 		goto yy56;
 	} else {
-		if (yych <= '4') goto yy668;
-		if (yych == ':') goto yy667;
+		if (yych <= '9') goto yy669;
+		if (yych <= ':') goto yy668;
 		goto yy56;
 	}
 yy672:
 	YYDEBUG(672, *YYCURSOR);
-	yyaccept = 11;
-	yych = *(YYMARKER = ++YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych == '.') goto yy667;
-		goto yy310;
+		if (yych == '.') goto yy668;
+		goto yy56;
 	} else {
-		if (yych <= '9') goto yy822;
-		if (yych <= ':') goto yy667;
-		goto yy310;
+		if (yych <= '4') goto yy669;
+		if (yych == ':') goto yy668;
+		goto yy56;
 	}
 yy673:
 	YYDEBUG(673, *YYCURSOR);
-	yyaccept = 11;
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy669;
-		goto yy310;
+		if (yych == '.') goto yy668;
+		goto yy311;
 	} else {
-		if (yych <= '9') goto yy822;
-		if (yych <= ':') goto yy669;
-		goto yy310;
+		if (yych <= '9') goto yy824;
+		if (yych <= ':') goto yy668;
+		goto yy311;
 	}
 yy674:
 	YYDEBUG(674, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy310;
-	if (yych <= '9') goto yy822;
-	goto yy310;
+	yyaccept = 10;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') {
+		if (yych == '.') goto yy670;
+		goto yy311;
+	} else {
+		if (yych <= '9') goto yy824;
+		if (yych <= ':') goto yy670;
+		goto yy311;
+	}
 yy675:
 	YYDEBUG(675, *YYCURSOR);
-	++YYCURSOR;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy311;
+	if (yych <= '9') goto yy824;
+	goto yy311;
+yy676:
 	YYDEBUG(676, *YYCURSOR);
-#line 1427 "parse_date.re"
+	++YYCURSOR;
+	YYDEBUG(677, *YYCURSOR);
+#line 1449 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenoday");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
 		s->time->d = 1;
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 14974 "<stdout>"
-yy677:
-	YYDEBUG(677, *YYCURSOR);
+#line 15005 "<stdout>"
+yy678:
+	YYDEBUG(678, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -14980,96 +15011,96 @@ yy677:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Q') goto yy798;
-			goto yy823;
+			if (yych <= 'Q') goto yy800;
+			goto yy825;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'r') goto yy823;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'r') goto yy825;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy678:
-	YYDEBUG(678, *YYCURSOR);
+yy679:
+	YYDEBUG(679, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy823;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'R') goto yy825;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'q') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'r') goto yy824;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'r') goto yy826;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy679:
-	YYDEBUG(679, *YYCURSOR);
+yy680:
+	YYDEBUG(680, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yybm[0+yych] & 64) {
-		goto yy456;
+		goto yy457;
 	}
 	goto yy135;
-yy680:
-	YYDEBUG(680, *YYCURSOR);
+yy681:
+	YYDEBUG(681, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
 	yych = *YYCURSOR;
-yy681:
-	YYDEBUG(681, *YYCURSOR);
+yy682:
+	YYDEBUG(682, *YYCURSOR);
 	if (yych <= 'X') {
 		if (yych <= 'G') {
 			if (yych <= ' ') {
-				if (yych == '\t') goto yy680;
+				if (yych == '\t') goto yy681;
 				if (yych <= 0x1F) goto yy56;
-				goto yy680;
+				goto yy681;
 			} else {
 				if (yych <= 'D') {
 					if (yych <= 'C') goto yy56;
-					goto yy825;
+					goto yy827;
 				} else {
-					if (yych == 'F') goto yy826;
+					if (yych == 'F') goto yy828;
 					goto yy56;
 				}
 			}
 		} else {
 			if (yych <= 'S') {
 				if (yych <= 'L') {
-					if (yych <= 'H') goto yy827;
+					if (yych <= 'H') goto yy829;
 					goto yy56;
 				} else {
-					if (yych <= 'M') goto yy828;
+					if (yych <= 'M') goto yy830;
 					if (yych <= 'R') goto yy56;
-					goto yy829;
+					goto yy831;
 				}
 			} else {
 				if (yych <= 'U') {
-					if (yych <= 'T') goto yy830;
-					goto yy831;
+					if (yych <= 'T') goto yy832;
+					goto yy833;
 				} else {
-					if (yych == 'W') goto yy832;
+					if (yych == 'W') goto yy834;
 					goto yy56;
 				}
 			}
@@ -15078,105 +15109,105 @@ yy681:
 		if (yych <= 'r') {
 			if (yych <= 'f') {
 				if (yych <= 'c') {
-					if (yych <= 'Y') goto yy833;
+					if (yych <= 'Y') goto yy835;
 					goto yy56;
 				} else {
-					if (yych <= 'd') goto yy825;
+					if (yych <= 'd') goto yy827;
 					if (yych <= 'e') goto yy56;
-					goto yy826;
+					goto yy828;
 				}
 			} else {
 				if (yych <= 'h') {
 					if (yych <= 'g') goto yy56;
-					goto yy827;
+					goto yy829;
 				} else {
-					if (yych == 'm') goto yy828;
+					if (yych == 'm') goto yy830;
 					goto yy56;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 't') {
-					if (yych <= 's') goto yy829;
-					goto yy830;
+					if (yych <= 's') goto yy831;
+					goto yy832;
 				} else {
-					if (yych <= 'u') goto yy831;
+					if (yych <= 'u') goto yy833;
 					if (yych <= 'v') goto yy56;
-					goto yy832;
+					goto yy834;
 				}
 			} else {
 				if (yych <= 'y') {
 					if (yych <= 'x') goto yy56;
-					goto yy833;
+					goto yy835;
 				} else {
-					if (yych == 0xC2) goto yy834;
+					if (yych == 0xC2) goto yy836;
 					goto yy56;
 				}
 			}
 		}
 	}
-yy682:
-	YYDEBUG(682, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy835;
-	if (yych == 'd') goto yy835;
-	goto yy681;
 yy683:
 	YYDEBUG(683, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == 'D') goto yy837;
+	if (yych == 'd') goto yy837;
+	goto yy682;
+yy684:
+	YYDEBUG(684, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'G') {
 		if (yych <= ')') {
 			if (yych <= '(') goto yy18;
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'F') goto yy798;
-			goto yy836;
+			if (yych <= 'F') goto yy800;
+			goto yy838;
 		}
 	} else {
 		if (yych <= 'f') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'g') goto yy836;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'g') goto yy838;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy684:
-	YYDEBUG(684, *YYCURSOR);
+yy685:
+	YYDEBUG(685, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'F') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'G') goto yy836;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'G') goto yy838;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'f') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'g') goto yy837;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'g') goto yy839;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy685:
-	YYDEBUG(685, *YYCURSOR);
+yy686:
+	YYDEBUG(686, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -15184,53 +15215,53 @@ yy685:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'D') goto yy798;
-			goto yy838;
+			if (yych <= 'D') goto yy800;
+			goto yy840;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'e') goto yy838;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'e') goto yy840;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy686:
-	YYDEBUG(686, *YYCURSOR);
+yy687:
+	YYDEBUG(687, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy838;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'E') goto yy840;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'd') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'e') goto yy839;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'e') goto yy841;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy687:
-	YYDEBUG(687, *YYCURSOR);
+yy688:
+	YYDEBUG(688, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'O') {
 		if (yych <= ')') {
@@ -15238,53 +15269,53 @@ yy687:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'N') goto yy798;
-			goto yy840;
+			if (yych <= 'N') goto yy800;
+			goto yy842;
 		}
 	} else {
 		if (yych <= 'n') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'o') goto yy840;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'o') goto yy842;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy688:
-	YYDEBUG(688, *YYCURSOR);
+yy689:
+	YYDEBUG(689, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'O') goto yy840;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'O') goto yy842;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'n') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'o') goto yy841;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'o') goto yy843;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy689:
-	YYDEBUG(689, *YYCURSOR);
+yy690:
+	YYDEBUG(690, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -15292,22 +15323,22 @@ yy689:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'C') goto yy798;
-			goto yy842;
+			if (yych <= 'C') goto yy800;
+			goto yy844;
 		}
 	} else {
 		if (yych <= 'c') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'd') goto yy842;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'd') goto yy844;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy690:
-	YYDEBUG(690, *YYCURSOR);
+yy691:
+	YYDEBUG(691, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -15315,22 +15346,22 @@ yy690:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'C') goto yy798;
-			goto yy808;
+			if (yych <= 'C') goto yy800;
+			goto yy810;
 		}
 	} else {
 		if (yych <= 'c') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'd') goto yy808;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'd') goto yy810;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy691:
-	YYDEBUG(691, *YYCURSOR);
+yy692:
+	YYDEBUG(692, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'M') {
 		if (yych <= ')') {
@@ -15338,22 +15369,22 @@ yy691:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'L') goto yy798;
-			goto yy843;
+			if (yych <= 'L') goto yy800;
+			goto yy845;
 		}
 	} else {
 		if (yych <= 'l') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'm') goto yy843;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'm') goto yy845;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy692:
-	YYDEBUG(692, *YYCURSOR);
+yy693:
+	YYDEBUG(693, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -15361,165 +15392,165 @@ yy692:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'S') goto yy798;
-			goto yy844;
+			if (yych <= 'S') goto yy800;
+			goto yy846;
 		}
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 't') goto yy844;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 't') goto yy846;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy693:
-	YYDEBUG(693, *YYCURSOR);
+yy694:
+	YYDEBUG(694, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy842;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'D') goto yy844;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'c') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'd') goto yy845;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'd') goto yy847;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy694:
-	YYDEBUG(694, *YYCURSOR);
+yy695:
+	YYDEBUG(695, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy808;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'D') goto yy810;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'c') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'd') goto yy810;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'd') goto yy812;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy695:
-	YYDEBUG(695, *YYCURSOR);
+yy696:
+	YYDEBUG(696, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'M') goto yy843;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'M') goto yy845;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'l') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'm') goto yy846;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'm') goto yy848;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy696:
-	YYDEBUG(696, *YYCURSOR);
+yy697:
+	YYDEBUG(697, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy844;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'T') goto yy846;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 's') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 't') goto yy847;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 't') goto yy849;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy697:
-	YYDEBUG(697, *YYCURSOR);
-	yyaccept = 13;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy402;
-	if (yych <= '5') goto yy848;
-	if (yych <= '6') goto yy849;
-	goto yy402;
 yy698:
 	YYDEBUG(698, *YYCURSOR);
+	yyaccept = 12;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy403;
+	if (yych <= '5') goto yy850;
+	if (yych <= '6') goto yy851;
+	goto yy403;
+yy699:
+	YYDEBUG(699, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
 		if (yych == ')') goto yy108;
 	} else {
-		if (yych <= 'Z') goto yy798;
-		if (yych <= '`') goto yy699;
-		if (yych <= 'z') goto yy798;
+		if (yych <= 'Z') goto yy800;
+		if (yych <= '`') goto yy700;
+		if (yych <= 'z') goto yy800;
 	}
-yy699:
-	YYDEBUG(699, *YYCURSOR);
-#line 1049 "parse_date.re"
+yy700:
+	YYDEBUG(700, *YYCURSOR);
+#line 1054 "parse_date.re"
 	{
 		DEBUG_OUTPUT("midnight | today");
 		TIMELIB_INIT;
@@ -15528,9 +15559,9 @@ yy699:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 15532 "<stdout>"
-yy700:
-	YYDEBUG(700, *YYCURSOR);
+#line 15563 "<stdout>"
+yy701:
+	YYDEBUG(701, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -15538,94 +15569,94 @@ yy700:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Q') goto yy798;
-			goto yy850;
+			if (yych <= 'Q') goto yy800;
+			goto yy852;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'r') goto yy850;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'r') goto yy852;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy701:
-	YYDEBUG(701, *YYCURSOR);
+yy702:
+	YYDEBUG(702, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy108;
 		if (yych <= '@') goto yy18;
-		goto yy851;
+		goto yy853;
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			goto yy18;
 		} else {
-			if (yych <= 'a') goto yy851;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'a') goto yy853;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy702:
-	YYDEBUG(702, *YYCURSOR);
-	yyaccept = 17;
+yy703:
+	YYDEBUG(703, *YYCURSOR);
+	yyaccept = 16;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
 			if (yych == ')') goto yy108;
-			goto yy699;
+			goto yy700;
 		} else {
-			if (yych == '.') goto yy699;
-			goto yy282;
+			if (yych == '.') goto yy700;
+			goto yy283;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy699;
-			if (yych <= 'Z') goto yy798;
-			goto yy699;
+			if (yych <= '@') goto yy700;
+			if (yych <= 'Z') goto yy800;
+			goto yy700;
 		} else {
-			if (yych <= '_') goto yy282;
-			if (yych <= '`') goto yy699;
-			if (yych <= 'z') goto yy801;
-			goto yy699;
+			if (yych <= '_') goto yy283;
+			if (yych <= '`') goto yy700;
+			if (yych <= 'z') goto yy803;
+			goto yy700;
 		}
 	}
-yy703:
-	YYDEBUG(703, *YYCURSOR);
+yy704:
+	YYDEBUG(704, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy850;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'R') goto yy852;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'q') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'r') goto yy852;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'r') goto yy854;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy704:
-	YYDEBUG(704, *YYCURSOR);
+yy705:
+	YYDEBUG(705, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -15634,24 +15665,24 @@ yy704:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy851;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'A') goto yy853;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'a') goto yy853;
-			if (yych <= 'z') goto yy801;
+			if (yych <= 'a') goto yy855;
+			if (yych <= 'z') goto yy803;
 			goto yy18;
 		}
 	}
-yy705:
-	YYDEBUG(705, *YYCURSOR);
+yy706:
+	YYDEBUG(706, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -15659,70 +15690,70 @@ yy705:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'R') goto yy798;
-			goto yy854;
+			if (yych <= 'R') goto yy800;
+			goto yy856;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 's') goto yy854;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 's') goto yy856;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy706:
-	YYDEBUG(706, *YYCURSOR);
+yy707:
+	YYDEBUG(707, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy108;
 		if (yych <= '@') goto yy18;
-		goto yy855;
+		goto yy857;
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			goto yy18;
 		} else {
-			if (yych <= 'a') goto yy855;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'a') goto yy857;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy707:
-	YYDEBUG(707, *YYCURSOR);
+yy708:
+	YYDEBUG(708, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy854;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'S') goto yy856;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'r') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 's') goto yy856;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 's') goto yy858;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy708:
-	YYDEBUG(708, *YYCURSOR);
+yy709:
+	YYDEBUG(709, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -15731,24 +15762,24 @@ yy708:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy855;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'A') goto yy857;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'a') goto yy857;
-			if (yych <= 'z') goto yy801;
+			if (yych <= 'a') goto yy859;
+			if (yych <= 'z') goto yy803;
 			goto yy18;
 		}
 	}
-yy709:
-	YYDEBUG(709, *YYCURSOR);
+yy710:
+	YYDEBUG(710, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -15756,365 +15787,372 @@ yy709:
 			goto yy108;
 		} else {
 			if (yych <= '@') goto yy18;
-			if (yych <= 'Q') goto yy798;
-			goto yy858;
+			if (yych <= 'Q') goto yy800;
+			goto yy860;
 		}
 	} else {
 		if (yych <= 'q') {
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '`') goto yy18;
-			goto yy798;
+			goto yy800;
 		} else {
-			if (yych <= 'r') goto yy858;
-			if (yych <= 'z') goto yy798;
+			if (yych <= 'r') goto yy860;
+			if (yych <= 'z') goto yy800;
 			goto yy18;
 		}
 	}
-yy710:
-	YYDEBUG(710, *YYCURSOR);
+yy711:
+	YYDEBUG(711, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
 		if (yych <= '-') {
 			if (yych == ')') goto yy108;
 			if (yych <= ',') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			if (yych <= '@') goto yy18;
-			goto yy798;
+			goto yy800;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy858;
-			if (yych <= 'Z') goto yy798;
+			if (yych <= 'R') goto yy860;
+			if (yych <= 'Z') goto yy800;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= 'q') {
 				if (yych <= '`') goto yy18;
-				goto yy801;
+				goto yy803;
 			} else {
-				if (yych <= 'r') goto yy859;
-				if (yych <= 'z') goto yy801;
+				if (yych <= 'r') goto yy861;
+				if (yych <= 'z') goto yy803;
 				goto yy18;
 			}
 		}
 	}
-yy711:
-	YYDEBUG(711, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy860;
-	if (yych <= '1') goto yy861;
-	goto yy56;
 yy712:
 	YYDEBUG(712, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy862;
+	if (yych <= '0') goto yy862;
+	if (yych <= '1') goto yy863;
 	goto yy56;
 yy713:
 	YYDEBUG(713, *YYCURSOR);
-	yyaccept = 18;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy714;
-	if (yych <= '9') goto yy862;
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy865;
+	goto yy186;
 yy714:
 	YYDEBUG(714, *YYCURSOR);
-#line 1413 "parse_date.re"
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy866;
+	goto yy56;
+yy715:
+	YYDEBUG(715, *YYCURSOR);
+	yyaccept = 17;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy716;
+	if (yych <= '9') goto yy866;
+yy716:
+	YYDEBUG(716, *YYCURSOR);
+#line 1435 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pointed date YY");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 2, &length);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 2, &length);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 15839 "<stdout>"
-yy715:
-	YYDEBUG(715, *YYCURSOR);
-	yyaccept = 16;
+#line 15877 "<stdout>"
+yy717:
+	YYDEBUG(717, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy547;
-		if (yych <= '9') goto yy862;
-		if (yych <= 'm') goto yy547;
+		if (yych <= '/') goto yy548;
+		if (yych <= '9') goto yy866;
+		if (yych <= 'm') goto yy548;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy547;
+			if (yych <= 'q') goto yy548;
 		} else {
-			if (yych <= 's') goto yy717;
-			if (yych <= 't') goto yy718;
-			goto yy547;
+			if (yych <= 's') goto yy719;
+			if (yych <= 't') goto yy720;
+			goto yy548;
 		}
 	}
-yy716:
-	YYDEBUG(716, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy863;
-	goto yy56;
-yy717:
-	YYDEBUG(717, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 't') goto yy863;
-	goto yy56;
 yy718:
 	YYDEBUG(718, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'h') goto yy863;
+	if (yych == 'd') goto yy867;
 	goto yy56;
 yy719:
 	YYDEBUG(719, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy864;
+	if (yych == 't') goto yy867;
 	goto yy56;
 yy720:
 	YYDEBUG(720, *YYCURSOR);
-	yyaccept = 5;
+	yych = *++YYCURSOR;
+	if (yych == 'h') goto yy867;
+	goto yy56;
+yy721:
+	YYDEBUG(721, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy868;
+	goto yy56;
+yy722:
+	YYDEBUG(722, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy719;
+	if (yych == '.') goto yy721;
 	if (yych <= '/') goto yy209;
-	if (yych <= '9') goto yy862;
+	if (yych <= '9') goto yy866;
 	goto yy209;
-yy721:
-	YYDEBUG(721, *YYCURSOR);
+yy723:
+	YYDEBUG(723, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy214;
-	if (yych <= '9') goto yy866;
+	if (yych <= '9') goto yy870;
 	goto yy214;
-yy722:
-	YYDEBUG(722, *YYCURSOR);
+yy724:
+	YYDEBUG(724, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy867;
+	if (yych <= '9') goto yy871;
 	goto yy56;
-yy723:
-	YYDEBUG(723, *YYCURSOR);
+yy725:
+	YYDEBUG(725, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy868;
-	if (yych <= '3') goto yy869;
-	if (yych <= '9') goto yy549;
+	if (yych <= '2') goto yy872;
+	if (yych <= '3') goto yy873;
+	if (yych <= '9') goto yy550;
 	goto yy56;
-yy724:
-	YYDEBUG(724, *YYCURSOR);
+yy726:
+	YYDEBUG(726, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
 	yych = *YYCURSOR;
-yy725:
-	YYDEBUG(725, *YYCURSOR);
+yy727:
+	YYDEBUG(727, *YYCURSOR);
 	switch (yych) {
 	case '\t':
 	case ' ':
 	case '-':
-	case '.':	goto yy724;
+	case '.':	goto yy726;
 	case 'A':
-	case 'a':	goto yy576;
+	case 'a':	goto yy577;
 	case 'D':
-	case 'd':	goto yy742;
+	case 'd':	goto yy744;
 	case 'F':
-	case 'f':	goto yy743;
-	case 'I':	goto yy579;
+	case 'f':	goto yy745;
+	case 'I':	goto yy580;
 	case 'J':
-	case 'j':	goto yy581;
+	case 'j':	goto yy582;
 	case 'M':
-	case 'm':	goto yy744;
+	case 'm':	goto yy746;
 	case 'N':
-	case 'n':	goto yy583;
+	case 'n':	goto yy584;
 	case 'O':
-	case 'o':	goto yy584;
+	case 'o':	goto yy585;
 	case 'S':
-	case 's':	goto yy745;
-	case 'V':	goto yy586;
-	case 'X':	goto yy588;
+	case 's':	goto yy747;
+	case 'V':	goto yy587;
+	case 'X':	goto yy589;
 	default:	goto yy56;
 	}
-yy726:
-	YYDEBUG(726, *YYCURSOR);
-	yyaccept = 19;
+yy728:
+	YYDEBUG(728, *YYCURSOR);
+	yyaccept = 18;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy870;
-	if (yych <= '/') goto yy727;
-	if (yych <= '9') goto yy871;
-yy727:
-	YYDEBUG(727, *YYCURSOR);
-#line 1358 "parse_date.re"
+	if (yych == '-') goto yy874;
+	if (yych <= '/') goto yy729;
+	if (yych <= '9') goto yy875;
+yy729:
+	YYDEBUG(729, *YYCURSOR);
+#line 1380 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshorter");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->m = timelib_get_nr(&ptr, 2);
 		s->time->d = 1;
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 15961 "<stdout>"
-yy728:
-	YYDEBUG(728, *YYCURSOR);
-	yyaccept = 19;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy870;
-	if (yych <= '/') goto yy727;
-	if (yych <= '2') goto yy871;
-	goto yy727;
-yy729:
-	YYDEBUG(729, *YYCURSOR);
-	yyaccept = 19;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy870;
-	goto yy727;
+#line 15999 "<stdout>"
 yy730:
 	YYDEBUG(730, *YYCURSOR);
+	yyaccept = 18;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == '-') goto yy874;
+	if (yych <= '/') goto yy729;
+	if (yych <= '2') goto yy875;
+	goto yy729;
+yy731:
+	YYDEBUG(731, *YYCURSOR);
+	yyaccept = 18;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == '-') goto yy874;
+	goto yy729;
+yy732:
+	YYDEBUG(732, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'P') goto yy872;
+		if (yych == 'P') goto yy876;
 		if (yych <= 'T') goto yy56;
-		goto yy873;
+		goto yy877;
 	} else {
 		if (yych <= 'p') {
 			if (yych <= 'o') goto yy56;
-			goto yy872;
+			goto yy876;
 		} else {
-			if (yych == 'u') goto yy873;
+			if (yych == 'u') goto yy877;
 			goto yy56;
 		}
 	}
-yy731:
-	YYDEBUG(731, *YYCURSOR);
+yy733:
+	YYDEBUG(733, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy874;
-	if (yych == 'e') goto yy874;
+	if (yych == 'E') goto yy878;
+	if (yych == 'e') goto yy878;
 	goto yy56;
-yy732:
-	YYDEBUG(732, *YYCURSOR);
+yy734:
+	YYDEBUG(734, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy875;
-	if (yych == 'e') goto yy875;
+	if (yych == 'E') goto yy879;
+	if (yych == 'e') goto yy879;
 	goto yy56;
-yy733:
-	YYDEBUG(733, *YYCURSOR);
+yy735:
+	YYDEBUG(735, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'A') goto yy876;
+		if (yych == 'A') goto yy880;
 		if (yych <= 'T') goto yy56;
-		goto yy877;
+		goto yy881;
 	} else {
 		if (yych <= 'a') {
 			if (yych <= '`') goto yy56;
-			goto yy876;
+			goto yy880;
 		} else {
-			if (yych == 'u') goto yy877;
+			if (yych == 'u') goto yy881;
 			goto yy56;
 		}
 	}
-yy734:
-	YYDEBUG(734, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy878;
-	if (yych == 'a') goto yy878;
-	goto yy56;
-yy735:
-	YYDEBUG(735, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy879;
-	if (yych == 'o') goto yy879;
-	goto yy56;
 yy736:
 	YYDEBUG(736, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy880;
-	if (yych == 'c') goto yy880;
+	if (yych == 'A') goto yy882;
+	if (yych == 'a') goto yy882;
 	goto yy56;
 yy737:
 	YYDEBUG(737, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy881;
-	if (yych == 'e') goto yy881;
+	if (yych == 'O') goto yy883;
+	if (yych == 'o') goto yy883;
 	goto yy56;
 yy738:
 	YYDEBUG(738, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy770;
-	if (yych <= '4') goto yy771;
-	if (yych <= '5') goto yy772;
+	if (yych == 'C') goto yy884;
+	if (yych == 'c') goto yy884;
 	goto yy56;
 yy739:
 	YYDEBUG(739, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy882;
-	if (yych <= '9') goto yy883;
+	if (yych == 'E') goto yy885;
+	if (yych == 'e') goto yy885;
 	goto yy56;
 yy740:
 	YYDEBUG(740, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy883;
+	if (yych <= '0') goto yy772;
+	if (yych <= '4') goto yy773;
+	if (yych <= '5') goto yy774;
 	goto yy56;
 yy741:
 	YYDEBUG(741, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy883;
-	if (yych <= '6') goto yy884;
+	if (yych <= '0') goto yy886;
+	if (yych <= '9') goto yy887;
 	goto yy56;
 yy742:
 	YYDEBUG(742, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy760;
-	if (yych == 'e') goto yy760;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy887;
 	goto yy56;
 yy743:
 	YYDEBUG(743, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy761;
-	if (yych == 'e') goto yy761;
+	if (yych <= '/') goto yy56;
+	if (yych <= '5') goto yy887;
+	if (yych <= '6') goto yy888;
 	goto yy56;
 yy744:
 	YYDEBUG(744, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy766;
-	if (yych == 'a') goto yy766;
+	if (yych == 'E') goto yy762;
+	if (yych == 'e') goto yy762;
 	goto yy56;
 yy745:
 	YYDEBUG(745, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy885;
-	if (yych == 'e') goto yy885;
+	if (yych == 'E') goto yy763;
+	if (yych == 'e') goto yy763;
 	goto yy56;
 yy746:
 	YYDEBUG(746, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '.') goto yy56;
-	if (yych <= '/') goto yy886;
-	if (yych <= '9') goto yy887;
+	if (yych == 'A') goto yy768;
+	if (yych == 'a') goto yy768;
 	goto yy56;
 yy747:
 	YYDEBUG(747, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '.') goto yy56;
-	if (yych <= '/') goto yy886;
-	if (yych <= '2') goto yy887;
+	if (yych == 'E') goto yy889;
+	if (yych == 'e') goto yy889;
 	goto yy56;
 yy748:
 	YYDEBUG(748, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '/') goto yy886;
+	if (yych <= '.') goto yy56;
+	if (yych <= '/') goto yy890;
+	if (yych <= '9') goto yy891;
 	goto yy56;
 yy749:
 	YYDEBUG(749, *YYCURSOR);
-	yyaccept = 20;
-	yych = *(YYMARKER = ++YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '.') goto yy56;
+	if (yych <= '/') goto yy890;
+	if (yych <= '2') goto yy891;
+	goto yy56;
+yy750:
+	YYDEBUG(750, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '/') goto yy890;
+	goto yy56;
+yy751:
+	YYDEBUG(751, *YYCURSOR);
+	yyaccept = 19;
+	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'V') {
 		if (yych <= 'C') {
 			if (yych <= '/') {
@@ -16125,11 +16163,11 @@ yy749:
 				}
 			} else {
 				if (yych <= '2') {
-					if (yych <= '0') goto yy888;
-					goto yy889;
+					if (yych <= '0') goto yy892;
+					goto yy893;
 				} else {
-					if (yych <= '3') goto yy891;
-					if (yych <= '9') goto yy892;
+					if (yych <= '3') goto yy895;
+					if (yych <= '9') goto yy896;
 				}
 			}
 		} else {
@@ -16143,7 +16181,7 @@ yy749:
 				if (yych <= 'M') {
 					if (yych >= 'M') goto yy186;
 				} else {
-					if (yych <= 'R') goto yy750;
+					if (yych <= 'R') goto yy752;
 					if (yych <= 'U') goto yy186;
 				}
 			}
@@ -16180,20 +16218,20 @@ yy749:
 			}
 		}
 	}
-yy750:
-	YYDEBUG(750, *YYCURSOR);
-#line 1296 "parse_date.re"
+yy752:
+	YYDEBUG(752, *YYCURSOR);
+#line 1306 "parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("iso8601nocolon");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
-		s->time->s = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
+		s->time->s = timelib_get_nr(&ptr, 2);
 
 		if (*ptr != '\0') {
-			s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+			s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 			if (tz_not_found) {
 				add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 			}
@@ -16201,44 +16239,44 @@ yy750:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_NOCOLON;
 	}
-#line 16205 "<stdout>"
-yy751:
-	YYDEBUG(751, *YYCURSOR);
-	yyaccept = 20;
+#line 16243 "<stdout>"
+yy753:
+	YYDEBUG(753, *YYCURSOR);
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'V') {
 		if (yych <= 'C') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy186;
-				if (yych <= 0x1F) goto yy750;
+				if (yych <= 0x1F) goto yy752;
 				goto yy186;
 			} else {
 				if (yych <= '2') {
-					if (yych <= '/') goto yy750;
-					goto yy889;
+					if (yych <= '/') goto yy752;
+					goto yy893;
 				} else {
-					if (yych <= '3') goto yy891;
-					if (yych <= '9') goto yy892;
-					goto yy750;
+					if (yych <= '3') goto yy895;
+					if (yych <= '9') goto yy896;
+					goto yy752;
 				}
 			}
 		} else {
 			if (yych <= 'H') {
 				if (yych <= 'E') {
 					if (yych <= 'D') goto yy186;
-					goto yy750;
+					goto yy752;
 				} else {
-					if (yych == 'G') goto yy750;
+					if (yych == 'G') goto yy752;
 					goto yy186;
 				}
 			} else {
 				if (yych <= 'M') {
-					if (yych <= 'L') goto yy750;
+					if (yych <= 'L') goto yy752;
 					goto yy186;
 				} else {
-					if (yych <= 'R') goto yy750;
+					if (yych <= 'R') goto yy752;
 					if (yych <= 'U') goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			}
 		}
@@ -16247,71 +16285,71 @@ yy751:
 			if (yych <= 'd') {
 				if (yych <= 'X') {
 					if (yych <= 'W') goto yy186;
-					goto yy750;
+					goto yy752;
 				} else {
 					if (yych <= 'Y') goto yy186;
-					if (yych <= 'c') goto yy750;
+					if (yych <= 'c') goto yy752;
 					goto yy186;
 				}
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy750;
+					if (yych <= 'e') goto yy752;
 					goto yy186;
 				} else {
 					if (yych == 'h') goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy186;
-					goto yy750;
+					goto yy752;
 				} else {
-					if (yych == 'v') goto yy750;
+					if (yych == 'v') goto yy752;
 					goto yy186;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy750;
+					if (yych <= 'x') goto yy752;
 					goto yy186;
 				} else {
 					if (yych == 0xC2) goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			}
 		}
 	}
-yy752:
-	YYDEBUG(752, *YYCURSOR);
-	yyaccept = 20;
+yy754:
+	YYDEBUG(754, *YYCURSOR);
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'E') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy186;
-				if (yych <= 0x1F) goto yy750;
+				if (yych <= 0x1F) goto yy752;
 				goto yy186;
 			} else {
 				if (yych <= '9') {
-					if (yych <= '/') goto yy750;
-					goto yy892;
+					if (yych <= '/') goto yy752;
+					goto yy896;
 				} else {
 					if (yych == 'D') goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
-				if (yych == 'G') goto yy750;
+				if (yych == 'G') goto yy752;
 				if (yych <= 'H') goto yy186;
-				goto yy750;
+				goto yy752;
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'M') goto yy186;
-					goto yy750;
+					goto yy752;
 				} else {
-					if (yych == 'V') goto yy750;
+					if (yych == 'V') goto yy752;
 					goto yy186;
 				}
 			}
@@ -16320,72 +16358,72 @@ yy752:
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych == 'Y') goto yy186;
-				if (yych <= 'c') goto yy750;
+				if (yych <= 'c') goto yy752;
 				goto yy186;
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy750;
+					if (yych <= 'e') goto yy752;
 					goto yy186;
 				} else {
 					if (yych == 'h') goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy186;
-					goto yy750;
+					goto yy752;
 				} else {
-					if (yych == 'v') goto yy750;
+					if (yych == 'v') goto yy752;
 					goto yy186;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy750;
+					if (yych <= 'x') goto yy752;
 					goto yy186;
 				} else {
 					if (yych == 0xC2) goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			}
 		}
 	}
-yy753:
-	YYDEBUG(753, *YYCURSOR);
-	yyaccept = 20;
+yy755:
+	YYDEBUG(755, *YYCURSOR);
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'D') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy186;
-				if (yych <= 0x1F) goto yy750;
+				if (yych <= 0x1F) goto yy752;
 				goto yy186;
 			} else {
 				if (yych <= '6') {
-					if (yych <= '/') goto yy750;
-					goto yy892;
+					if (yych <= '/') goto yy752;
+					goto yy896;
 				} else {
-					if (yych <= '9') goto yy893;
-					if (yych <= 'C') goto yy750;
+					if (yych <= '9') goto yy897;
+					if (yych <= 'C') goto yy752;
 					goto yy186;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
 				if (yych <= 'F') {
-					if (yych <= 'E') goto yy750;
+					if (yych <= 'E') goto yy752;
 					goto yy186;
 				} else {
 					if (yych == 'H') goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'M') goto yy186;
-					goto yy750;
+					goto yy752;
 				} else {
-					if (yych == 'V') goto yy750;
+					if (yych == 'V') goto yy752;
 					goto yy186;
 				}
 			}
@@ -16394,67 +16432,67 @@ yy753:
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych == 'Y') goto yy186;
-				if (yych <= 'c') goto yy750;
+				if (yych <= 'c') goto yy752;
 				goto yy186;
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy750;
+					if (yych <= 'e') goto yy752;
 					goto yy186;
 				} else {
 					if (yych == 'h') goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy186;
-					goto yy750;
+					goto yy752;
 				} else {
-					if (yych == 'v') goto yy750;
+					if (yych == 'v') goto yy752;
 					goto yy186;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy750;
+					if (yych <= 'x') goto yy752;
 					goto yy186;
 				} else {
 					if (yych == 0xC2) goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			}
 		}
 	}
-yy754:
-	YYDEBUG(754, *YYCURSOR);
-	yyaccept = 20;
+yy756:
+	YYDEBUG(756, *YYCURSOR);
+	yyaccept = 19;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'E') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy186;
-				if (yych <= 0x1F) goto yy750;
+				if (yych <= 0x1F) goto yy752;
 				goto yy186;
 			} else {
 				if (yych <= '9') {
-					if (yych <= '/') goto yy750;
-					goto yy893;
+					if (yych <= '/') goto yy752;
+					goto yy897;
 				} else {
 					if (yych == 'D') goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
-				if (yych == 'G') goto yy750;
+				if (yych == 'G') goto yy752;
 				if (yych <= 'H') goto yy186;
-				goto yy750;
+				goto yy752;
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'M') goto yy186;
-					goto yy750;
+					goto yy752;
 				} else {
-					if (yych == 'V') goto yy750;
+					if (yych == 'V') goto yy752;
 					goto yy186;
 				}
 			}
@@ -16463,274 +16501,274 @@ yy754:
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych == 'Y') goto yy186;
-				if (yych <= 'c') goto yy750;
+				if (yych <= 'c') goto yy752;
 				goto yy186;
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy750;
+					if (yych <= 'e') goto yy752;
 					goto yy186;
 				} else {
 					if (yych == 'h') goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy186;
-					goto yy750;
+					goto yy752;
 				} else {
-					if (yych == 'v') goto yy750;
+					if (yych == 'v') goto yy752;
 					goto yy186;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy750;
+					if (yych <= 'x') goto yy752;
 					goto yy186;
 				} else {
 					if (yych == 0xC2) goto yy186;
-					goto yy750;
+					goto yy752;
 				}
 			}
 		}
 	}
-yy755:
-	YYDEBUG(755, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy893;
-	goto yy186;
-yy756:
-	YYDEBUG(756, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy894;
-	goto yy56;
 yy757:
 	YYDEBUG(757, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy894;
-	goto yy56;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy897;
+	goto yy186;
 yy758:
 	YYDEBUG(758, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy895;
-	if (yych == 'r') goto yy895;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy898;
 	goto yy56;
 yy759:
 	YYDEBUG(759, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy896;
-	if (yych == 'g') goto yy896;
+	if (yych <= '/') goto yy56;
+	if (yych <= '2') goto yy898;
 	goto yy56;
 yy760:
 	YYDEBUG(760, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy897;
-	if (yych == 'c') goto yy897;
+	if (yych == 'R') goto yy899;
+	if (yych == 'r') goto yy899;
 	goto yy56;
 yy761:
 	YYDEBUG(761, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy898;
-	if (yych == 'b') goto yy898;
+	if (yych == 'G') goto yy900;
+	if (yych == 'g') goto yy900;
 	goto yy56;
 yy762:
 	YYDEBUG(762, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != 'I') goto yy580;
+	if (yych == 'C') goto yy901;
+	if (yych == 'c') goto yy901;
+	goto yy56;
 yy763:
 	YYDEBUG(763, *YYCURSOR);
-	++YYCURSOR;
-	goto yy580;
+	yych = *++YYCURSOR;
+	if (yych == 'B') goto yy902;
+	if (yych == 'b') goto yy902;
+	goto yy56;
 yy764:
 	YYDEBUG(764, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy899;
-	if (yych == 'n') goto yy899;
-	goto yy56;
+	if (yych != 'I') goto yy581;
 yy765:
 	YYDEBUG(765, *YYCURSOR);
+	++YYCURSOR;
+	goto yy581;
+yy766:
+	YYDEBUG(766, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'N') goto yy903;
+	if (yych == 'n') goto yy903;
+	goto yy56;
+yy767:
+	YYDEBUG(767, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'L') goto yy900;
+		if (yych == 'L') goto yy904;
 		if (yych <= 'M') goto yy56;
-		goto yy901;
+		goto yy905;
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'k') goto yy56;
-			goto yy900;
+			goto yy904;
 		} else {
-			if (yych == 'n') goto yy901;
+			if (yych == 'n') goto yy905;
 			goto yy56;
 		}
 	}
-yy766:
-	YYDEBUG(766, *YYCURSOR);
+yy768:
+	YYDEBUG(768, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
-		if (yych == 'R') goto yy902;
+		if (yych == 'R') goto yy906;
 		if (yych <= 'X') goto yy56;
-		goto yy763;
+		goto yy765;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy56;
-			goto yy902;
+			goto yy906;
 		} else {
-			if (yych == 'y') goto yy763;
+			if (yych == 'y') goto yy765;
 			goto yy56;
 		}
 	}
-yy767:
-	YYDEBUG(767, *YYCURSOR);
+yy769:
+	YYDEBUG(769, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'V') goto yy897;
-	if (yych == 'v') goto yy897;
+	if (yych == 'V') goto yy901;
+	if (yych == 'v') goto yy901;
 	goto yy56;
-yy768:
-	YYDEBUG(768, *YYCURSOR);
+yy770:
+	YYDEBUG(770, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy903;
-	if (yych == 't') goto yy903;
+	if (yych == 'T') goto yy907;
+	if (yych == 't') goto yy907;
 	goto yy56;
-yy769:
-	YYDEBUG(769, *YYCURSOR);
+yy771:
+	YYDEBUG(771, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'P') {
-		if (yych == 'C') goto yy425;
+		if (yych == 'C') goto yy426;
 		if (yych <= 'O') goto yy56;
-		goto yy904;
+		goto yy908;
 	} else {
 		if (yych <= 'c') {
 			if (yych <= 'b') goto yy56;
-			goto yy425;
+			goto yy426;
 		} else {
-			if (yych == 'p') goto yy904;
+			if (yych == 'p') goto yy908;
 			goto yy56;
 		}
 	}
-yy770:
-	YYDEBUG(770, *YYCURSOR);
+yy772:
+	YYDEBUG(772, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '0') goto yy56;
-	if (yych <= '9') goto yy905;
+	if (yych <= '9') goto yy909;
 	goto yy56;
-yy771:
-	YYDEBUG(771, *YYCURSOR);
+yy773:
+	YYDEBUG(773, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy905;
+	if (yych <= '9') goto yy909;
 	goto yy56;
-yy772:
-	YYDEBUG(772, *YYCURSOR);
+yy774:
+	YYDEBUG(774, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '3') goto yy905;
+	if (yych <= '3') goto yy909;
 	goto yy56;
-yy773:
-	YYDEBUG(773, *YYCURSOR);
+yy775:
+	YYDEBUG(775, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '2') {
 		if (yych <= '/') goto yy186;
-		if (yych <= '0') goto yy888;
-		goto yy889;
+		if (yych <= '0') goto yy892;
+		goto yy893;
 	} else {
-		if (yych <= '3') goto yy891;
-		if (yych <= '9') goto yy892;
+		if (yych <= '3') goto yy895;
+		if (yych <= '9') goto yy896;
 		goto yy186;
 	}
-yy774:
-	YYDEBUG(774, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy186;
-	if (yych <= '2') goto yy889;
-	if (yych <= '3') goto yy891;
-	if (yych <= '9') goto yy892;
-	goto yy186;
-yy775:
-	YYDEBUG(775, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy892;
-	goto yy186;
 yy776:
 	YYDEBUG(776, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '6') goto yy892;
-	if (yych <= '9') goto yy893;
+	if (yych <= '2') goto yy893;
+	if (yych <= '3') goto yy895;
+	if (yych <= '9') goto yy896;
 	goto yy186;
 yy777:
 	YYDEBUG(777, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy243;
-	if (yych == 't') goto yy243;
-	goto yy56;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy896;
+	goto yy186;
 yy778:
 	YYDEBUG(778, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy779;
-	if (yych != 'n') goto yy56;
+	if (yych <= '/') goto yy186;
+	if (yych <= '6') goto yy896;
+	if (yych <= '9') goto yy897;
+	goto yy186;
 yy779:
 	YYDEBUG(779, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy907;
-	if (yych == 'i') goto yy907;
+	if (yych == 'T') goto yy243;
+	if (yych == 't') goto yy243;
 	goto yy56;
 yy780:
 	YYDEBUG(780, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy595;
-	if (yych == 'y') goto yy595;
-	goto yy56;
+	if (yych == 'N') goto yy781;
+	if (yych != 'n') goto yy56;
 yy781:
 	YYDEBUG(781, *YYCURSOR);
-	++YYCURSOR;
-	goto yy241;
+	yych = *++YYCURSOR;
+	if (yych == 'I') goto yy911;
+	if (yych == 'i') goto yy911;
+	goto yy56;
 yy782:
 	YYDEBUG(782, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy908;
-	if (yych == 'r') goto yy908;
+	if (yych == 'Y') goto yy596;
+	if (yych == 'y') goto yy596;
 	goto yy56;
 yy783:
 	YYDEBUG(783, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy909;
-	if (yych == 's') goto yy909;
-	goto yy56;
+	++YYCURSOR;
+	goto yy241;
 yy784:
 	YYDEBUG(784, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy407;
-	if (yych == 'e') goto yy407;
+	if (yych == 'R') goto yy912;
+	if (yych == 'r') goto yy912;
 	goto yy56;
 yy785:
 	YYDEBUG(785, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy910;
-	if (yych == 'e') goto yy910;
+	if (yych == 'S') goto yy913;
+	if (yych == 's') goto yy913;
 	goto yy56;
 yy786:
 	YYDEBUG(786, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy407;
-	if (yych == 'd') goto yy407;
+	if (yych == 'E') goto yy408;
+	if (yych == 'e') goto yy408;
 	goto yy56;
 yy787:
 	YYDEBUG(787, *YYCURSOR);
-	yyaccept = 5;
+	yych = *++YYCURSOR;
+	if (yych == 'E') goto yy914;
+	if (yych == 'e') goto yy914;
+	goto yy56;
+yy788:
+	YYDEBUG(788, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'D') goto yy408;
+	if (yych == 'd') goto yy408;
+	goto yy56;
+yy789:
+	YYDEBUG(789, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy619;
+			if (yych == '\t') goto yy620;
 			if (yych <= 0x1F) goto yy209;
-			goto yy619;
+			goto yy620;
 		} else {
-			if (yych == '.') goto yy719;
+			if (yych == '.') goto yy721;
 			if (yych <= '/') goto yy209;
-			goto yy862;
+			goto yy866;
 		}
 	} else {
 		if (yych <= 'P') {
@@ -16747,17 +16785,17 @@ yy787:
 			}
 		}
 	}
-yy788:
-	YYDEBUG(788, *YYCURSOR);
-	yyaccept = 5;
+yy790:
+	YYDEBUG(790, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy619;
+			if (yych == '\t') goto yy620;
 			goto yy209;
 		} else {
-			if (yych <= ' ') goto yy619;
-			if (yych == '.') goto yy719;
+			if (yych <= ' ') goto yy620;
+			if (yych == '.') goto yy721;
 			goto yy209;
 		}
 	} else {
@@ -16771,242 +16809,242 @@ yy788:
 			goto yy209;
 		}
 	}
-yy789:
-	YYDEBUG(789, *YYCURSOR);
-	yyaccept = 5;
+yy791:
+	YYDEBUG(791, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy719;
+	if (yych == '.') goto yy721;
 	if (yych <= '/') goto yy209;
-	if (yych <= '9') goto yy911;
+	if (yych <= '9') goto yy915;
 	goto yy209;
-yy790:
-	YYDEBUG(790, *YYCURSOR);
-	yyaccept = 5;
+yy792:
+	YYDEBUG(792, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy719;
-	if (yych == '0') goto yy911;
+	if (yych == '.') goto yy721;
+	if (yych == '0') goto yy915;
 	goto yy209;
-yy791:
-	YYDEBUG(791, *YYCURSOR);
-	yyaccept = 16;
+yy793:
+	YYDEBUG(793, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy547;
-		if (yych <= '9') goto yy793;
-		if (yych <= 'm') goto yy547;
-		goto yy716;
+		if (yych <= '/') goto yy548;
+		if (yych <= '9') goto yy795;
+		if (yych <= 'm') goto yy548;
+		goto yy718;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy547;
-			goto yy716;
+			if (yych <= 'q') goto yy548;
+			goto yy718;
 		} else {
-			if (yych <= 's') goto yy717;
-			if (yych <= 't') goto yy718;
-			goto yy547;
+			if (yych <= 's') goto yy719;
+			if (yych <= 't') goto yy720;
+			goto yy548;
 		}
 	}
-yy792:
-	YYDEBUG(792, *YYCURSOR);
-	yyaccept = 16;
+yy794:
+	YYDEBUG(794, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy547;
-		if (yych <= '1') goto yy793;
-		if (yych <= 'm') goto yy547;
-		goto yy716;
+		if (yych <= '/') goto yy548;
+		if (yych <= '1') goto yy795;
+		if (yych <= 'm') goto yy548;
+		goto yy718;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy547;
-			goto yy716;
+			if (yych <= 'q') goto yy548;
+			goto yy718;
 		} else {
-			if (yych <= 's') goto yy717;
-			if (yych <= 't') goto yy718;
-			goto yy547;
+			if (yych <= 's') goto yy719;
+			if (yych <= 't') goto yy720;
+			goto yy548;
 		}
 	}
-yy793:
-	YYDEBUG(793, *YYCURSOR);
-	yyaccept = 16;
+yy795:
+	YYDEBUG(795, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'q') {
-		if (yych == 'n') goto yy716;
-		goto yy547;
+		if (yych == 'n') goto yy718;
+		goto yy548;
 	} else {
-		if (yych <= 'r') goto yy716;
-		if (yych <= 's') goto yy717;
-		if (yych <= 't') goto yy718;
-		goto yy547;
+		if (yych <= 'r') goto yy718;
+		if (yych <= 's') goto yy719;
+		if (yych <= 't') goto yy720;
+		goto yy548;
 	}
-yy794:
-	YYDEBUG(794, *YYCURSOR);
+yy796:
+	YYDEBUG(796, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy912;
-	if (yych <= '3') goto yy913;
-	if (yych <= '9') goto yy793;
+	if (yych <= '2') goto yy916;
+	if (yych <= '3') goto yy917;
+	if (yych <= '9') goto yy795;
 	goto yy56;
-yy795:
-	YYDEBUG(795, *YYCURSOR);
+yy797:
+	YYDEBUG(797, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy914;
+	if (yych == '-') goto yy918;
 	goto yy56;
-yy796:
-	YYDEBUG(796, *YYCURSOR);
+yy798:
+	YYDEBUG(798, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
-		if (yych == '-') goto yy914;
+		if (yych == '-') goto yy918;
 		goto yy56;
 	} else {
-		if (yych <= 'T') goto yy795;
-		if (yych == 't') goto yy795;
+		if (yych <= 'T') goto yy797;
+		if (yych == 't') goto yy797;
 		goto yy56;
 	}
-yy797:
-	YYDEBUG(797, *YYCURSOR);
+yy799:
+	YYDEBUG(799, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy915;
-	goto yy56;
-yy798:
-	YYDEBUG(798, *YYCURSOR);
+	if (yych <= '/') goto yy276;
+	if (yych <= '9') goto yy919;
+	goto yy276;
+yy800:
+	YYDEBUG(800, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych == ')') goto yy108;
 	goto yy18;
-yy799:
-	YYDEBUG(799, *YYCURSOR);
+yy801:
+	YYDEBUG(801, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '9') {
 		if (yych <= ' ') {
 			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy309;
+				if (yych <= 0x00) goto yy310;
 				goto yy56;
 			} else {
-				if (yych <= '\t') goto yy311;
+				if (yych <= '\t') goto yy312;
 				if (yych <= 0x1F) goto yy56;
-				goto yy311;
+				goto yy312;
 			}
 		} else {
 			if (yych <= '-') {
 				if (yych <= '+') goto yy56;
-				if (yych <= ',') goto yy311;
-				goto yy916;
+				if (yych <= ',') goto yy312;
+				goto yy920;
 			} else {
-				if (yych <= '.') goto yy311;
+				if (yych <= '.') goto yy312;
 				if (yych <= '/') goto yy56;
-				goto yy492;
+				goto yy493;
 			}
 		}
 	} else {
 		if (yych <= 'm') {
 			if (yych <= 'd') {
 				if (yych <= 'c') goto yy56;
-				goto yy311;
+				goto yy312;
 			} else {
-				if (yych == 'h') goto yy311;
+				if (yych == 'h') goto yy312;
 				goto yy56;
 			}
 		} else {
 			if (yych <= 'r') {
-				if (yych <= 'n') goto yy314;
+				if (yych <= 'n') goto yy315;
 				if (yych <= 'q') goto yy56;
-				goto yy314;
+				goto yy315;
 			} else {
-				if (yych <= 's') goto yy315;
-				if (yych <= 't') goto yy316;
+				if (yych <= 's') goto yy316;
+				if (yych <= 't') goto yy317;
 				goto yy56;
 			}
 		}
 	}
-yy800:
-	YYDEBUG(800, *YYCURSOR);
-	yyaccept = 8;
+yy802:
+	YYDEBUG(802, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '(') {
 		if (yych <= '\t') {
-			if (yych <= 0x08) goto yy280;
+			if (yych <= 0x08) goto yy281;
 			goto yy135;
 		} else {
 			if (yych == ' ') goto yy135;
-			goto yy280;
+			goto yy281;
 		}
 	} else {
 		if (yych <= '.') {
 			if (yych <= ')') goto yy108;
-			if (yych <= ',') goto yy280;
+			if (yych <= ',') goto yy281;
 			goto yy135;
 		} else {
-			if (yych <= '/') goto yy280;
+			if (yych <= '/') goto yy281;
 			if (yych <= '9') goto yy135;
-			goto yy280;
+			goto yy281;
 		}
 	}
-yy801:
-	YYDEBUG(801, *YYCURSOR);
+yy803:
+	YYDEBUG(803, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 128) {
-		goto yy917;
+		goto yy921;
 	}
 	if (yych <= '-') {
 		if (yych == ')') goto yy108;
 		if (yych <= ',') goto yy18;
-		goto yy282;
+		goto yy283;
 	} else {
 		if (yych <= '/') {
 			if (yych <= '.') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
-			if (yych == '_') goto yy282;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		}
 	}
-yy802:
-	YYDEBUG(802, *YYCURSOR);
-	yyaccept = 8;
+yy804:
+	YYDEBUG(804, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 128) {
-		goto yy917;
+		goto yy921;
 	}
 	if (yych <= ',') {
 		if (yych <= 0x1F) {
 			if (yych == '\t') goto yy135;
-			goto yy280;
+			goto yy281;
 		} else {
 			if (yych <= ' ') goto yy135;
 			if (yych == ')') goto yy108;
-			goto yy280;
+			goto yy281;
 		}
 	} else {
 		if (yych <= '/') {
-			if (yych <= '-') goto yy679;
+			if (yych <= '-') goto yy680;
 			if (yych <= '.') goto yy135;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= '9') goto yy135;
-			if (yych == '_') goto yy282;
-			goto yy280;
+			if (yych == '_') goto yy283;
+			goto yy281;
 		}
 	}
-yy803:
-	YYDEBUG(803, *YYCURSOR);
+yy805:
+	YYDEBUG(805, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy919;
-	if (yych == 'f') goto yy919;
+	if (yych == 'F') goto yy923;
+	if (yych == 'f') goto yy923;
 	goto yy56;
-yy804:
-	YYDEBUG(804, *YYCURSOR);
+yy806:
+	YYDEBUG(806, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'E') goto yy920;
-		if (yych == 'e') goto yy920;
+		if (yych <= 'E') goto yy924;
+		if (yych == 'e') goto yy924;
 		goto yy18;
 	}
-yy805:
-	YYDEBUG(805, *YYCURSOR);
+yy807:
+	YYDEBUG(807, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -17015,58 +17053,58 @@ yy805:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'E') goto yy920;
-			if (yych == '_') goto yy282;
+			if (yych <= 'E') goto yy924;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'e') goto yy921;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'e') goto yy925;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy806:
-	YYDEBUG(806, *YYCURSOR);
+yy808:
+	YYDEBUG(808, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
 	yych = *YYCURSOR;
-yy807:
-	YYDEBUG(807, *YYCURSOR);
+yy809:
+	YYDEBUG(809, *YYCURSOR);
 	if (yych <= 'X') {
 		if (yych <= 'G') {
 			if (yych <= ' ') {
-				if (yych == '\t') goto yy806;
+				if (yych == '\t') goto yy808;
 				if (yych <= 0x1F) goto yy56;
-				goto yy806;
+				goto yy808;
 			} else {
 				if (yych <= 'D') {
 					if (yych <= 'C') goto yy56;
-					goto yy825;
+					goto yy827;
 				} else {
-					if (yych == 'F') goto yy826;
+					if (yych == 'F') goto yy828;
 					goto yy56;
 				}
 			}
 		} else {
 			if (yych <= 'S') {
 				if (yych <= 'L') {
-					if (yych <= 'H') goto yy827;
+					if (yych <= 'H') goto yy829;
 					goto yy56;
 				} else {
-					if (yych <= 'M') goto yy828;
+					if (yych <= 'M') goto yy830;
 					if (yych <= 'R') goto yy56;
-					goto yy829;
+					goto yy831;
 				}
 			} else {
 				if (yych <= 'U') {
-					if (yych <= 'T') goto yy830;
-					goto yy831;
+					if (yych <= 'T') goto yy832;
+					goto yy833;
 				} else {
-					if (yych == 'W') goto yy922;
+					if (yych == 'W') goto yy926;
 					goto yy56;
 				}
 			}
@@ -17075,95 +17113,95 @@ yy807:
 		if (yych <= 'r') {
 			if (yych <= 'f') {
 				if (yych <= 'c') {
-					if (yych <= 'Y') goto yy833;
+					if (yych <= 'Y') goto yy835;
 					goto yy56;
 				} else {
-					if (yych <= 'd') goto yy825;
+					if (yych <= 'd') goto yy827;
 					if (yych <= 'e') goto yy56;
-					goto yy826;
+					goto yy828;
 				}
 			} else {
 				if (yych <= 'h') {
 					if (yych <= 'g') goto yy56;
-					goto yy827;
+					goto yy829;
 				} else {
-					if (yych == 'm') goto yy828;
+					if (yych == 'm') goto yy830;
 					goto yy56;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 't') {
-					if (yych <= 's') goto yy829;
-					goto yy830;
+					if (yych <= 's') goto yy831;
+					goto yy832;
 				} else {
-					if (yych <= 'u') goto yy831;
+					if (yych <= 'u') goto yy833;
 					if (yych <= 'v') goto yy56;
-					goto yy922;
+					goto yy926;
 				}
 			} else {
 				if (yych <= 'y') {
 					if (yych <= 'x') goto yy56;
-					goto yy833;
+					goto yy835;
 				} else {
-					if (yych == 0xC2) goto yy834;
+					if (yych == 0xC2) goto yy836;
 					goto yy56;
 				}
 			}
 		}
 	}
-yy808:
-	YYDEBUG(808, *YYCURSOR);
+yy810:
+	YYDEBUG(810, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy806;
+		if (yych == '\t') goto yy808;
 		goto yy18;
 	} else {
-		if (yych <= ' ') goto yy806;
+		if (yych <= ' ') goto yy808;
 		if (yych == ')') goto yy108;
 		goto yy18;
 	}
-yy809:
-	YYDEBUG(809, *YYCURSOR);
+yy811:
+	YYDEBUG(811, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'T') goto yy923;
-		if (yych == 't') goto yy923;
+		if (yych <= 'T') goto yy927;
+		if (yych == 't') goto yy927;
 		goto yy18;
 	}
-yy810:
-	YYDEBUG(810, *YYCURSOR);
+yy812:
+	YYDEBUG(812, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 128) {
-		goto yy917;
+		goto yy921;
 	}
 	if (yych <= ')') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy806;
+			if (yych == '\t') goto yy808;
 			goto yy18;
 		} else {
-			if (yych <= ' ') goto yy806;
+			if (yych <= ' ') goto yy808;
 			if (yych <= '(') goto yy18;
 			goto yy108;
 		}
 	} else {
 		if (yych <= '.') {
-			if (yych == '-') goto yy282;
+			if (yych == '-') goto yy283;
 			goto yy18;
 		} else {
-			if (yych <= '/') goto yy282;
-			if (yych == '_') goto yy282;
+			if (yych <= '/') goto yy283;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		}
 	}
-yy811:
-	YYDEBUG(811, *YYCURSOR);
+yy813:
+	YYDEBUG(813, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -17172,45 +17210,45 @@ yy811:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'T') goto yy923;
-			if (yych == '_') goto yy282;
+			if (yych <= 'T') goto yy927;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 't') goto yy924;
-			if (yych <= 'z') goto yy917;
+			if (yych == 't') goto yy928;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy812:
-	YYDEBUG(812, *YYCURSOR);
+yy814:
+	YYDEBUG(814, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'R') goto yy925;
-		if (yych == 'r') goto yy925;
+		if (yych <= 'R') goto yy929;
+		if (yych == 'r') goto yy929;
 		goto yy18;
 	}
-yy813:
-	YYDEBUG(813, *YYCURSOR);
+yy815:
+	YYDEBUG(815, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy835;
-	if (yych == 'd') goto yy835;
-	goto yy807;
-yy814:
-	YYDEBUG(814, *YYCURSOR);
+	if (yych == 'D') goto yy837;
+	if (yych == 'd') goto yy837;
+	goto yy809;
+yy816:
+	YYDEBUG(816, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych == ')') goto yy108;
-	goto yy300;
-yy815:
-	YYDEBUG(815, *YYCURSOR);
+	goto yy301;
+yy817:
+	YYDEBUG(817, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -17219,74 +17257,74 @@ yy815:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'R') goto yy925;
-			if (yych == '_') goto yy282;
+			if (yych <= 'R') goto yy929;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'r') goto yy926;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'r') goto yy930;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy816:
-	YYDEBUG(816, *YYCURSOR);
-	yyaccept = 10;
+yy818:
+	YYDEBUG(818, *YYCURSOR);
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 128) {
-		goto yy917;
+		goto yy921;
 	}
 	if (yych <= '-') {
 		if (yych == ')') goto yy108;
-		if (yych <= ',') goto yy300;
-		goto yy282;
+		if (yych <= ',') goto yy301;
+		goto yy283;
 	} else {
 		if (yych <= '/') {
-			if (yych <= '.') goto yy300;
-			goto yy282;
+			if (yych <= '.') goto yy301;
+			goto yy283;
 		} else {
-			if (yych == '_') goto yy282;
-			goto yy300;
+			if (yych == '_') goto yy283;
+			goto yy301;
 		}
 	}
-yy817:
-	YYDEBUG(817, *YYCURSOR);
-	yyaccept = 21;
+yy819:
+	YYDEBUG(819, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '.') goto yy927;
+		if (yych == '.') goto yy931;
 	} else {
-		if (yych <= '9') goto yy819;
-		if (yych <= ':') goto yy927;
+		if (yych <= '9') goto yy821;
+		if (yych <= ':') goto yy931;
 	}
-yy818:
-	YYDEBUG(818, *YYCURSOR);
-#line 1757 "parse_date.re"
+yy820:
+	YYDEBUG(820, *YYCURSOR);
+#line 1779 "parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
 
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
 		if (*ptr == ':') {
-			s->time->s = timelib_get_nr((char **) &ptr, 2);
+			s->time->s = timelib_get_nr(&ptr, 2);
 
 			if (*ptr == '.') {
-				s->time->us = timelib_get_frac_nr((char **) &ptr, 8);
+				s->time->us = timelib_get_frac_nr(&ptr, 8);
 			}
 		}
 
 		if (*ptr != '\0') {
-			s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+			s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 			if (tz_not_found) {
 				add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 			}
@@ -17294,52 +17332,52 @@ yy818:
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 17298 "<stdout>"
-yy819:
-	YYDEBUG(819, *YYCURSOR);
-	yyaccept = 21;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy927;
-	if (yych == ':') goto yy927;
-	goto yy818;
-yy820:
-	YYDEBUG(820, *YYCURSOR);
-	yyaccept = 21;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy928;
-		goto yy818;
-	} else {
-		if (yych <= '9') goto yy929;
-		if (yych <= ':') goto yy928;
-		goto yy818;
-	}
+#line 17336 "<stdout>"
 yy821:
 	YYDEBUG(821, *YYCURSOR);
-	yyaccept = 21;
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy928;
-	if (yych == ':') goto yy928;
-	goto yy818;
+	if (yych == '.') goto yy931;
+	if (yych == ':') goto yy931;
+	goto yy820;
 yy822:
 	YYDEBUG(822, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy310;
-	if (yych <= '9') goto yy930;
-	goto yy310;
+	yyaccept = 20;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') {
+		if (yych == '.') goto yy932;
+		goto yy820;
+	} else {
+		if (yych <= '9') goto yy933;
+		if (yych <= ':') goto yy932;
+		goto yy820;
+	}
 yy823:
 	YYDEBUG(823, *YYCURSOR);
+	yyaccept = 20;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == '.') goto yy932;
+	if (yych == ':') goto yy932;
+	goto yy820;
+yy824:
+	YYDEBUG(824, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy311;
+	if (yych <= '9') goto yy934;
+	goto yy311;
+yy825:
+	YYDEBUG(825, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'X') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'Y') goto yy931;
-		if (yych == 'y') goto yy931;
+		if (yych <= 'Y') goto yy935;
+		if (yych == 'y') goto yy935;
 		goto yy18;
 	}
-yy824:
-	YYDEBUG(824, *YYCURSOR);
+yy826:
+	YYDEBUG(826, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -17348,151 +17386,151 @@ yy824:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'Y') goto yy931;
-			if (yych == '_') goto yy282;
+			if (yych <= 'Y') goto yy935;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'y') goto yy932;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'y') goto yy936;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy825:
-	YYDEBUG(825, *YYCURSOR);
+yy827:
+	YYDEBUG(827, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy933;
-	if (yych == 'a') goto yy933;
+	if (yych == 'A') goto yy937;
+	if (yych == 'a') goto yy937;
 	goto yy56;
-yy826:
-	YYDEBUG(826, *YYCURSOR);
+yy828:
+	YYDEBUG(828, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
-		if (yych == 'O') goto yy934;
+		if (yych == 'O') goto yy938;
 		if (yych <= 'Q') goto yy56;
-		goto yy935;
+		goto yy939;
 	} else {
 		if (yych <= 'o') {
 			if (yych <= 'n') goto yy56;
-			goto yy934;
+			goto yy938;
 		} else {
-			if (yych == 'r') goto yy935;
+			if (yych == 'r') goto yy939;
 			goto yy56;
 		}
 	}
-yy827:
-	YYDEBUG(827, *YYCURSOR);
+yy829:
+	YYDEBUG(829, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy936;
-	if (yych == 'o') goto yy936;
+	if (yych == 'O') goto yy940;
+	if (yych == 'o') goto yy940;
 	goto yy56;
-yy828:
-	YYDEBUG(828, *YYCURSOR);
+yy830:
+	YYDEBUG(830, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= 'N') {
-			if (yych == 'I') goto yy937;
+			if (yych == 'I') goto yy941;
 			goto yy56;
 		} else {
-			if (yych <= 'O') goto yy938;
+			if (yych <= 'O') goto yy942;
 			if (yych <= 'R') goto yy56;
-			goto yy939;
+			goto yy943;
 		}
 	} else {
 		if (yych <= 'n') {
-			if (yych == 'i') goto yy937;
+			if (yych == 'i') goto yy941;
 			goto yy56;
 		} else {
-			if (yych <= 'o') goto yy938;
-			if (yych == 's') goto yy939;
+			if (yych <= 'o') goto yy942;
+			if (yych == 's') goto yy943;
 			goto yy56;
 		}
 	}
-yy829:
-	YYDEBUG(829, *YYCURSOR);
+yy831:
+	YYDEBUG(831, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= 'D') {
-			if (yych == 'A') goto yy941;
+			if (yych == 'A') goto yy945;
 			goto yy56;
 		} else {
-			if (yych <= 'E') goto yy942;
+			if (yych <= 'E') goto yy946;
 			if (yych <= 'T') goto yy56;
-			goto yy943;
+			goto yy947;
 		}
 	} else {
 		if (yych <= 'd') {
-			if (yych == 'a') goto yy941;
+			if (yych == 'a') goto yy945;
 			goto yy56;
 		} else {
-			if (yych <= 'e') goto yy942;
-			if (yych == 'u') goto yy943;
+			if (yych <= 'e') goto yy946;
+			if (yych == 'u') goto yy947;
 			goto yy56;
 		}
 	}
-yy830:
-	YYDEBUG(830, *YYCURSOR);
+yy832:
+	YYDEBUG(832, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
-		if (yych == 'H') goto yy944;
+		if (yych == 'H') goto yy948;
 		if (yych <= 'T') goto yy56;
-		goto yy945;
+		goto yy949;
 	} else {
 		if (yych <= 'h') {
 			if (yych <= 'g') goto yy56;
-			goto yy944;
+			goto yy948;
 		} else {
-			if (yych == 'u') goto yy945;
+			if (yych == 'u') goto yy949;
 			goto yy56;
 		}
 	}
-yy831:
-	YYDEBUG(831, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy946;
-	if (yych == 's') goto yy946;
-	goto yy56;
-yy832:
-	YYDEBUG(832, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy947;
-	if (yych == 'e') goto yy947;
-	goto yy56;
 yy833:
 	YYDEBUG(833, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy948;
-	if (yych == 'e') goto yy948;
+	if (yych == 'S') goto yy950;
+	if (yych == 's') goto yy950;
 	goto yy56;
 yy834:
 	YYDEBUG(834, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 0xB5) goto yy949;
+	if (yych == 'E') goto yy951;
+	if (yych == 'e') goto yy951;
 	goto yy56;
 yy835:
 	YYDEBUG(835, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy950;
-	if (yych == 'a') goto yy950;
+	if (yych == 'E') goto yy952;
+	if (yych == 'e') goto yy952;
 	goto yy56;
 yy836:
 	YYDEBUG(836, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 0xB5) goto yy953;
+	goto yy56;
+yy837:
+	YYDEBUG(837, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'A') goto yy954;
+	if (yych == 'a') goto yy954;
+	goto yy56;
+yy838:
+	YYDEBUG(838, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'H') goto yy951;
-		if (yych == 'h') goto yy951;
+		if (yych <= 'H') goto yy955;
+		if (yych == 'h') goto yy955;
 		goto yy18;
 	}
-yy837:
-	YYDEBUG(837, *YYCURSOR);
+yy839:
+	YYDEBUG(839, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -17501,33 +17539,33 @@ yy837:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'H') goto yy951;
-			if (yych == '_') goto yy282;
+			if (yych <= 'H') goto yy955;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'h') goto yy952;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'h') goto yy956;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy838:
-	YYDEBUG(838, *YYCURSOR);
+yy840:
+	YYDEBUG(840, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'Q') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'R') goto yy931;
-		if (yych == 'r') goto yy931;
+		if (yych <= 'R') goto yy935;
+		if (yych == 'r') goto yy935;
 		goto yy18;
 	}
-yy839:
-	YYDEBUG(839, *YYCURSOR);
+yy841:
+	YYDEBUG(841, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -17536,34 +17574,34 @@ yy839:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'R') goto yy931;
-			if (yych == '_') goto yy282;
+			if (yych <= 'R') goto yy935;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'r') goto yy932;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'r') goto yy936;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy840:
-	YYDEBUG(840, *YYCURSOR);
+yy842:
+	YYDEBUG(842, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'U') goto yy953;
-		if (yych == 'u') goto yy953;
+		if (yych <= 'U') goto yy957;
+		if (yych == 'u') goto yy957;
 		goto yy18;
 	}
-yy841:
-	YYDEBUG(841, *YYCURSOR);
+yy843:
+	YYDEBUG(843, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
@@ -17572,58 +17610,58 @@ yy841:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'U') goto yy953;
-			if (yych == '_') goto yy282;
+			if (yych <= 'U') goto yy957;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'u') goto yy954;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'u') goto yy958;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy842:
-	YYDEBUG(842, *YYCURSOR);
+yy844:
+	YYDEBUG(844, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'A') goto yy955;
-		if (yych == 'a') goto yy955;
+		if (yych <= 'A') goto yy959;
+		if (yych == 'a') goto yy959;
 		goto yy18;
 	}
-yy843:
-	YYDEBUG(843, *YYCURSOR);
+yy845:
+	YYDEBUG(845, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'B') goto yy956;
-		if (yych == 'b') goto yy956;
+		if (yych <= 'B') goto yy960;
+		if (yych == 'b') goto yy960;
 		goto yy18;
 	}
-yy844:
-	YYDEBUG(844, *YYCURSOR);
+yy846:
+	YYDEBUG(846, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'H') goto yy957;
-		if (yych == 'h') goto yy957;
+		if (yych <= 'H') goto yy961;
+		if (yych == 'h') goto yy961;
 		goto yy18;
 	}
-yy845:
-	YYDEBUG(845, *YYCURSOR);
+yy847:
+	YYDEBUG(847, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -17632,23 +17670,23 @@ yy845:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy955;
+			if (yych <= 'A') goto yy959;
 			if (yych <= '^') goto yy18;
-			goto yy282;
+			goto yy283;
 		} else {
 			if (yych <= '`') goto yy18;
-			if (yych <= 'a') goto yy958;
-			if (yych <= 'z') goto yy917;
+			if (yych <= 'a') goto yy962;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy846:
-	YYDEBUG(846, *YYCURSOR);
+yy848:
+	YYDEBUG(848, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
@@ -17657,22 +17695,22 @@ yy846:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'B') goto yy956;
-			if (yych == '_') goto yy282;
+			if (yych <= 'B') goto yy960;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'b') goto yy959;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'b') goto yy963;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy847:
-	YYDEBUG(847, *YYCURSOR);
+yy849:
+	YYDEBUG(849, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -17681,56 +17719,56 @@ yy847:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'H') goto yy957;
-			if (yych == '_') goto yy282;
+			if (yych <= 'H') goto yy961;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'h') goto yy960;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'h') goto yy964;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy848:
-	YYDEBUG(848, *YYCURSOR);
+yy850:
+	YYDEBUG(850, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy961;
+	if (yych <= '9') goto yy965;
 	goto yy56;
-yy849:
-	YYDEBUG(849, *YYCURSOR);
+yy851:
+	YYDEBUG(851, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '0') goto yy961;
+	if (yych == '0') goto yy965;
 	goto yy56;
-yy850:
-	YYDEBUG(850, *YYCURSOR);
+yy852:
+	YYDEBUG(852, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'O') goto yy962;
-		if (yych == 'o') goto yy962;
+		if (yych <= 'O') goto yy966;
+		if (yych == 'o') goto yy966;
 		goto yy18;
 	}
-yy851:
-	YYDEBUG(851, *YYCURSOR);
+yy853:
+	YYDEBUG(853, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'X') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'Y') goto yy963;
-		if (yych == 'y') goto yy963;
+		if (yych <= 'Y') goto yy967;
+		if (yych == 'y') goto yy967;
 		goto yy18;
 	}
-yy852:
-	YYDEBUG(852, *YYCURSOR);
+yy854:
+	YYDEBUG(854, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
@@ -17739,22 +17777,22 @@ yy852:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'O') goto yy962;
-			if (yych == '_') goto yy282;
+			if (yych <= 'O') goto yy966;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'o') goto yy964;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'o') goto yy968;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy853:
-	YYDEBUG(853, *YYCURSOR);
+yy855:
+	YYDEBUG(855, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -17763,45 +17801,45 @@ yy853:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'Y') goto yy963;
-			if (yych == '_') goto yy282;
+			if (yych <= 'Y') goto yy967;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'y') goto yy965;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'y') goto yy969;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy854:
-	YYDEBUG(854, *YYCURSOR);
+yy856:
+	YYDEBUG(856, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'D') goto yy966;
-		if (yych == 'd') goto yy966;
+		if (yych <= 'D') goto yy970;
+		if (yych == 'd') goto yy970;
 		goto yy18;
 	}
-yy855:
-	YYDEBUG(855, *YYCURSOR);
+yy857:
+	YYDEBUG(857, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'X') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'Y') goto yy967;
-		if (yych == 'y') goto yy967;
+		if (yych <= 'Y') goto yy971;
+		if (yych == 'y') goto yy971;
 		goto yy18;
 	}
-yy856:
-	YYDEBUG(856, *YYCURSOR);
+yy858:
+	YYDEBUG(858, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -17810,22 +17848,22 @@ yy856:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'D') goto yy966;
-			if (yych == '_') goto yy282;
+			if (yych <= 'D') goto yy970;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'd') goto yy968;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'd') goto yy972;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy857:
-	YYDEBUG(857, *YYCURSOR);
+yy859:
+	YYDEBUG(859, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -17834,34 +17872,34 @@ yy857:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'Y') goto yy967;
-			if (yych == '_') goto yy282;
+			if (yych <= 'Y') goto yy971;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'y') goto yy969;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'y') goto yy973;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy858:
-	YYDEBUG(858, *YYCURSOR);
+yy860:
+	YYDEBUG(860, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
 		if (yych == ')') goto yy108;
 		goto yy18;
 	} else {
-		if (yych <= 'D') goto yy970;
-		if (yych == 'd') goto yy970;
+		if (yych <= 'D') goto yy974;
+		if (yych == 'd') goto yy974;
 		goto yy18;
 	}
-yy859:
-	YYDEBUG(859, *YYCURSOR);
+yy861:
+	YYDEBUG(861, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -17870,245 +17908,259 @@ yy859:
 			goto yy18;
 		} else {
 			if (yych == '.') goto yy18;
-			if (yych <= '/') goto yy282;
+			if (yych <= '/') goto yy283;
 			goto yy18;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'D') goto yy970;
-			if (yych == '_') goto yy282;
+			if (yych <= 'D') goto yy974;
+			if (yych == '_') goto yy283;
 			goto yy18;
 		} else {
-			if (yych == 'd') goto yy971;
-			if (yych <= 'z') goto yy917;
+			if (yych == 'd') goto yy975;
+			if (yych <= 'z') goto yy921;
 			goto yy18;
 		}
 	}
-yy860:
-	YYDEBUG(860, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy972;
-	goto yy56;
-yy861:
-	YYDEBUG(861, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy972;
-	goto yy56;
 yy862:
 	YYDEBUG(862, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy973;
+	if (yych <= '9') goto yy976;
 	goto yy56;
 yy863:
 	YYDEBUG(863, *YYCURSOR);
-	++YYCURSOR;
-	goto yy547;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '2') goto yy976;
+	goto yy56;
 yy864:
 	YYDEBUG(864, *YYCURSOR);
-	++YYCURSOR;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '0') goto yy977;
+	if (yych <= '1') goto yy978;
+	goto yy56;
+yy865:
+	YYDEBUG(865, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy979;
+	goto yy186;
+yy866:
+	YYDEBUG(866, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy980;
+	goto yy56;
+yy867:
+	YYDEBUG(867, *YYCURSOR);
+	++YYCURSOR;
+	goto yy548;
+yy868:
+	YYDEBUG(868, *YYCURSOR);
+	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	YYDEBUG(865, *YYCURSOR);
+	YYDEBUG(869, *YYCURSOR);
 	if (yych <= '/') goto yy209;
-	if (yych <= '9') goto yy864;
+	if (yych <= '9') goto yy868;
 	goto yy209;
-yy866:
-	YYDEBUG(866, *YYCURSOR);
+yy870:
+	YYDEBUG(870, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy214;
-	if (yych <= '9') goto yy975;
+	if (yych <= '9') goto yy982;
 	goto yy214;
-yy867:
-	YYDEBUG(867, *YYCURSOR);
+yy871:
+	YYDEBUG(871, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy976;
+	if (yych <= '9') goto yy983;
 	goto yy56;
-yy868:
-	YYDEBUG(868, *YYCURSOR);
-	yyaccept = 16;
+yy872:
+	YYDEBUG(872, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy547;
-		if (yych <= '9') goto yy977;
-		if (yych <= 'm') goto yy547;
-		goto yy716;
+		if (yych <= '/') goto yy548;
+		if (yych <= '9') goto yy984;
+		if (yych <= 'm') goto yy548;
+		goto yy718;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy547;
-			goto yy716;
+			if (yych <= 'q') goto yy548;
+			goto yy718;
 		} else {
-			if (yych <= 's') goto yy717;
-			if (yych <= 't') goto yy718;
-			goto yy547;
+			if (yych <= 's') goto yy719;
+			if (yych <= 't') goto yy720;
+			goto yy548;
 		}
 	}
-yy869:
-	YYDEBUG(869, *YYCURSOR);
-	yyaccept = 16;
+yy873:
+	YYDEBUG(873, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
 		if (yych <= '1') {
-			if (yych <= '/') goto yy547;
-			goto yy977;
+			if (yych <= '/') goto yy548;
+			goto yy984;
 		} else {
-			if (yych <= '9') goto yy712;
-			if (yych <= 'm') goto yy547;
-			goto yy716;
+			if (yych <= '9') goto yy714;
+			if (yych <= 'm') goto yy548;
+			goto yy718;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy547;
-			goto yy716;
+			if (yych <= 'q') goto yy548;
+			goto yy718;
 		} else {
-			if (yych <= 's') goto yy717;
-			if (yych <= 't') goto yy718;
-			goto yy547;
+			if (yych <= 's') goto yy719;
+			if (yych <= 't') goto yy720;
+			goto yy548;
 		}
 	}
-yy870:
-	YYDEBUG(870, *YYCURSOR);
+yy874:
+	YYDEBUG(874, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy979;
-	if (yych <= '3') goto yy980;
-	if (yych <= '9') goto yy981;
+	if (yych <= '2') goto yy986;
+	if (yych <= '3') goto yy987;
+	if (yych <= '9') goto yy988;
 	goto yy56;
-yy871:
-	YYDEBUG(871, *YYCURSOR);
-	yyaccept = 19;
+yy875:
+	YYDEBUG(875, *YYCURSOR);
+	yyaccept = 18;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy982;
-	goto yy727;
-yy872:
-	YYDEBUG(872, *YYCURSOR);
+	if (yych == '-') goto yy989;
+	goto yy729;
+yy876:
+	YYDEBUG(876, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy983;
-	if (yych == 'r') goto yy983;
+	if (yych == 'R') goto yy990;
+	if (yych == 'r') goto yy990;
 	goto yy56;
-yy873:
-	YYDEBUG(873, *YYCURSOR);
+yy877:
+	YYDEBUG(877, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy984;
-	if (yych == 'g') goto yy984;
+	if (yych == 'G') goto yy991;
+	if (yych == 'g') goto yy991;
 	goto yy56;
-yy874:
-	YYDEBUG(874, *YYCURSOR);
+yy878:
+	YYDEBUG(878, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy985;
-	if (yych == 'c') goto yy985;
+	if (yych == 'C') goto yy992;
+	if (yych == 'c') goto yy992;
 	goto yy56;
-yy875:
-	YYDEBUG(875, *YYCURSOR);
+yy879:
+	YYDEBUG(879, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy986;
-	if (yych == 'b') goto yy986;
+	if (yych == 'B') goto yy993;
+	if (yych == 'b') goto yy993;
 	goto yy56;
-yy876:
-	YYDEBUG(876, *YYCURSOR);
+yy880:
+	YYDEBUG(880, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy987;
-	if (yych == 'n') goto yy987;
+	if (yych == 'N') goto yy994;
+	if (yych == 'n') goto yy994;
 	goto yy56;
-yy877:
-	YYDEBUG(877, *YYCURSOR);
+yy881:
+	YYDEBUG(881, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'L') goto yy988;
+		if (yych == 'L') goto yy995;
 		if (yych <= 'M') goto yy56;
-		goto yy989;
+		goto yy996;
 	} else {
 		if (yych <= 'l') {
 			if (yych <= 'k') goto yy56;
-			goto yy988;
+			goto yy995;
 		} else {
-			if (yych == 'n') goto yy989;
+			if (yych == 'n') goto yy996;
 			goto yy56;
 		}
 	}
-yy878:
-	YYDEBUG(878, *YYCURSOR);
+yy882:
+	YYDEBUG(882, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
-		if (yych == 'R') goto yy990;
+		if (yych == 'R') goto yy997;
 		if (yych <= 'X') goto yy56;
-		goto yy991;
+		goto yy998;
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'q') goto yy56;
-			goto yy990;
+			goto yy997;
 		} else {
-			if (yych == 'y') goto yy991;
+			if (yych == 'y') goto yy998;
 			goto yy56;
 		}
 	}
-yy879:
-	YYDEBUG(879, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'V') goto yy985;
-	if (yych == 'v') goto yy985;
-	goto yy56;
-yy880:
-	YYDEBUG(880, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy992;
-	if (yych == 't') goto yy992;
-	goto yy56;
-yy881:
-	YYDEBUG(881, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy993;
-	if (yych == 'p') goto yy993;
-	goto yy56;
-yy882:
-	YYDEBUG(882, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '0') goto yy56;
-	if (yych <= '9') goto yy994;
-	goto yy56;
 yy883:
 	YYDEBUG(883, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy994;
+	if (yych == 'V') goto yy992;
+	if (yych == 'v') goto yy992;
 	goto yy56;
 yy884:
 	YYDEBUG(884, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '6') goto yy994;
+	if (yych == 'T') goto yy999;
+	if (yych == 't') goto yy999;
 	goto yy56;
 yy885:
 	YYDEBUG(885, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy904;
-	if (yych == 'p') goto yy904;
+	if (yych == 'P') goto yy1000;
+	if (yych == 'p') goto yy1000;
 	goto yy56;
 yy886:
 	YYDEBUG(886, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy995;
-	if (yych <= '3') goto yy997;
-	if (yych <= '9') goto yy998;
+	if (yych <= '0') goto yy56;
+	if (yych <= '9') goto yy1001;
 	goto yy56;
 yy887:
 	YYDEBUG(887, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '/') goto yy999;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy1001;
 	goto yy56;
 yy888:
 	YYDEBUG(888, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy1000;
-	goto yy186;
+	if (yych <= '/') goto yy56;
+	if (yych <= '6') goto yy1001;
+	goto yy56;
 yy889:
 	YYDEBUG(889, *YYCURSOR);
-	yyaccept = 22;
+	yych = *++YYCURSOR;
+	if (yych == 'P') goto yy908;
+	if (yych == 'p') goto yy908;
+	goto yy56;
+yy890:
+	YYDEBUG(890, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '2') goto yy1002;
+	if (yych <= '3') goto yy1004;
+	if (yych <= '9') goto yy1005;
+	goto yy56;
+yy891:
+	YYDEBUG(891, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '/') goto yy1006;
+	goto yy56;
+yy892:
+	YYDEBUG(892, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy1007;
+	goto yy186;
+yy893:
+	YYDEBUG(893, *YYCURSOR);
+	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'E') {
@@ -18117,14 +18169,14 @@ yy889:
 				if (yych >= ' ') goto yy186;
 			} else {
 				if (yych <= '9') {
-					if (yych >= '0') goto yy1000;
+					if (yych >= '0') goto yy1007;
 				} else {
 					if (yych == 'D') goto yy186;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
-				if (yych == 'G') goto yy890;
+				if (yych == 'G') goto yy894;
 				if (yych <= 'H') goto yy186;
 			} else {
 				if (yych <= 'R') {
@@ -18162,57 +18214,57 @@ yy889:
 			}
 		}
 	}
-yy890:
-	YYDEBUG(890, *YYCURSOR);
-#line 1519 "parse_date.re"
+yy894:
+	YYDEBUG(894, *YYCURSOR);
+#line 1541 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgydotd");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->d = timelib_get_nr((char **) &ptr, 3);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->d = timelib_get_nr(&ptr, 3);
 		s->time->m = 1;
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_YEARDAY;
 	}
-#line 18181 "<stdout>"
-yy891:
-	YYDEBUG(891, *YYCURSOR);
-	yyaccept = 22;
+#line 18233 "<stdout>"
+yy895:
+	YYDEBUG(895, *YYCURSOR);
+	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'D') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy186;
-				if (yych <= 0x1F) goto yy890;
+				if (yych <= 0x1F) goto yy894;
 				goto yy186;
 			} else {
 				if (yych <= '1') {
-					if (yych <= '/') goto yy890;
-					goto yy1000;
+					if (yych <= '/') goto yy894;
+					goto yy1007;
 				} else {
-					if (yych <= '9') goto yy1002;
-					if (yych <= 'C') goto yy890;
+					if (yych <= '9') goto yy1009;
+					if (yych <= 'C') goto yy894;
 					goto yy186;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
 				if (yych <= 'F') {
-					if (yych <= 'E') goto yy890;
+					if (yych <= 'E') goto yy894;
 					goto yy186;
 				} else {
 					if (yych == 'H') goto yy186;
-					goto yy890;
+					goto yy894;
 				}
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'M') goto yy186;
-					goto yy890;
+					goto yy894;
 				} else {
-					if (yych == 'V') goto yy890;
+					if (yych == 'V') goto yy894;
 					goto yy186;
 				}
 			}
@@ -18221,67 +18273,67 @@ yy891:
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych == 'Y') goto yy186;
-				if (yych <= 'c') goto yy890;
+				if (yych <= 'c') goto yy894;
 				goto yy186;
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy890;
+					if (yych <= 'e') goto yy894;
 					goto yy186;
 				} else {
 					if (yych == 'h') goto yy186;
-					goto yy890;
+					goto yy894;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy186;
-					goto yy890;
+					goto yy894;
 				} else {
-					if (yych == 'v') goto yy890;
+					if (yych == 'v') goto yy894;
 					goto yy186;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy890;
+					if (yych <= 'x') goto yy894;
 					goto yy186;
 				} else {
 					if (yych == 0xC2) goto yy186;
-					goto yy890;
+					goto yy894;
 				}
 			}
 		}
 	}
-yy892:
-	YYDEBUG(892, *YYCURSOR);
-	yyaccept = 22;
+yy896:
+	YYDEBUG(896, *YYCURSOR);
+	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'E') {
 			if (yych <= ' ') {
 				if (yych == '\t') goto yy186;
-				if (yych <= 0x1F) goto yy890;
+				if (yych <= 0x1F) goto yy894;
 				goto yy186;
 			} else {
 				if (yych <= '9') {
-					if (yych <= '/') goto yy890;
-					goto yy1002;
+					if (yych <= '/') goto yy894;
+					goto yy1009;
 				} else {
 					if (yych == 'D') goto yy186;
-					goto yy890;
+					goto yy894;
 				}
 			}
 		} else {
 			if (yych <= 'L') {
-				if (yych == 'G') goto yy890;
+				if (yych == 'G') goto yy894;
 				if (yych <= 'H') goto yy186;
-				goto yy890;
+				goto yy894;
 			} else {
 				if (yych <= 'R') {
 					if (yych <= 'M') goto yy186;
-					goto yy890;
+					goto yy894;
 				} else {
-					if (yych == 'V') goto yy890;
+					if (yych == 'V') goto yy894;
 					goto yy186;
 				}
 			}
@@ -18290,125 +18342,125 @@ yy892:
 		if (yych <= 'l') {
 			if (yych <= 'd') {
 				if (yych == 'Y') goto yy186;
-				if (yych <= 'c') goto yy890;
+				if (yych <= 'c') goto yy894;
 				goto yy186;
 			} else {
 				if (yych <= 'f') {
-					if (yych <= 'e') goto yy890;
+					if (yych <= 'e') goto yy894;
 					goto yy186;
 				} else {
 					if (yych == 'h') goto yy186;
-					goto yy890;
+					goto yy894;
 				}
 			}
 		} else {
 			if (yych <= 'w') {
 				if (yych <= 'r') {
 					if (yych <= 'm') goto yy186;
-					goto yy890;
+					goto yy894;
 				} else {
-					if (yych == 'v') goto yy890;
+					if (yych == 'v') goto yy894;
 					goto yy186;
 				}
 			} else {
 				if (yych <= 'y') {
-					if (yych <= 'x') goto yy890;
+					if (yych <= 'x') goto yy894;
 					goto yy186;
 				} else {
 					if (yych == 0xC2) goto yy186;
-					goto yy890;
+					goto yy894;
 				}
 			}
 		}
 	}
-yy893:
-	YYDEBUG(893, *YYCURSOR);
+yy897:
+	YYDEBUG(897, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy1002;
+	if (yych <= '9') goto yy1009;
 	goto yy186;
-yy894:
-	YYDEBUG(894, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == ':') goto yy1003;
-	goto yy56;
-yy895:
-	YYDEBUG(895, *YYCURSOR);
-	yyaccept = 23;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy1004;
-	if (yych == 'i') goto yy1004;
-	goto yy580;
-yy896:
-	YYDEBUG(896, *YYCURSOR);
-	yyaccept = 23;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy1005;
-	if (yych == 'u') goto yy1005;
-	goto yy580;
-yy897:
-	YYDEBUG(897, *YYCURSOR);
-	yyaccept = 23;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy1006;
-	if (yych == 'e') goto yy1006;
-	goto yy580;
 yy898:
 	YYDEBUG(898, *YYCURSOR);
-	yyaccept = 23;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy1007;
-	if (yych == 'r') goto yy1007;
-	goto yy580;
+	yych = *++YYCURSOR;
+	if (yych == ':') goto yy1010;
+	goto yy56;
 yy899:
 	YYDEBUG(899, *YYCURSOR);
-	yyaccept = 23;
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy1008;
-	if (yych == 'u') goto yy1008;
-	goto yy580;
+	if (yych == 'I') goto yy1011;
+	if (yych == 'i') goto yy1011;
+	goto yy581;
 yy900:
 	YYDEBUG(900, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy763;
-	if (yych == 'y') goto yy763;
-	goto yy580;
+	yyaccept = 22;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == 'U') goto yy1012;
+	if (yych == 'u') goto yy1012;
+	goto yy581;
 yy901:
 	YYDEBUG(901, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy763;
-	if (yych == 'e') goto yy763;
-	goto yy580;
+	yyaccept = 22;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == 'E') goto yy1013;
+	if (yych == 'e') goto yy1013;
+	goto yy581;
 yy902:
 	YYDEBUG(902, *YYCURSOR);
-	yyaccept = 23;
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy1009;
-	if (yych == 'c') goto yy1009;
-	goto yy580;
+	if (yych == 'R') goto yy1014;
+	if (yych == 'r') goto yy1014;
+	goto yy581;
 yy903:
 	YYDEBUG(903, *YYCURSOR);
-	yyaccept = 23;
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy1010;
-	if (yych == 'o') goto yy1010;
-	goto yy580;
+	if (yych == 'U') goto yy1015;
+	if (yych == 'u') goto yy1015;
+	goto yy581;
 yy904:
 	YYDEBUG(904, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy897;
-	if (yych == 't') goto yy897;
-	goto yy580;
+	if (yych == 'Y') goto yy765;
+	if (yych == 'y') goto yy765;
+	goto yy581;
 yy905:
 	YYDEBUG(905, *YYCURSOR);
-	yyaccept = 24;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy1011;
-	if (yych <= '/') goto yy906;
-	if (yych <= '7') goto yy1012;
+	yych = *++YYCURSOR;
+	if (yych == 'E') goto yy765;
+	if (yych == 'e') goto yy765;
+	goto yy581;
 yy906:
 	YYDEBUG(906, *YYCURSOR);
-#line 1552 "parse_date.re"
+	yyaccept = 22;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == 'C') goto yy1016;
+	if (yych == 'c') goto yy1016;
+	goto yy581;
+yy907:
+	YYDEBUG(907, *YYCURSOR);
+	yyaccept = 22;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == 'O') goto yy1017;
+	if (yych == 'o') goto yy1017;
+	goto yy581;
+yy908:
+	YYDEBUG(908, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'T') goto yy901;
+	if (yych == 't') goto yy901;
+	goto yy581;
+yy909:
+	YYDEBUG(909, *YYCURSOR);
+	yyaccept = 23;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == '-') goto yy1018;
+	if (yych <= '/') goto yy910;
+	if (yych <= '7') goto yy1019;
+yy910:
+	YYDEBUG(910, *YYCURSOR);
+#line 1574 "parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweek");
@@ -18416,8 +18468,8 @@ yy906:
 		TIMELIB_HAVE_DATE();
 		TIMELIB_HAVE_RELATIVE();
 
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
-		w = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr(&ptr, 4);
+		w = timelib_get_nr(&ptr, 2);
 		d = 1;
 		s->time->m = 1;
 		s->time->d = 1;
@@ -18426,44 +18478,44 @@ yy906:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 18430 "<stdout>"
-yy907:
-	YYDEBUG(907, *YYCURSOR);
+#line 18482 "<stdout>"
+yy911:
+	YYDEBUG(911, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy1014;
-	if (yych == 'g') goto yy1014;
+	if (yych == 'G') goto yy1021;
+	if (yych == 'g') goto yy1021;
 	goto yy56;
-yy908:
-	YYDEBUG(908, *YYCURSOR);
+yy912:
+	YYDEBUG(912, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych == 'Y') goto yy243;
 	if (yych == 'y') goto yy243;
 	goto yy56;
-yy909:
-	YYDEBUG(909, *YYCURSOR);
+yy913:
+	YYDEBUG(913, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1015;
-	if (yych == 'e') goto yy1015;
+	if (yych == 'E') goto yy1022;
+	if (yych == 'e') goto yy1022;
 	goto yy56;
-yy910:
-	YYDEBUG(910, *YYCURSOR);
+yy914:
+	YYDEBUG(914, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych == 'R') goto yy243;
 	if (yych == 'r') goto yy243;
 	goto yy56;
-yy911:
-	YYDEBUG(911, *YYCURSOR);
-	yyaccept = 5;
+yy915:
+	YYDEBUG(915, *YYCURSOR);
+	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ':') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy619;
+			if (yych == '\t') goto yy620;
 			if (yych <= 0x1F) goto yy209;
-			goto yy619;
+			goto yy620;
 		} else {
-			if (yych == '.') goto yy1016;
+			if (yych == '.') goto yy1023;
 			if (yych <= '9') goto yy209;
-			goto yy1017;
+			goto yy1024;
 		}
 	} else {
 		if (yych <= 'P') {
@@ -18480,281 +18532,281 @@ yy911:
 			}
 		}
 	}
-yy912:
-	YYDEBUG(912, *YYCURSOR);
-	yyaccept = 16;
+yy916:
+	YYDEBUG(916, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy547;
-		if (yych <= '9') goto yy1018;
-		if (yych <= 'm') goto yy547;
-		goto yy716;
+		if (yych <= '/') goto yy548;
+		if (yych <= '9') goto yy1025;
+		if (yych <= 'm') goto yy548;
+		goto yy718;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy547;
-			goto yy716;
+			if (yych <= 'q') goto yy548;
+			goto yy718;
 		} else {
-			if (yych <= 's') goto yy717;
-			if (yych <= 't') goto yy718;
-			goto yy547;
+			if (yych <= 's') goto yy719;
+			if (yych <= 't') goto yy720;
+			goto yy548;
 		}
 	}
-yy913:
-	YYDEBUG(913, *YYCURSOR);
-	yyaccept = 16;
+yy917:
+	YYDEBUG(917, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy547;
-		if (yych <= '1') goto yy1018;
-		if (yych <= 'm') goto yy547;
-		goto yy716;
+		if (yych <= '/') goto yy548;
+		if (yych <= '1') goto yy1025;
+		if (yych <= 'm') goto yy548;
+		goto yy718;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy547;
-			goto yy716;
+			if (yych <= 'q') goto yy548;
+			goto yy718;
 		} else {
-			if (yych <= 's') goto yy717;
-			if (yych <= 't') goto yy718;
-			goto yy547;
+			if (yych <= 's') goto yy719;
+			if (yych <= 't') goto yy720;
+			goto yy548;
 		}
 	}
-yy914:
-	YYDEBUG(914, *YYCURSOR);
+yy918:
+	YYDEBUG(918, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy1019;
-	if (yych <= '3') goto yy1020;
+	if (yych <= '2') goto yy1026;
+	if (yych <= '3') goto yy1027;
 	goto yy56;
-yy915:
-	YYDEBUG(915, *YYCURSOR);
+yy919:
+	YYDEBUG(919, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1021;
-	goto yy56;
-yy916:
-	YYDEBUG(916, *YYCURSOR);
+	if (yych <= '/') goto yy276;
+	if (yych <= '9') goto yy1028;
+	goto yy276;
+yy920:
+	YYDEBUG(920, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1022;
+	if (yych <= '9') goto yy1029;
 	goto yy56;
-yy917:
-	YYDEBUG(917, *YYCURSOR);
+yy921:
+	YYDEBUG(921, *YYCURSOR);
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy918:
-	YYDEBUG(918, *YYCURSOR);
+yy922:
+	YYDEBUG(922, *YYCURSOR);
 	if (yybm[0+yych] & 128) {
-		goto yy917;
+		goto yy921;
 	}
 	if (yych <= '.') {
-		if (yych == '-') goto yy282;
+		if (yych == '-') goto yy283;
 		goto yy56;
 	} else {
-		if (yych <= '/') goto yy282;
-		if (yych == '_') goto yy282;
+		if (yych <= '/') goto yy283;
+		if (yych == '_') goto yy283;
 		goto yy56;
 	}
-yy919:
-	YYDEBUG(919, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == ' ') goto yy1024;
-	goto yy56;
-yy920:
-	YYDEBUG(920, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy931;
-	if (yych == 'r') goto yy931;
-	goto yy56;
-yy921:
-	YYDEBUG(921, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy931;
-	if (yych == 'r') goto yy932;
-	goto yy918;
-yy922:
-	YYDEBUG(922, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1025;
-	if (yych == 'e') goto yy1025;
-	goto yy56;
 yy923:
 	YYDEBUG(923, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy957;
-	if (yych == 'h') goto yy957;
+	if (yych == ' ') goto yy1031;
 	goto yy56;
 yy924:
 	YYDEBUG(924, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy957;
-	if (yych == 'h') goto yy960;
-	goto yy918;
+	if (yych == 'R') goto yy935;
+	if (yych == 'r') goto yy935;
+	goto yy56;
 yy925:
 	YYDEBUG(925, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy931;
-	if (yych == 'y') goto yy931;
-	goto yy56;
+	if (yych == 'R') goto yy935;
+	if (yych == 'r') goto yy936;
+	goto yy922;
 yy926:
 	YYDEBUG(926, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy931;
-	if (yych == 'y') goto yy932;
-	goto yy918;
+	if (yych == 'E') goto yy1032;
+	if (yych == 'e') goto yy1032;
+	goto yy56;
 yy927:
 	YYDEBUG(927, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1026;
-	if (yych <= '6') goto yy1027;
-	if (yych <= '9') goto yy1028;
+	if (yych == 'H') goto yy961;
+	if (yych == 'h') goto yy961;
 	goto yy56;
 yy928:
 	YYDEBUG(928, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1029;
-	if (yych <= '6') goto yy1030;
-	if (yych <= '9') goto yy1028;
-	goto yy56;
+	if (yych == 'H') goto yy961;
+	if (yych == 'h') goto yy964;
+	goto yy922;
 yy929:
 	YYDEBUG(929, *YYCURSOR);
-	yyaccept = 21;
+	yych = *++YYCURSOR;
+	if (yych == 'Y') goto yy935;
+	if (yych == 'y') goto yy935;
+	goto yy56;
+yy930:
+	YYDEBUG(930, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'Y') goto yy935;
+	if (yych == 'y') goto yy936;
+	goto yy922;
+yy931:
+	YYDEBUG(931, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '5') goto yy1033;
+	if (yych <= '6') goto yy1034;
+	if (yych <= '9') goto yy1035;
+	goto yy56;
+yy932:
+	YYDEBUG(932, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '5') goto yy1036;
+	if (yych <= '6') goto yy1037;
+	if (yych <= '9') goto yy1035;
+	goto yy56;
+yy933:
+	YYDEBUG(933, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ':') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy1031;
-			if (yych <= 0x1F) goto yy818;
-			goto yy1031;
+			if (yych == '\t') goto yy1038;
+			if (yych <= 0x1F) goto yy820;
+			goto yy1038;
 		} else {
-			if (yych == '.') goto yy928;
-			if (yych <= '9') goto yy818;
-			goto yy928;
+			if (yych == '.') goto yy932;
+			if (yych <= '9') goto yy820;
+			goto yy932;
 		}
 	} else {
 		if (yych <= 'P') {
-			if (yych == 'A') goto yy1033;
-			if (yych <= 'O') goto yy818;
-			goto yy1033;
+			if (yych == 'A') goto yy1040;
+			if (yych <= 'O') goto yy820;
+			goto yy1040;
 		} else {
 			if (yych <= 'a') {
-				if (yych <= '`') goto yy818;
-				goto yy1033;
+				if (yych <= '`') goto yy820;
+				goto yy1040;
 			} else {
-				if (yych == 'p') goto yy1033;
-				goto yy818;
+				if (yych == 'p') goto yy1040;
+				goto yy820;
 			}
 		}
 	}
-yy930:
-	YYDEBUG(930, *YYCURSOR);
+yy934:
+	YYDEBUG(934, *YYCURSOR);
 	++YYCURSOR;
-	goto yy310;
-yy931:
-	YYDEBUG(931, *YYCURSOR);
-	yyaccept = 8;
+	goto yy311;
+yy935:
+	YYDEBUG(935, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
 		if (yych == '\t') goto yy135;
-		if (yych <= 0x1F) goto yy280;
+		if (yych <= 0x1F) goto yy281;
 		goto yy135;
 	} else {
 		if (yych <= '.') {
-			if (yych <= ',') goto yy280;
+			if (yych <= ',') goto yy281;
 			goto yy135;
 		} else {
-			if (yych <= '/') goto yy280;
+			if (yych <= '/') goto yy281;
 			if (yych <= '9') goto yy135;
-			goto yy280;
+			goto yy281;
 		}
 	}
-yy932:
-	YYDEBUG(932, *YYCURSOR);
-	yyaccept = 8;
+yy936:
+	YYDEBUG(936, *YYCURSOR);
+	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 128) {
-		goto yy917;
+		goto yy921;
 	}
 	if (yych <= '-') {
 		if (yych <= 0x1F) {
 			if (yych == '\t') goto yy135;
-			goto yy280;
+			goto yy281;
 		} else {
 			if (yych <= ' ') goto yy135;
-			if (yych <= ',') goto yy280;
-			goto yy679;
+			if (yych <= ',') goto yy281;
+			goto yy680;
 		}
 	} else {
 		if (yych <= '9') {
-			if (yych == '/') goto yy282;
+			if (yych == '/') goto yy283;
 			goto yy135;
 		} else {
-			if (yych == '_') goto yy282;
-			goto yy280;
+			if (yych == '_') goto yy283;
+			goto yy281;
 		}
 	}
-yy933:
-	YYDEBUG(933, *YYCURSOR);
+yy937:
+	YYDEBUG(937, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1034;
-	if (yych == 'y') goto yy1034;
+	if (yych == 'Y') goto yy1041;
+	if (yych == 'y') goto yy1041;
 	goto yy56;
-yy934:
-	YYDEBUG(934, *YYCURSOR);
+yy938:
+	YYDEBUG(938, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy1035;
-	if (yych == 'r') goto yy1035;
+	if (yych == 'R') goto yy1042;
+	if (yych == 'r') goto yy1042;
 	goto yy56;
-yy935:
-	YYDEBUG(935, *YYCURSOR);
+yy939:
+	YYDEBUG(939, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy1036;
-	if (yych == 'i') goto yy1036;
+	if (yych == 'I') goto yy1043;
+	if (yych == 'i') goto yy1043;
 	goto yy56;
-yy936:
-	YYDEBUG(936, *YYCURSOR);
+yy940:
+	YYDEBUG(940, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy1037;
-	if (yych == 'u') goto yy1037;
+	if (yych == 'U') goto yy1044;
+	if (yych == 'u') goto yy1044;
 	goto yy56;
-yy937:
-	YYDEBUG(937, *YYCURSOR);
+yy941:
+	YYDEBUG(941, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= 'K') {
-			if (yych == 'C') goto yy1038;
+			if (yych == 'C') goto yy1045;
 			goto yy56;
 		} else {
-			if (yych <= 'L') goto yy1039;
+			if (yych <= 'L') goto yy1046;
 			if (yych <= 'M') goto yy56;
-			goto yy1040;
+			goto yy1047;
 		}
 	} else {
 		if (yych <= 'k') {
-			if (yych == 'c') goto yy1038;
+			if (yych == 'c') goto yy1045;
 			goto yy56;
 		} else {
-			if (yych <= 'l') goto yy1039;
-			if (yych == 'n') goto yy1040;
+			if (yych <= 'l') goto yy1046;
+			if (yych == 'n') goto yy1047;
 			goto yy56;
 		}
 	}
-yy938:
-	YYDEBUG(938, *YYCURSOR);
+yy942:
+	YYDEBUG(942, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy1041;
-	if (yych == 'n') goto yy1041;
+	if (yych == 'N') goto yy1048;
+	if (yych == 'n') goto yy1048;
 	goto yy56;
-yy939:
-	YYDEBUG(939, *YYCURSOR);
-	yyaccept = 25;
+yy943:
+	YYDEBUG(943, *YYCURSOR);
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy1042;
-	if (yych == 'e') goto yy1042;
-yy940:
-	YYDEBUG(940, *YYCURSOR);
-#line 1692 "parse_date.re"
+	if (yych == 'E') goto yy1049;
+	if (yych == 'e') goto yy1049;
+yy944:
+	YYDEBUG(944, *YYCURSOR);
+#line 1714 "parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -18763,566 +18815,585 @@ yy940:
 		TIMELIB_HAVE_RELATIVE();
 
 		while(*ptr) {
-			i = timelib_get_relative_text((char **) &ptr, &behavior);
-			timelib_eat_spaces((char **) &ptr);
-			timelib_set_relative((char **) &ptr, i, behavior, s);
+			i = timelib_get_relative_text(&ptr, &behavior);
+			timelib_eat_spaces(&ptr);
+			timelib_set_relative(&ptr, i, behavior, s);
 		}
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 18774 "<stdout>"
-yy941:
-	YYDEBUG(941, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1043;
-	if (yych == 't') goto yy1043;
-	goto yy56;
-yy942:
-	YYDEBUG(942, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1044;
-	if (yych == 'c') goto yy1044;
-	goto yy56;
-yy943:
-	YYDEBUG(943, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy1036;
-	if (yych == 'n') goto yy1036;
-	goto yy56;
-yy944:
-	YYDEBUG(944, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy1045;
-	if (yych == 'u') goto yy1045;
-	goto yy56;
+#line 18826 "<stdout>"
 yy945:
 	YYDEBUG(945, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1046;
-	if (yych == 'e') goto yy1046;
+	if (yych == 'T') goto yy1050;
+	if (yych == 't') goto yy1050;
 	goto yy56;
 yy946:
 	YYDEBUG(946, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1042;
-	if (yych == 'e') goto yy1042;
+	if (yych == 'C') goto yy1051;
+	if (yych == 'c') goto yy1051;
 	goto yy56;
 yy947:
 	YYDEBUG(947, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= 'E') {
-		if (yych <= 'C') goto yy56;
-		if (yych <= 'D') goto yy1047;
-		goto yy1048;
-	} else {
-		if (yych <= 'c') goto yy56;
-		if (yych <= 'd') goto yy1047;
-		if (yych <= 'e') goto yy1048;
-		goto yy56;
-	}
+	if (yych == 'N') goto yy1043;
+	if (yych == 'n') goto yy1043;
+	goto yy56;
 yy948:
 	YYDEBUG(948, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1037;
-	if (yych == 'a') goto yy1037;
+	if (yych == 'U') goto yy1052;
+	if (yych == 'u') goto yy1052;
 	goto yy56;
 yy949:
 	YYDEBUG(949, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy939;
-	if (yych == 's') goto yy939;
+	if (yych == 'E') goto yy1053;
+	if (yych == 'e') goto yy1053;
 	goto yy56;
 yy950:
 	YYDEBUG(950, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1049;
-	if (yych == 'y') goto yy1049;
+	if (yych == 'E') goto yy1049;
+	if (yych == 'e') goto yy1049;
 	goto yy56;
 yy951:
 	YYDEBUG(951, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1050;
-	if (yych == 't') goto yy1050;
-	goto yy56;
+	if (yych <= 'E') {
+		if (yych <= 'C') goto yy56;
+		if (yych <= 'D') goto yy1054;
+		goto yy1055;
+	} else {
+		if (yych <= 'c') goto yy56;
+		if (yych <= 'd') goto yy1054;
+		if (yych <= 'e') goto yy1055;
+		goto yy56;
+	}
 yy952:
 	YYDEBUG(952, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1050;
-	if (yych == 't') goto yy1051;
-	goto yy918;
+	if (yych == 'A') goto yy1044;
+	if (yych == 'a') goto yy1044;
+	goto yy56;
 yy953:
 	YYDEBUG(953, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1052;
-	if (yych == 's') goto yy1052;
+	if (yych == 'S') goto yy943;
+	if (yych == 's') goto yy943;
 	goto yy56;
 yy954:
 	YYDEBUG(954, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1052;
-	if (yych == 's') goto yy1053;
-	goto yy918;
+	if (yych == 'Y') goto yy1056;
+	if (yych == 'y') goto yy1056;
+	goto yy56;
 yy955:
 	YYDEBUG(955, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy963;
-	if (yych == 'y') goto yy963;
+	if (yych == 'T') goto yy1057;
+	if (yych == 't') goto yy1057;
 	goto yy56;
 yy956:
 	YYDEBUG(956, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy920;
-	if (yych == 'e') goto yy920;
-	goto yy56;
+	if (yych == 'T') goto yy1057;
+	if (yych == 't') goto yy1058;
+	goto yy922;
 yy957:
 	YYDEBUG(957, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '\t') goto yy806;
-	if (yych == ' ') goto yy806;
+	if (yych == 'S') goto yy1059;
+	if (yych == 's') goto yy1059;
 	goto yy56;
 yy958:
 	YYDEBUG(958, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy963;
-	if (yych == 'y') goto yy965;
-	goto yy918;
+	if (yych == 'S') goto yy1059;
+	if (yych == 's') goto yy1060;
+	goto yy922;
 yy959:
 	YYDEBUG(959, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy920;
-	if (yych == 'e') goto yy921;
-	goto yy918;
+	if (yych == 'Y') goto yy967;
+	if (yych == 'y') goto yy967;
+	goto yy56;
 yy960:
 	YYDEBUG(960, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '\t') goto yy806;
-	if (yych == ' ') goto yy806;
-	goto yy918;
+	if (yych == 'E') goto yy924;
+	if (yych == 'e') goto yy924;
+	goto yy56;
 yy961:
 	YYDEBUG(961, *YYCURSOR);
-	++YYCURSOR;
-	goto yy750;
+	yych = *++YYCURSOR;
+	if (yych == '\t') goto yy808;
+	if (yych == ' ') goto yy808;
+	goto yy56;
 yy962:
 	YYDEBUG(962, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'W') goto yy1054;
-	if (yych == 'w') goto yy1054;
-	goto yy56;
+	if (yych == 'Y') goto yy967;
+	if (yych == 'y') goto yy969;
+	goto yy922;
 yy963:
 	YYDEBUG(963, *YYCURSOR);
-	++YYCURSOR;
-	goto yy300;
+	yych = *++YYCURSOR;
+	if (yych == 'E') goto yy924;
+	if (yych == 'e') goto yy925;
+	goto yy922;
 yy964:
 	YYDEBUG(964, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'W') goto yy1054;
-	if (yych == 'w') goto yy1056;
-	goto yy918;
+	if (yych == '\t') goto yy808;
+	if (yych == ' ') goto yy808;
+	goto yy922;
 yy965:
 	YYDEBUG(965, *YYCURSOR);
-	yyaccept = 10;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm[0+yych] & 128) {
-		goto yy917;
-	}
-	if (yych <= '.') {
-		if (yych == '-') goto yy282;
-		goto yy300;
-	} else {
-		if (yych <= '/') goto yy282;
-		if (yych == '_') goto yy282;
-		goto yy300;
-	}
+	++YYCURSOR;
+	goto yy752;
 yy966:
 	YYDEBUG(966, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy955;
-	if (yych == 'a') goto yy955;
+	if (yych == 'W') goto yy1061;
+	if (yych == 'w') goto yy1061;
 	goto yy56;
 yy967:
 	YYDEBUG(967, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy963;
-	if (yych == 's') goto yy963;
-	goto yy300;
+	++YYCURSOR;
+	goto yy301;
 yy968:
 	YYDEBUG(968, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy955;
-	if (yych == 'a') goto yy958;
-	goto yy918;
+	if (yych == 'W') goto yy1061;
+	if (yych == 'w') goto yy1063;
+	goto yy922;
 yy969:
 	YYDEBUG(969, *YYCURSOR);
-	yyaccept = 10;
+	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'S') {
-		if (yych <= '.') {
-			if (yych == '-') goto yy282;
-			goto yy300;
-		} else {
-			if (yych <= '/') goto yy282;
-			if (yych <= 'R') goto yy300;
-			goto yy963;
-		}
+	if (yybm[0+yych] & 128) {
+		goto yy921;
+	}
+	if (yych <= '.') {
+		if (yych == '-') goto yy283;
+		goto yy301;
 	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy282;
-			goto yy300;
-		} else {
-			if (yych == 's') goto yy965;
-			if (yych <= 'z') goto yy917;
-			goto yy300;
-		}
+		if (yych <= '/') goto yy283;
+		if (yych == '_') goto yy283;
+		goto yy301;
 	}
 yy970:
 	YYDEBUG(970, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1057;
-	if (yych == 'a') goto yy1057;
+	if (yych == 'A') goto yy959;
+	if (yych == 'a') goto yy959;
 	goto yy56;
 yy971:
 	YYDEBUG(971, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1057;
-	if (yych == 'a') goto yy1058;
-	goto yy918;
+	if (yych == 'S') goto yy967;
+	if (yych == 's') goto yy967;
+	goto yy301;
 yy972:
 	YYDEBUG(972, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '-') goto yy1059;
-	goto yy56;
+	if (yych == 'A') goto yy959;
+	if (yych == 'a') goto yy962;
+	goto yy922;
 yy973:
 	YYDEBUG(973, *YYCURSOR);
-	++YYCURSOR;
+	yyaccept = 9;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= 'S') {
+		if (yych <= '.') {
+			if (yych == '-') goto yy283;
+			goto yy301;
+		} else {
+			if (yych <= '/') goto yy283;
+			if (yych <= 'R') goto yy301;
+			goto yy967;
+		}
+	} else {
+		if (yych <= '`') {
+			if (yych == '_') goto yy283;
+			goto yy301;
+		} else {
+			if (yych == 's') goto yy969;
+			if (yych <= 'z') goto yy921;
+			goto yy301;
+		}
+	}
+yy974:
 	YYDEBUG(974, *YYCURSOR);
-#line 1401 "parse_date.re"
+	yych = *++YYCURSOR;
+	if (yych == 'A') goto yy1064;
+	if (yych == 'a') goto yy1064;
+	goto yy56;
+yy975:
+	YYDEBUG(975, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'A') goto yy1064;
+	if (yych == 'a') goto yy1065;
+	goto yy922;
+yy976:
+	YYDEBUG(976, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy1066;
+	goto yy56;
+yy977:
+	YYDEBUG(977, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy1067;
+	goto yy56;
+yy978:
+	YYDEBUG(978, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '2') goto yy1067;
+	goto yy56;
+yy979:
+	YYDEBUG(979, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy1068;
+	goto yy186;
+yy980:
+	YYDEBUG(980, *YYCURSOR);
+	++YYCURSOR;
+	YYDEBUG(981, *YYCURSOR);
+#line 1423 "parse_date.re"
 	{
 		DEBUG_OUTPUT("pointed date YYYY");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->y = timelib_get_nr(&ptr, 4);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 19010 "<stdout>"
-yy975:
-	YYDEBUG(975, *YYCURSOR);
+#line 19081 "<stdout>"
+yy982:
+	YYDEBUG(982, *YYCURSOR);
 	++YYCURSOR;
 	goto yy214;
-yy976:
-	YYDEBUG(976, *YYCURSOR);
+yy983:
+	YYDEBUG(983, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1060;
+	if (yych <= '9') goto yy1069;
 	goto yy56;
-yy977:
-	YYDEBUG(977, *YYCURSOR);
-	yyaccept = 26;
+yy984:
+	YYDEBUG(984, *YYCURSOR);
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy978;
-		if (yych <= '9') goto yy862;
-		if (yych >= 'n') goto yy716;
+		if (yych <= '/') goto yy985;
+		if (yych <= '9') goto yy866;
+		if (yych >= 'n') goto yy718;
 	} else {
 		if (yych <= 'r') {
-			if (yych >= 'r') goto yy716;
+			if (yych >= 'r') goto yy718;
 		} else {
-			if (yych <= 's') goto yy717;
-			if (yych <= 't') goto yy718;
+			if (yych <= 's') goto yy719;
+			if (yych <= 't') goto yy720;
 		}
 	}
-yy978:
-	YYDEBUG(978, *YYCURSOR);
-#line 1344 "parse_date.re"
+yy985:
+	YYDEBUG(985, *YYCURSOR);
+#line 1354 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("iso8601date2");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 19052 "<stdout>"
-yy979:
-	YYDEBUG(979, *YYCURSOR);
-	yyaccept = 16;
+#line 19123 "<stdout>"
+yy986:
+	YYDEBUG(986, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'm') {
 		if (yych <= '9') {
-			if (yych <= '/') goto yy547;
-			goto yy981;
+			if (yych <= '/') goto yy548;
+			goto yy988;
 		} else {
-			if (yych == 'T') goto yy1061;
-			goto yy547;
+			if (yych == 'T') goto yy1070;
+			goto yy548;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'n') goto yy1062;
-			if (yych <= 'q') goto yy547;
-			goto yy1062;
+			if (yych <= 'n') goto yy1071;
+			if (yych <= 'q') goto yy548;
+			goto yy1071;
 		} else {
-			if (yych <= 's') goto yy1063;
-			if (yych <= 't') goto yy1064;
-			goto yy547;
+			if (yych <= 's') goto yy1072;
+			if (yych <= 't') goto yy1073;
+			goto yy548;
 		}
 	}
-yy980:
-	YYDEBUG(980, *YYCURSOR);
-	yyaccept = 16;
+yy987:
+	YYDEBUG(987, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'm') {
 		if (yych <= '1') {
-			if (yych <= '/') goto yy547;
+			if (yych <= '/') goto yy548;
 		} else {
-			if (yych == 'T') goto yy1061;
-			goto yy547;
+			if (yych == 'T') goto yy1070;
+			goto yy548;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'n') goto yy1062;
-			if (yych <= 'q') goto yy547;
-			goto yy1062;
+			if (yych <= 'n') goto yy1071;
+			if (yych <= 'q') goto yy548;
+			goto yy1071;
 		} else {
-			if (yych <= 's') goto yy1063;
-			if (yych <= 't') goto yy1064;
-			goto yy547;
+			if (yych <= 's') goto yy1072;
+			if (yych <= 't') goto yy1073;
+			goto yy548;
 		}
 	}
-yy981:
-	YYDEBUG(981, *YYCURSOR);
-	yyaccept = 16;
+yy988:
+	YYDEBUG(988, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych == 'T') goto yy1061;
-		if (yych <= 'm') goto yy547;
-		goto yy1062;
+		if (yych == 'T') goto yy1070;
+		if (yych <= 'm') goto yy548;
+		goto yy1071;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy547;
-			goto yy1062;
+			if (yych <= 'q') goto yy548;
+			goto yy1071;
 		} else {
-			if (yych <= 's') goto yy1063;
-			if (yych <= 't') goto yy1064;
-			goto yy547;
+			if (yych <= 's') goto yy1072;
+			if (yych <= 't') goto yy1073;
+			goto yy548;
 		}
 	}
-yy982:
-	YYDEBUG(982, *YYCURSOR);
+yy989:
+	YYDEBUG(989, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy1065;
-	if (yych <= '3') goto yy1066;
-	if (yych <= '9') goto yy981;
+	if (yych <= '2') goto yy1074;
+	if (yych <= '3') goto yy1075;
+	if (yych <= '9') goto yy988;
 	goto yy56;
-yy983:
-	YYDEBUG(983, *YYCURSOR);
-	yyaccept = 23;
+yy990:
+	YYDEBUG(990, *YYCURSOR);
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'H') {
-		if (yych == '-') goto yy914;
-		goto yy580;
+		if (yych == '-') goto yy918;
+		goto yy581;
 	} else {
-		if (yych <= 'I') goto yy1004;
-		if (yych == 'i') goto yy1004;
-		goto yy580;
+		if (yych <= 'I') goto yy1011;
+		if (yych == 'i') goto yy1011;
+		goto yy581;
 	}
-yy984:
-	YYDEBUG(984, *YYCURSOR);
-	yyaccept = 23;
+yy991:
+	YYDEBUG(991, *YYCURSOR);
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
-		if (yych == '-') goto yy914;
-		goto yy580;
+		if (yych == '-') goto yy918;
+		goto yy581;
 	} else {
-		if (yych <= 'U') goto yy1005;
-		if (yych == 'u') goto yy1005;
-		goto yy580;
+		if (yych <= 'U') goto yy1012;
+		if (yych == 'u') goto yy1012;
+		goto yy581;
 	}
-yy985:
-	YYDEBUG(985, *YYCURSOR);
-	yyaccept = 23;
+yy992:
+	YYDEBUG(992, *YYCURSOR);
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
-		if (yych == '-') goto yy914;
-		goto yy580;
+		if (yych == '-') goto yy918;
+		goto yy581;
 	} else {
-		if (yych <= 'E') goto yy1006;
-		if (yych == 'e') goto yy1006;
-		goto yy580;
+		if (yych <= 'E') goto yy1013;
+		if (yych == 'e') goto yy1013;
+		goto yy581;
 	}
-yy986:
-	YYDEBUG(986, *YYCURSOR);
-	yyaccept = 23;
+yy993:
+	YYDEBUG(993, *YYCURSOR);
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
-		if (yych == '-') goto yy914;
-		goto yy580;
+		if (yych == '-') goto yy918;
+		goto yy581;
 	} else {
-		if (yych <= 'R') goto yy1007;
-		if (yych == 'r') goto yy1007;
-		goto yy580;
+		if (yych <= 'R') goto yy1014;
+		if (yych == 'r') goto yy1014;
+		goto yy581;
 	}
-yy987:
-	YYDEBUG(987, *YYCURSOR);
-	yyaccept = 23;
+yy994:
+	YYDEBUG(994, *YYCURSOR);
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
-		if (yych == '-') goto yy914;
-		goto yy580;
+		if (yych == '-') goto yy918;
+		goto yy581;
 	} else {
-		if (yych <= 'U') goto yy1008;
-		if (yych == 'u') goto yy1008;
-		goto yy580;
+		if (yych <= 'U') goto yy1015;
+		if (yych == 'u') goto yy1015;
+		goto yy581;
 	}
-yy988:
-	YYDEBUG(988, *YYCURSOR);
-	yyaccept = 23;
+yy995:
+	YYDEBUG(995, *YYCURSOR);
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
-		if (yych == '-') goto yy914;
-		goto yy580;
+		if (yych == '-') goto yy918;
+		goto yy581;
 	} else {
-		if (yych <= 'Y') goto yy763;
-		if (yych == 'y') goto yy763;
-		goto yy580;
+		if (yych <= 'Y') goto yy765;
+		if (yych == 'y') goto yy765;
+		goto yy581;
 	}
-yy989:
-	YYDEBUG(989, *YYCURSOR);
-	yyaccept = 23;
+yy996:
+	YYDEBUG(996, *YYCURSOR);
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
-		if (yych == '-') goto yy914;
-		goto yy580;
+		if (yych == '-') goto yy918;
+		goto yy581;
 	} else {
-		if (yych <= 'E') goto yy763;
-		if (yych == 'e') goto yy763;
-		goto yy580;
+		if (yych <= 'E') goto yy765;
+		if (yych == 'e') goto yy765;
+		goto yy581;
 	}
-yy990:
-	YYDEBUG(990, *YYCURSOR);
-	yyaccept = 23;
+yy997:
+	YYDEBUG(997, *YYCURSOR);
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'B') {
-		if (yych == '-') goto yy914;
-		goto yy580;
+		if (yych == '-') goto yy918;
+		goto yy581;
 	} else {
-		if (yych <= 'C') goto yy1009;
-		if (yych == 'c') goto yy1009;
-		goto yy580;
+		if (yych <= 'C') goto yy1016;
+		if (yych == 'c') goto yy1016;
+		goto yy581;
 	}
-yy991:
-	YYDEBUG(991, *YYCURSOR);
-	yyaccept = 23;
+yy998:
+	YYDEBUG(998, *YYCURSOR);
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy914;
-	goto yy580;
-yy992:
-	YYDEBUG(992, *YYCURSOR);
-	yyaccept = 23;
+	if (yych == '-') goto yy918;
+	goto yy581;
+yy999:
+	YYDEBUG(999, *YYCURSOR);
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
-		if (yych == '-') goto yy914;
-		goto yy580;
+		if (yych == '-') goto yy918;
+		goto yy581;
 	} else {
-		if (yych <= 'O') goto yy1010;
-		if (yych == 'o') goto yy1010;
-		goto yy580;
+		if (yych <= 'O') goto yy1017;
+		if (yych == 'o') goto yy1017;
+		goto yy581;
 	}
-yy993:
-	YYDEBUG(993, *YYCURSOR);
-	yyaccept = 23;
+yy1000:
+	YYDEBUG(1000, *YYCURSOR);
+	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
-		if (yych == '-') goto yy914;
-		goto yy580;
+		if (yych == '-') goto yy918;
+		goto yy581;
 	} else {
-		if (yych <= 'T') goto yy985;
-		if (yych == 't') goto yy985;
-		goto yy580;
+		if (yych <= 'T') goto yy992;
+		if (yych == 't') goto yy992;
+		goto yy581;
 	}
-yy994:
-	YYDEBUG(994, *YYCURSOR);
+yy1001:
+	YYDEBUG(1001, *YYCURSOR);
 	++YYCURSOR;
-	goto yy890;
-yy995:
-	YYDEBUG(995, *YYCURSOR);
-	yyaccept = 27;
+	goto yy894;
+yy1002:
+	YYDEBUG(1002, *YYCURSOR);
+	yyaccept = 26;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy996;
-		if (yych <= '9') goto yy998;
-		if (yych >= 'n') goto yy1067;
+		if (yych <= '/') goto yy1003;
+		if (yych <= '9') goto yy1005;
+		if (yych >= 'n') goto yy1076;
 	} else {
 		if (yych <= 'r') {
-			if (yych >= 'r') goto yy1067;
+			if (yych >= 'r') goto yy1076;
 		} else {
-			if (yych <= 's') goto yy1068;
-			if (yych <= 't') goto yy1069;
+			if (yych <= 's') goto yy1077;
+			if (yych <= 't') goto yy1078;
 		}
 	}
-yy996:
-	YYDEBUG(996, *YYCURSOR);
-#line 1332 "parse_date.re"
+yy1003:
+	YYDEBUG(1003, *YYCURSOR);
+#line 1342 "parse_date.re"
 	{
 		DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_unsigned_nr((char **) &ptr, 4);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_unsigned_nr(&ptr, 4);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 19283 "<stdout>"
-yy997:
-	YYDEBUG(997, *YYCURSOR);
-	yyaccept = 27;
+#line 19354 "<stdout>"
+yy1004:
+	YYDEBUG(1004, *YYCURSOR);
+	yyaccept = 26;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy996;
-		if (yych <= '1') goto yy998;
-		if (yych <= 'm') goto yy996;
-		goto yy1067;
+		if (yych <= '/') goto yy1003;
+		if (yych <= '1') goto yy1005;
+		if (yych <= 'm') goto yy1003;
+		goto yy1076;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy996;
-			goto yy1067;
+			if (yych <= 'q') goto yy1003;
+			goto yy1076;
 		} else {
-			if (yych <= 's') goto yy1068;
-			if (yych <= 't') goto yy1069;
-			goto yy996;
+			if (yych <= 's') goto yy1077;
+			if (yych <= 't') goto yy1078;
+			goto yy1003;
 		}
 	}
-yy998:
-	YYDEBUG(998, *YYCURSOR);
-	yyaccept = 27;
+yy1005:
+	YYDEBUG(1005, *YYCURSOR);
+	yyaccept = 26;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'q') {
-		if (yych == 'n') goto yy1067;
-		goto yy996;
+		if (yych == 'n') goto yy1076;
+		goto yy1003;
 	} else {
-		if (yych <= 'r') goto yy1067;
-		if (yych <= 's') goto yy1068;
-		if (yych <= 't') goto yy1069;
-		goto yy996;
+		if (yych <= 'r') goto yy1076;
+		if (yych <= 's') goto yy1077;
+		if (yych <= 't') goto yy1078;
+		goto yy1003;
 	}
-yy999:
-	YYDEBUG(999, *YYCURSOR);
+yy1006:
+	YYDEBUG(1006, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy1070;
-	if (yych <= '3') goto yy1071;
-	if (yych <= '9') goto yy998;
+	if (yych <= '2') goto yy1079;
+	if (yych <= '3') goto yy1080;
+	if (yych <= '9') goto yy1005;
 	goto yy56;
-yy1000:
-	YYDEBUG(1000, *YYCURSOR);
-	yyaccept = 28;
+yy1007:
+	YYDEBUG(1007, *YYCURSOR);
+	yyaccept = 27;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
 		if (yych <= 'F') {
@@ -19334,7 +19405,7 @@ yy1000:
 				}
 			} else {
 				if (yych <= 'C') {
-					if (yych <= '9') goto yy1072;
+					if (yych <= '9') goto yy1081;
 				} else {
 					if (yych <= 'D') goto yy188;
 					if (yych >= 'F') goto yy189;
@@ -19350,7 +19421,7 @@ yy1000:
 			} else {
 				if (yych <= 'T') {
 					if (yych <= 'S') goto yy191;
-					goto yy1073;
+					goto yy1082;
 				} else {
 					if (yych <= 'U') goto yy84;
 					if (yych >= 'W') goto yy86;
@@ -19378,7 +19449,7 @@ yy1000:
 				if (yych <= 's') {
 					if (yych >= 's') goto yy191;
 				} else {
-					if (yych <= 't') goto yy1074;
+					if (yych <= 't') goto yy1083;
 					if (yych <= 'u') goto yy84;
 				}
 			} else {
@@ -19391,84 +19462,84 @@ yy1000:
 			}
 		}
 	}
-yy1001:
-	YYDEBUG(1001, *YYCURSOR);
-#line 1481 "parse_date.re"
+yy1008:
+	YYDEBUG(1008, *YYCURSOR);
+#line 1503 "parse_date.re"
 	{
 		DEBUG_OUTPUT("datenocolon");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr(&ptr, 4);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NOCOLON;
 	}
-#line 19408 "<stdout>"
-yy1002:
-	YYDEBUG(1002, *YYCURSOR);
+#line 19479 "<stdout>"
+yy1009:
+	YYDEBUG(1009, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy1072;
+	if (yych <= '9') goto yy1081;
 	goto yy186;
-yy1003:
-	YYDEBUG(1003, *YYCURSOR);
+yy1010:
+	YYDEBUG(1010, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy1075;
-	if (yych <= '3') goto yy1076;
+	if (yych <= '2') goto yy1084;
+	if (yych <= '3') goto yy1085;
 	goto yy56;
-yy1004:
-	YYDEBUG(1004, *YYCURSOR);
+yy1011:
+	YYDEBUG(1011, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy763;
-	if (yych == 'l') goto yy763;
+	if (yych == 'L') goto yy765;
+	if (yych == 'l') goto yy765;
 	goto yy56;
-yy1005:
-	YYDEBUG(1005, *YYCURSOR);
+yy1012:
+	YYDEBUG(1012, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1077;
-	if (yych == 's') goto yy1077;
+	if (yych == 'S') goto yy1086;
+	if (yych == 's') goto yy1086;
 	goto yy56;
-yy1006:
-	YYDEBUG(1006, *YYCURSOR);
+yy1013:
+	YYDEBUG(1013, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy1010;
-	if (yych == 'm') goto yy1010;
+	if (yych == 'M') goto yy1017;
+	if (yych == 'm') goto yy1017;
 	goto yy56;
-yy1007:
-	YYDEBUG(1007, *YYCURSOR);
+yy1014:
+	YYDEBUG(1014, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy1008;
+	if (yych == 'U') goto yy1015;
 	if (yych != 'u') goto yy56;
-yy1008:
-	YYDEBUG(1008, *YYCURSOR);
+yy1015:
+	YYDEBUG(1015, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1078;
-	if (yych == 'a') goto yy1078;
+	if (yych == 'A') goto yy1087;
+	if (yych == 'a') goto yy1087;
 	goto yy56;
-yy1009:
-	YYDEBUG(1009, *YYCURSOR);
+yy1016:
+	YYDEBUG(1016, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy763;
-	if (yych == 'h') goto yy763;
+	if (yych == 'H') goto yy765;
+	if (yych == 'h') goto yy765;
 	goto yy56;
-yy1010:
-	YYDEBUG(1010, *YYCURSOR);
+yy1017:
+	YYDEBUG(1017, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy1079;
-	if (yych == 'b') goto yy1079;
+	if (yych == 'B') goto yy1088;
+	if (yych == 'b') goto yy1088;
 	goto yy56;
-yy1011:
-	YYDEBUG(1011, *YYCURSOR);
+yy1018:
+	YYDEBUG(1018, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '8') goto yy56;
-yy1012:
-	YYDEBUG(1012, *YYCURSOR);
+yy1019:
+	YYDEBUG(1019, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(1013, *YYCURSOR);
-#line 1533 "parse_date.re"
+	YYDEBUG(1020, *YYCURSOR);
+#line 1555 "parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweekday");
@@ -19476,9 +19547,9 @@ yy1012:
 		TIMELIB_HAVE_DATE();
 		TIMELIB_HAVE_RELATIVE();
 
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
-		w = timelib_get_nr((char **) &ptr, 2);
-		d = timelib_get_nr((char **) &ptr, 1);
+		s->time->y = timelib_get_nr(&ptr, 4);
+		w = timelib_get_nr(&ptr, 2);
+		d = timelib_get_nr(&ptr, 1);
 		s->time->m = 1;
 		s->time->d = 1;
 		s->time->relative.d = timelib_daynr_from_weeknr(s->time->y, w, d);
@@ -19486,396 +19557,396 @@ yy1012:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 19490 "<stdout>"
-yy1014:
-	YYDEBUG(1014, *YYCURSOR);
+#line 19561 "<stdout>"
+yy1021:
+	YYDEBUG(1021, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy1080;
-	if (yych == 'h') goto yy1080;
+	if (yych == 'H') goto yy1089;
+	if (yych == 'h') goto yy1089;
 	goto yy56;
-yy1015:
-	YYDEBUG(1015, *YYCURSOR);
+yy1022:
+	YYDEBUG(1022, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1081;
-	if (yych == 'c') goto yy1081;
+	if (yych == 'C') goto yy1090;
+	if (yych == 'c') goto yy1090;
 	goto yy56;
-yy1016:
-	YYDEBUG(1016, *YYCURSOR);
+yy1023:
+	YYDEBUG(1023, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1082;
+	if (yych <= '9') goto yy1091;
 	goto yy56;
-yy1017:
-	YYDEBUG(1017, *YYCURSOR);
+yy1024:
+	YYDEBUG(1024, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1084;
+	if (yych <= '9') goto yy1093;
 	goto yy56;
-yy1018:
-	YYDEBUG(1018, *YYCURSOR);
-	yyaccept = 26;
+yy1025:
+	YYDEBUG(1025, *YYCURSOR);
+	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'q') {
-		if (yych == 'n') goto yy716;
-		goto yy978;
+		if (yych == 'n') goto yy718;
+		goto yy985;
 	} else {
-		if (yych <= 'r') goto yy716;
-		if (yych <= 's') goto yy717;
-		if (yych <= 't') goto yy718;
-		goto yy978;
+		if (yych <= 'r') goto yy718;
+		if (yych <= 's') goto yy719;
+		if (yych <= 't') goto yy720;
+		goto yy985;
 	}
-yy1019:
-	YYDEBUG(1019, *YYCURSOR);
+yy1026:
+	YYDEBUG(1026, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1086;
+	if (yych <= '9') goto yy1095;
 	goto yy56;
-yy1020:
-	YYDEBUG(1020, *YYCURSOR);
+yy1027:
+	YYDEBUG(1027, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1086;
+	if (yych <= '1') goto yy1095;
 	goto yy56;
-yy1021:
-	YYDEBUG(1021, *YYCURSOR);
+yy1028:
+	YYDEBUG(1028, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1088;
-	goto yy56;
-yy1022:
-	YYDEBUG(1022, *YYCURSOR);
+	if (yych <= '/') goto yy276;
+	if (yych <= '9') goto yy1097;
+	goto yy276;
+yy1029:
+	YYDEBUG(1029, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1023;
-	if (yych <= '9') goto yy1090;
-yy1023:
-	YYDEBUG(1023, *YYCURSOR);
-#line 1571 "parse_date.re"
+	if (yych <= '/') goto yy1030;
+	if (yych <= '9') goto yy1098;
+yy1030:
+	YYDEBUG(1030, *YYCURSOR);
+#line 1593 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextshort");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 19566 "<stdout>"
-yy1024:
-	YYDEBUG(1024, *YYCURSOR);
+#line 19637 "<stdout>"
+yy1031:
+	YYDEBUG(1031, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1091;
-	if (yych <= '2') goto yy1093;
-	if (yych <= '9') goto yy1094;
+	if (yych <= '1') goto yy1099;
+	if (yych <= '2') goto yy1101;
+	if (yych <= '9') goto yy1102;
 	goto yy56;
-yy1025:
-	YYDEBUG(1025, *YYCURSOR);
+yy1032:
+	YYDEBUG(1032, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= 'C') goto yy56;
-		if (yych <= 'D') goto yy1047;
-		goto yy1095;
+		if (yych <= 'D') goto yy1054;
+		goto yy1103;
 	} else {
 		if (yych <= 'c') goto yy56;
-		if (yych <= 'd') goto yy1047;
-		if (yych <= 'e') goto yy1095;
+		if (yych <= 'd') goto yy1054;
+		if (yych <= 'e') goto yy1103;
 		goto yy56;
 	}
-yy1026:
-	YYDEBUG(1026, *YYCURSOR);
+yy1033:
+	YYDEBUG(1033, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy818;
-	if (yych <= '9') goto yy1096;
-	goto yy818;
-yy1027:
-	YYDEBUG(1027, *YYCURSOR);
+	if (yych <= '/') goto yy820;
+	if (yych <= '9') goto yy1104;
+	goto yy820;
+yy1034:
+	YYDEBUG(1034, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '0') goto yy1096;
-	goto yy818;
-yy1028:
-	YYDEBUG(1028, *YYCURSOR);
+	if (yych == '0') goto yy1104;
+	goto yy820;
+yy1035:
+	YYDEBUG(1035, *YYCURSOR);
 	++YYCURSOR;
-	goto yy818;
-yy1029:
-	YYDEBUG(1029, *YYCURSOR);
+	goto yy820;
+yy1036:
+	YYDEBUG(1036, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy818;
-	if (yych <= '9') goto yy1097;
-	goto yy818;
-yy1030:
-	YYDEBUG(1030, *YYCURSOR);
+	if (yych <= '/') goto yy820;
+	if (yych <= '9') goto yy1105;
+	goto yy820;
+yy1037:
+	YYDEBUG(1037, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '0') goto yy1097;
-	goto yy818;
-yy1031:
-	YYDEBUG(1031, *YYCURSOR);
+	if (yych == '0') goto yy1105;
+	goto yy820;
+yy1038:
+	YYDEBUG(1038, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
-	YYDEBUG(1032, *YYCURSOR);
+	YYDEBUG(1039, *YYCURSOR);
 	if (yych <= 'A') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1031;
+			if (yych == '\t') goto yy1038;
 			goto yy56;
 		} else {
-			if (yych <= ' ') goto yy1031;
+			if (yych <= ' ') goto yy1038;
 			if (yych <= '@') goto yy56;
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych != 'P') goto yy56;
 		} else {
-			if (yych <= 'a') goto yy1033;
+			if (yych <= 'a') goto yy1040;
 			if (yych != 'p') goto yy56;
 		}
 	}
-yy1033:
-	YYDEBUG(1033, *YYCURSOR);
+yy1040:
+	YYDEBUG(1040, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
-		if (yych == '.') goto yy1098;
+		if (yych == '.') goto yy1106;
 		goto yy56;
 	} else {
-		if (yych <= 'M') goto yy1099;
-		if (yych == 'm') goto yy1099;
+		if (yych <= 'M') goto yy1107;
+		if (yych == 'm') goto yy1107;
 		goto yy56;
 	}
-yy1034:
-	YYDEBUG(1034, *YYCURSOR);
+yy1041:
+	YYDEBUG(1041, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1100;
-	if (yych == 's') goto yy1100;
-	goto yy940;
-yy1035:
-	YYDEBUG(1035, *YYCURSOR);
+	if (yych == 'S') goto yy1108;
+	if (yych == 's') goto yy1108;
+	goto yy944;
+yy1042:
+	YYDEBUG(1042, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1101;
-	if (yych == 't') goto yy1101;
+	if (yych == 'T') goto yy1109;
+	if (yych == 't') goto yy1109;
 	goto yy56;
-yy1036:
-	YYDEBUG(1036, *YYCURSOR);
-	yyaccept = 25;
+yy1043:
+	YYDEBUG(1043, *YYCURSOR);
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1102;
-		if (yych <= 0x1F) goto yy940;
-		goto yy1102;
+		if (yych == '\t') goto yy1110;
+		if (yych <= 0x1F) goto yy944;
+		goto yy1110;
 	} else {
 		if (yych <= 'D') {
-			if (yych <= 'C') goto yy940;
-			goto yy1104;
+			if (yych <= 'C') goto yy944;
+			goto yy1112;
 		} else {
-			if (yych == 'd') goto yy1104;
-			goto yy940;
+			if (yych == 'd') goto yy1112;
+			goto yy944;
 		}
 	}
-yy1037:
-	YYDEBUG(1037, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy1034;
-	if (yych == 'r') goto yy1034;
+yy1044:
+	YYDEBUG(1044, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'R') goto yy1041;
+	if (yych == 'r') goto yy1041;
 	goto yy56;
-yy1038:
-	YYDEBUG(1038, *YYCURSOR);
+yy1045:
+	YYDEBUG(1045, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy1105;
-	if (yych == 'r') goto yy1105;
+	if (yych == 'R') goto yy1113;
+	if (yych == 'r') goto yy1113;
 	goto yy56;
-yy1039:
-	YYDEBUG(1039, *YYCURSOR);
+yy1046:
+	YYDEBUG(1046, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy1106;
-	if (yych == 'l') goto yy1106;
+	if (yych == 'L') goto yy1114;
+	if (yych == 'l') goto yy1114;
 	goto yy56;
-yy1040:
-	YYDEBUG(1040, *YYCURSOR);
-	yyaccept = 25;
+yy1047:
+	YYDEBUG(1047, *YYCURSOR);
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'U') {
-		if (yych == 'S') goto yy1100;
-		if (yych <= 'T') goto yy940;
-		goto yy1107;
+		if (yych == 'S') goto yy1108;
+		if (yych <= 'T') goto yy944;
+		goto yy1115;
 	} else {
 		if (yych <= 's') {
-			if (yych <= 'r') goto yy940;
-			goto yy1100;
+			if (yych <= 'r') goto yy944;
+			goto yy1108;
 		} else {
-			if (yych == 'u') goto yy1107;
-			goto yy940;
+			if (yych == 'u') goto yy1115;
+			goto yy944;
 		}
 	}
-yy1041:
-	YYDEBUG(1041, *YYCURSOR);
-	yyaccept = 25;
+yy1048:
+	YYDEBUG(1048, *YYCURSOR);
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1102;
-			goto yy940;
+			if (yych == '\t') goto yy1110;
+			goto yy944;
 		} else {
-			if (yych <= ' ') goto yy1102;
-			if (yych <= 'C') goto yy940;
-			goto yy1104;
+			if (yych <= ' ') goto yy1110;
+			if (yych <= 'C') goto yy944;
+			goto yy1112;
 		}
 	} else {
 		if (yych <= 'c') {
-			if (yych == 'T') goto yy1108;
-			goto yy940;
+			if (yych == 'T') goto yy1116;
+			goto yy944;
 		} else {
-			if (yych <= 'd') goto yy1104;
-			if (yych == 't') goto yy1108;
-			goto yy940;
+			if (yych <= 'd') goto yy1112;
+			if (yych == 't') goto yy1116;
+			goto yy944;
 		}
 	}
-yy1042:
-	YYDEBUG(1042, *YYCURSOR);
+yy1049:
+	YYDEBUG(1049, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1034;
-	if (yych == 'c') goto yy1034;
+	if (yych == 'C') goto yy1041;
+	if (yych == 'c') goto yy1041;
 	goto yy56;
-yy1043:
-	YYDEBUG(1043, *YYCURSOR);
-	yyaccept = 25;
+yy1050:
+	YYDEBUG(1050, *YYCURSOR);
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1102;
-		if (yych <= 0x1F) goto yy940;
-		goto yy1102;
+		if (yych == '\t') goto yy1110;
+		if (yych <= 0x1F) goto yy944;
+		goto yy1110;
 	} else {
 		if (yych <= 'U') {
-			if (yych <= 'T') goto yy940;
-			goto yy1109;
+			if (yych <= 'T') goto yy944;
+			goto yy1117;
 		} else {
-			if (yych == 'u') goto yy1109;
-			goto yy940;
+			if (yych == 'u') goto yy1117;
+			goto yy944;
 		}
 	}
-yy1044:
-	YYDEBUG(1044, *YYCURSOR);
-	yyaccept = 25;
+yy1051:
+	YYDEBUG(1051, *YYCURSOR);
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
-		if (yych == 'O') goto yy1110;
-		if (yych <= 'R') goto yy940;
-		goto yy1100;
+		if (yych == 'O') goto yy1118;
+		if (yych <= 'R') goto yy944;
+		goto yy1108;
 	} else {
 		if (yych <= 'o') {
-			if (yych <= 'n') goto yy940;
-			goto yy1110;
+			if (yych <= 'n') goto yy944;
+			goto yy1118;
 		} else {
-			if (yych == 's') goto yy1100;
-			goto yy940;
+			if (yych == 's') goto yy1108;
+			goto yy944;
 		}
 	}
-yy1045:
-	YYDEBUG(1045, *YYCURSOR);
-	yyaccept = 25;
+yy1052:
+	YYDEBUG(1052, *YYCURSOR);
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1102;
-		if (yych <= 0x1F) goto yy940;
-		goto yy1102;
+		if (yych == '\t') goto yy1110;
+		if (yych <= 0x1F) goto yy944;
+		goto yy1110;
 	} else {
 		if (yych <= 'R') {
-			if (yych <= 'Q') goto yy940;
-			goto yy1111;
+			if (yych <= 'Q') goto yy944;
+			goto yy1119;
 		} else {
-			if (yych == 'r') goto yy1111;
-			goto yy940;
+			if (yych == 'r') goto yy1119;
+			goto yy944;
 		}
 	}
-yy1046:
-	YYDEBUG(1046, *YYCURSOR);
-	yyaccept = 25;
+yy1053:
+	YYDEBUG(1053, *YYCURSOR);
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1102;
-		if (yych <= 0x1F) goto yy940;
-		goto yy1102;
+		if (yych == '\t') goto yy1110;
+		if (yych <= 0x1F) goto yy944;
+		goto yy1110;
 	} else {
 		if (yych <= 'S') {
-			if (yych <= 'R') goto yy940;
-			goto yy1112;
+			if (yych <= 'R') goto yy944;
+			goto yy1120;
 		} else {
-			if (yych == 's') goto yy1112;
-			goto yy940;
+			if (yych == 's') goto yy1120;
+			goto yy944;
 		}
 	}
-yy1047:
-	YYDEBUG(1047, *YYCURSOR);
-	yyaccept = 25;
+yy1054:
+	YYDEBUG(1054, *YYCURSOR);
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1102;
-		if (yych <= 0x1F) goto yy940;
-		goto yy1102;
+		if (yych == '\t') goto yy1110;
+		if (yych <= 0x1F) goto yy944;
+		goto yy1110;
 	} else {
 		if (yych <= 'N') {
-			if (yych <= 'M') goto yy940;
-			goto yy1113;
+			if (yych <= 'M') goto yy944;
+			goto yy1121;
 		} else {
-			if (yych == 'n') goto yy1113;
-			goto yy940;
+			if (yych == 'n') goto yy1121;
+			goto yy944;
 		}
 	}
-yy1048:
-	YYDEBUG(1048, *YYCURSOR);
+yy1055:
+	YYDEBUG(1055, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'K') goto yy1114;
-	if (yych == 'k') goto yy1114;
+	if (yych == 'K') goto yy1122;
+	if (yych == 'k') goto yy1122;
 	goto yy56;
-yy1049:
-	YYDEBUG(1049, *YYCURSOR);
-	yyaccept = 25;
+yy1056:
+	YYDEBUG(1056, *YYCURSOR);
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
-		if (yych == ' ') goto yy1116;
-		goto yy940;
+		if (yych == ' ') goto yy1124;
+		goto yy944;
 	} else {
-		if (yych <= 'S') goto yy1100;
-		if (yych == 's') goto yy1100;
-		goto yy940;
+		if (yych <= 'S') goto yy1108;
+		if (yych == 's') goto yy1108;
+		goto yy944;
 	}
-yy1050:
-	YYDEBUG(1050, *YYCURSOR);
+yy1057:
+	YYDEBUG(1057, *YYCURSOR);
 	++YYCURSOR;
-	goto yy699;
-yy1051:
-	YYDEBUG(1051, *YYCURSOR);
-	yyaccept = 17;
+	goto yy700;
+yy1058:
+	YYDEBUG(1058, *YYCURSOR);
+	yyaccept = 16;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 128) {
-		goto yy917;
+		goto yy921;
 	}
 	if (yych <= '.') {
-		if (yych == '-') goto yy282;
-		goto yy699;
+		if (yych == '-') goto yy283;
+		goto yy700;
 	} else {
-		if (yych <= '/') goto yy282;
-		if (yych == '_') goto yy282;
-		goto yy699;
+		if (yych <= '/') goto yy283;
+		if (yych == '_') goto yy283;
+		goto yy700;
 	}
-yy1052:
-	YYDEBUG(1052, *YYCURSOR);
+yy1059:
+	YYDEBUG(1059, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '\t') goto yy680;
-	if (yych == ' ') goto yy680;
+	if (yych == '\t') goto yy681;
+	if (yych == ' ') goto yy681;
 	goto yy56;
-yy1053:
-	YYDEBUG(1053, *YYCURSOR);
+yy1060:
+	YYDEBUG(1060, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '\t') goto yy680;
-	if (yych == ' ') goto yy680;
-	goto yy918;
-yy1054:
-	YYDEBUG(1054, *YYCURSOR);
+	if (yych == '\t') goto yy681;
+	if (yych == ' ') goto yy681;
+	goto yy922;
+yy1061:
+	YYDEBUG(1061, *YYCURSOR);
 	++YYCURSOR;
-yy1055:
-	YYDEBUG(1055, *YYCURSOR);
-#line 1059 "parse_date.re"
+yy1062:
+	YYDEBUG(1062, *YYCURSOR);
+#line 1064 "parse_date.re"
 	{
 		DEBUG_OUTPUT("tomorrow");
 		TIMELIB_INIT;
@@ -19886,185 +19957,197 @@ yy1055:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 19890 "<stdout>"
-yy1056:
-	YYDEBUG(1056, *YYCURSOR);
-	yyaccept = 29;
+#line 19961 "<stdout>"
+yy1063:
+	YYDEBUG(1063, *YYCURSOR);
+	yyaccept = 28;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 128) {
-		goto yy917;
+		goto yy921;
 	}
 	if (yych <= '.') {
-		if (yych == '-') goto yy282;
-		goto yy1055;
+		if (yych == '-') goto yy283;
+		goto yy1062;
 	} else {
-		if (yych <= '/') goto yy282;
-		if (yych == '_') goto yy282;
-		goto yy1055;
+		if (yych <= '/') goto yy283;
+		if (yych == '_') goto yy283;
+		goto yy1062;
 	}
-yy1057:
-	YYDEBUG(1057, *YYCURSOR);
+yy1064:
+	YYDEBUG(1064, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1117;
-	if (yych == 'y') goto yy1117;
+	if (yych == 'Y') goto yy1125;
+	if (yych == 'y') goto yy1125;
 	goto yy56;
-yy1058:
-	YYDEBUG(1058, *YYCURSOR);
+yy1065:
+	YYDEBUG(1065, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1117;
-	if (yych == 'y') goto yy1119;
-	goto yy918;
-yy1059:
-	YYDEBUG(1059, *YYCURSOR);
+	if (yych == 'Y') goto yy1125;
+	if (yych == 'y') goto yy1127;
+	goto yy922;
+yy1066:
+	YYDEBUG(1066, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '2') goto yy1120;
-	if (yych <= '3') goto yy1121;
+	if (yych <= '2') goto yy1128;
+	if (yych <= '3') goto yy1129;
 	goto yy56;
-yy1060:
-	YYDEBUG(1060, *YYCURSOR);
+yy1067:
+	YYDEBUG(1067, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy1130;
+	goto yy56;
+yy1068:
+	YYDEBUG(1068, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy1131;
+	goto yy186;
+yy1069:
+	YYDEBUG(1069, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1122;
+	if (yych <= '9') goto yy1132;
 	goto yy56;
-yy1061:
-	YYDEBUG(1061, *YYCURSOR);
+yy1070:
+	YYDEBUG(1070, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1123;
-	if (yych <= '2') goto yy1124;
-	if (yych <= '9') goto yy1125;
+	if (yych <= '1') goto yy1133;
+	if (yych <= '2') goto yy1134;
+	if (yych <= '9') goto yy1135;
 	goto yy56;
-yy1062:
-	YYDEBUG(1062, *YYCURSOR);
+yy1071:
+	YYDEBUG(1071, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy1126;
+	if (yych == 'd') goto yy1136;
 	goto yy56;
-yy1063:
-	YYDEBUG(1063, *YYCURSOR);
+yy1072:
+	YYDEBUG(1072, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 't') goto yy1126;
+	if (yych == 't') goto yy1136;
 	goto yy56;
-yy1064:
-	YYDEBUG(1064, *YYCURSOR);
+yy1073:
+	YYDEBUG(1073, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'h') goto yy1126;
+	if (yych == 'h') goto yy1136;
 	goto yy56;
-yy1065:
-	YYDEBUG(1065, *YYCURSOR);
-	yyaccept = 16;
+yy1074:
+	YYDEBUG(1074, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'm') {
 		if (yych <= '9') {
-			if (yych <= '/') goto yy547;
-			goto yy1127;
+			if (yych <= '/') goto yy548;
+			goto yy1137;
 		} else {
-			if (yych == 'T') goto yy1061;
-			goto yy547;
+			if (yych == 'T') goto yy1070;
+			goto yy548;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'n') goto yy1062;
-			if (yych <= 'q') goto yy547;
-			goto yy1062;
+			if (yych <= 'n') goto yy1071;
+			if (yych <= 'q') goto yy548;
+			goto yy1071;
 		} else {
-			if (yych <= 's') goto yy1063;
-			if (yych <= 't') goto yy1064;
-			goto yy547;
+			if (yych <= 's') goto yy1072;
+			if (yych <= 't') goto yy1073;
+			goto yy548;
 		}
 	}
-yy1066:
-	YYDEBUG(1066, *YYCURSOR);
-	yyaccept = 16;
+yy1075:
+	YYDEBUG(1075, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'm') {
 		if (yych <= '1') {
-			if (yych <= '/') goto yy547;
-			goto yy1127;
+			if (yych <= '/') goto yy548;
+			goto yy1137;
 		} else {
-			if (yych == 'T') goto yy1061;
-			goto yy547;
+			if (yych == 'T') goto yy1070;
+			goto yy548;
 		}
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'n') goto yy1062;
-			if (yych <= 'q') goto yy547;
-			goto yy1062;
+			if (yych <= 'n') goto yy1071;
+			if (yych <= 'q') goto yy548;
+			goto yy1071;
 		} else {
-			if (yych <= 's') goto yy1063;
-			if (yych <= 't') goto yy1064;
-			goto yy547;
+			if (yych <= 's') goto yy1072;
+			if (yych <= 't') goto yy1073;
+			goto yy548;
 		}
 	}
-yy1067:
-	YYDEBUG(1067, *YYCURSOR);
+yy1076:
+	YYDEBUG(1076, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'd') goto yy1128;
+	if (yych == 'd') goto yy1138;
 	goto yy56;
-yy1068:
-	YYDEBUG(1068, *YYCURSOR);
+yy1077:
+	YYDEBUG(1077, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 't') goto yy1128;
+	if (yych == 't') goto yy1138;
 	goto yy56;
-yy1069:
-	YYDEBUG(1069, *YYCURSOR);
+yy1078:
+	YYDEBUG(1078, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'h') goto yy1128;
+	if (yych == 'h') goto yy1138;
 	goto yy56;
-yy1070:
-	YYDEBUG(1070, *YYCURSOR);
-	yyaccept = 27;
+yy1079:
+	YYDEBUG(1079, *YYCURSOR);
+	yyaccept = 26;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy996;
-		if (yych <= '9') goto yy1129;
-		if (yych <= 'm') goto yy996;
-		goto yy1067;
+		if (yych <= '/') goto yy1003;
+		if (yych <= '9') goto yy1139;
+		if (yych <= 'm') goto yy1003;
+		goto yy1076;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy996;
-			goto yy1067;
+			if (yych <= 'q') goto yy1003;
+			goto yy1076;
 		} else {
-			if (yych <= 's') goto yy1068;
-			if (yych <= 't') goto yy1069;
-			goto yy996;
+			if (yych <= 's') goto yy1077;
+			if (yych <= 't') goto yy1078;
+			goto yy1003;
 		}
 	}
-yy1071:
-	YYDEBUG(1071, *YYCURSOR);
-	yyaccept = 27;
+yy1080:
+	YYDEBUG(1080, *YYCURSOR);
+	yyaccept = 26;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych <= '/') goto yy996;
-		if (yych <= '1') goto yy1129;
-		if (yych <= 'm') goto yy996;
-		goto yy1067;
+		if (yych <= '/') goto yy1003;
+		if (yych <= '1') goto yy1139;
+		if (yych <= 'm') goto yy1003;
+		goto yy1076;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy996;
-			goto yy1067;
+			if (yych <= 'q') goto yy1003;
+			goto yy1076;
 		} else {
-			if (yych <= 's') goto yy1068;
-			if (yych <= 't') goto yy1069;
-			goto yy996;
+			if (yych <= 's') goto yy1077;
+			if (yych <= 't') goto yy1078;
+			goto yy1003;
 		}
 	}
-yy1072:
-	YYDEBUG(1072, *YYCURSOR);
+yy1081:
+	YYDEBUG(1081, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy1130;
+	if (yych <= '9') goto yy1140;
 	goto yy186;
-yy1073:
-	YYDEBUG(1073, *YYCURSOR);
+yy1082:
+	YYDEBUG(1082, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= '2') {
 			if (yych <= '/') goto yy56;
-			if (yych <= '1') goto yy1131;
-			goto yy1132;
+			if (yych <= '1') goto yy1141;
+			goto yy1142;
 		} else {
-			if (yych <= '9') goto yy1133;
+			if (yych <= '9') goto yy1143;
 			if (yych <= 'G') goto yy56;
 			goto yy256;
 		}
@@ -20078,16 +20161,16 @@ yy1073:
 			goto yy56;
 		}
 	}
-yy1074:
-	YYDEBUG(1074, *YYCURSOR);
+yy1083:
+	YYDEBUG(1083, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= '2') {
 			if (yych <= '/') goto yy56;
-			if (yych <= '1') goto yy1134;
-			goto yy1135;
+			if (yych <= '1') goto yy1144;
+			goto yy1145;
 		} else {
-			if (yych <= '9') goto yy1136;
+			if (yych <= '9') goto yy1146;
 			if (yych <= 'G') goto yy56;
 			goto yy256;
 		}
@@ -20101,177 +20184,149 @@ yy1074:
 			goto yy56;
 		}
 	}
-yy1075:
-	YYDEBUG(1075, *YYCURSOR);
+yy1084:
+	YYDEBUG(1084, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1137;
+	if (yych <= '9') goto yy1147;
 	goto yy56;
-yy1076:
-	YYDEBUG(1076, *YYCURSOR);
+yy1085:
+	YYDEBUG(1085, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1137;
+	if (yych <= '1') goto yy1147;
 	goto yy56;
-yy1077:
-	YYDEBUG(1077, *YYCURSOR);
+yy1086:
+	YYDEBUG(1086, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy763;
-	if (yych == 't') goto yy763;
+	if (yych == 'T') goto yy765;
+	if (yych == 't') goto yy765;
 	goto yy56;
-yy1078:
-	YYDEBUG(1078, *YYCURSOR);
+yy1087:
+	YYDEBUG(1087, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy1138;
-	if (yych == 'r') goto yy1138;
+	if (yych == 'R') goto yy1148;
+	if (yych == 'r') goto yy1148;
 	goto yy56;
-yy1079:
-	YYDEBUG(1079, *YYCURSOR);
+yy1088:
+	YYDEBUG(1088, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1139;
-	if (yych == 'e') goto yy1139;
+	if (yych == 'E') goto yy1149;
+	if (yych == 'e') goto yy1149;
 	goto yy56;
-yy1080:
-	YYDEBUG(1080, *YYCURSOR);
+yy1089:
+	YYDEBUG(1089, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy407;
-	if (yych == 't') goto yy407;
+	if (yych == 'T') goto yy408;
+	if (yych == 't') goto yy408;
 	goto yy56;
-yy1081:
-	YYDEBUG(1081, *YYCURSOR);
+yy1090:
+	YYDEBUG(1090, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy609;
-	if (yych == 'o') goto yy609;
+	if (yych == 'O') goto yy610;
+	if (yych == 'o') goto yy610;
 	goto yy56;
-yy1082:
-	YYDEBUG(1082, *YYCURSOR);
-	yyaccept = 5;
+yy1091:
+	YYDEBUG(1091, *YYCURSOR);
+	yyaccept = 4;
 	YYMARKER = ++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
-	YYDEBUG(1083, *YYCURSOR);
+	YYDEBUG(1092, *YYCURSOR);
 	if (yych <= 'O') {
 		if (yych <= '9') {
 			if (yych <= '/') goto yy209;
-			goto yy1082;
+			goto yy1091;
 		} else {
-			if (yych == 'A') goto yy1140;
+			if (yych == 'A') goto yy1150;
 			goto yy209;
 		}
 	} else {
 		if (yych <= 'a') {
-			if (yych <= 'P') goto yy1140;
+			if (yych <= 'P') goto yy1150;
 			if (yych <= '`') goto yy209;
-			goto yy1140;
+			goto yy1150;
 		} else {
-			if (yych == 'p') goto yy1140;
+			if (yych == 'p') goto yy1150;
 			goto yy209;
 		}
 	}
-yy1084:
-	YYDEBUG(1084, *YYCURSOR);
+yy1093:
+	YYDEBUG(1093, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
-	YYDEBUG(1085, *YYCURSOR);
+	YYDEBUG(1094, *YYCURSOR);
 	if (yych <= 'O') {
 		if (yych <= '9') {
 			if (yych <= '/') goto yy56;
-			goto yy1084;
+			goto yy1093;
 		} else {
-			if (yych == 'A') goto yy1140;
+			if (yych == 'A') goto yy1150;
 			goto yy56;
 		}
 	} else {
 		if (yych <= 'a') {
-			if (yych <= 'P') goto yy1140;
+			if (yych <= 'P') goto yy1150;
 			if (yych <= '`') goto yy56;
-			goto yy1140;
+			goto yy1150;
 		} else {
-			if (yych == 'p') goto yy1140;
+			if (yych == 'p') goto yy1150;
 			goto yy56;
 		}
 	}
-yy1086:
-	YYDEBUG(1086, *YYCURSOR);
+yy1095:
+	YYDEBUG(1095, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(1087, *YYCURSOR);
-#line 1585 "parse_date.re"
+	YYDEBUG(1096, *YYCURSOR);
+#line 1607 "parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextreverse");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 20213 "<stdout>"
-yy1088:
-	YYDEBUG(1088, *YYCURSOR);
+#line 20296 "<stdout>"
+yy1097:
+	YYDEBUG(1097, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(1089, *YYCURSOR);
-#line 1097 "parse_date.re"
-	{
-		timelib_ull i, us;
-
-		TIMELIB_INIT;
-		TIMELIB_HAVE_RELATIVE();
-		TIMELIB_UNHAVE_DATE();
-		TIMELIB_UNHAVE_TIME();
-		TIMELIB_HAVE_TZ();
-
-		i = timelib_get_unsigned_nr((char **) &ptr, 24);
-		us = timelib_get_unsigned_nr((char **) &ptr, 24);
-		s->time->y = 1970;
-		s->time->m = 1;
-		s->time->d = 1;
-		s->time->h = s->time->i = s->time->s = 0;
-		s->time->us = 0;
-		s->time->relative.s += i;
-		s->time->relative.us = us;
-		s->time->is_localtime = 1;
-		s->time->zone_type = TIMELIB_ZONETYPE_OFFSET;
-		s->time->z = 0;
-		s->time->dst = 0;
-
-		TIMELIB_DEINIT;
-		return TIMELIB_RELATIVE;
-	}
-#line 20245 "<stdout>"
-yy1090:
-	YYDEBUG(1090, *YYCURSOR);
+	goto yy276;
+yy1098:
+	YYDEBUG(1098, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1023;
-	if (yych <= '9') goto yy1141;
-	goto yy1023;
-yy1091:
-	YYDEBUG(1091, *YYCURSOR);
-	yyaccept = 30;
+	if (yych <= '/') goto yy1030;
+	if (yych <= '9') goto yy1151;
+	goto yy1030;
+yy1099:
+	YYDEBUG(1099, *YYCURSOR);
+	yyaccept = 29;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1142;
+			if (yych == '\t') goto yy1152;
 		} else {
-			if (yych <= ' ') goto yy1142;
-			if (yych <= '/') goto yy1092;
-			if (yych <= '9') goto yy1094;
+			if (yych <= ' ') goto yy1152;
+			if (yych <= '/') goto yy1100;
+			if (yych <= '9') goto yy1102;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'A') goto yy1144;
-			if (yych == 'P') goto yy1144;
+			if (yych <= 'A') goto yy1154;
+			if (yych == 'P') goto yy1154;
 		} else {
-			if (yych <= 'a') goto yy1144;
-			if (yych == 'p') goto yy1144;
+			if (yych <= 'a') goto yy1154;
+			if (yych == 'p') goto yy1154;
 		}
 	}
-yy1092:
-	YYDEBUG(1092, *YYCURSOR);
-#line 1142 "parse_date.re"
+yy1100:
+	YYDEBUG(1100, *YYCURSOR);
+#line 1152 "parse_date.re"
 	{
 		DEBUG_OUTPUT("backof | frontof");
 		TIMELIB_INIT;
@@ -20279,256 +20334,256 @@ yy1092:
 		TIMELIB_HAVE_TIME();
 
 		if (*ptr == 'b') {
-			s->time->h = timelib_get_nr((char **) &ptr, 2);
+			s->time->h = timelib_get_nr(&ptr, 2);
 			s->time->i = 15;
 		} else {
-			s->time->h = timelib_get_nr((char **) &ptr, 2) - 1;
+			s->time->h = timelib_get_nr(&ptr, 2) - 1;
 			s->time->i = 45;
 		}
 		if (*ptr != '\0' ) {
-			timelib_eat_spaces((char **) &ptr);
-			s->time->h += timelib_meridian((char **) &ptr, s->time->h);
+			timelib_eat_spaces(&ptr);
+			s->time->h += timelib_meridian(&ptr, s->time->h);
 		}
 
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 20297 "<stdout>"
-yy1093:
-	YYDEBUG(1093, *YYCURSOR);
-	yyaccept = 30;
+#line 20352 "<stdout>"
+yy1101:
+	YYDEBUG(1101, *YYCURSOR);
+	yyaccept = 29;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1142;
-			goto yy1092;
+			if (yych == '\t') goto yy1152;
+			goto yy1100;
 		} else {
-			if (yych <= ' ') goto yy1142;
-			if (yych <= '/') goto yy1092;
-			if (yych >= '5') goto yy1092;
+			if (yych <= ' ') goto yy1152;
+			if (yych <= '/') goto yy1100;
+			if (yych >= '5') goto yy1100;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'A') goto yy1144;
-			if (yych == 'P') goto yy1144;
-			goto yy1092;
+			if (yych <= 'A') goto yy1154;
+			if (yych == 'P') goto yy1154;
+			goto yy1100;
 		} else {
-			if (yych <= 'a') goto yy1144;
-			if (yych == 'p') goto yy1144;
-			goto yy1092;
+			if (yych <= 'a') goto yy1154;
+			if (yych == 'p') goto yy1154;
+			goto yy1100;
 		}
 	}
-yy1094:
-	YYDEBUG(1094, *YYCURSOR);
-	yyaccept = 30;
+yy1102:
+	YYDEBUG(1102, *YYCURSOR);
+	yyaccept = 29;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1142;
-			goto yy1092;
+			if (yych == '\t') goto yy1152;
+			goto yy1100;
 		} else {
-			if (yych <= ' ') goto yy1142;
-			if (yych <= '@') goto yy1092;
-			goto yy1144;
+			if (yych <= ' ') goto yy1152;
+			if (yych <= '@') goto yy1100;
+			goto yy1154;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych == 'P') goto yy1144;
-			goto yy1092;
+			if (yych == 'P') goto yy1154;
+			goto yy1100;
 		} else {
-			if (yych <= 'a') goto yy1144;
-			if (yych == 'p') goto yy1144;
-			goto yy1092;
+			if (yych <= 'a') goto yy1154;
+			if (yych == 'p') goto yy1154;
+			goto yy1100;
 		}
 	}
-yy1095:
-	YYDEBUG(1095, *YYCURSOR);
+yy1103:
+	YYDEBUG(1103, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'K') goto yy1145;
-	if (yych == 'k') goto yy1145;
+	if (yych == 'K') goto yy1155;
+	if (yych == 'k') goto yy1155;
 	goto yy56;
-yy1096:
-	YYDEBUG(1096, *YYCURSOR);
-	yyaccept = 21;
+yy1104:
+	YYDEBUG(1104, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '*') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1147;
-			goto yy818;
+			if (yych == '\t') goto yy1157;
+			goto yy820;
 		} else {
-			if (yych <= ' ') goto yy1147;
-			if (yych == '(') goto yy1147;
-			goto yy818;
+			if (yych <= ' ') goto yy1157;
+			if (yych == '(') goto yy1157;
+			goto yy820;
 		}
 	} else {
 		if (yych <= '@') {
-			if (yych == ',') goto yy818;
-			if (yych <= '-') goto yy1147;
-			goto yy818;
+			if (yych == ',') goto yy820;
+			if (yych <= '-') goto yy1157;
+			goto yy820;
 		} else {
-			if (yych <= 'Z') goto yy1147;
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1147;
-			goto yy818;
+			if (yych <= 'Z') goto yy1157;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1157;
+			goto yy820;
 		}
 	}
-yy1097:
-	YYDEBUG(1097, *YYCURSOR);
-	yyaccept = 21;
+yy1105:
+	YYDEBUG(1105, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '*') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1154;
-			goto yy818;
+			if (yych == '\t') goto yy1164;
+			goto yy820;
 		} else {
-			if (yych <= ' ') goto yy1154;
-			if (yych == '(') goto yy1154;
-			goto yy818;
+			if (yych <= ' ') goto yy1164;
+			if (yych == '(') goto yy1164;
+			goto yy820;
 		}
 	} else {
 		if (yych <= '@') {
-			if (yych == ',') goto yy818;
-			if (yych <= '-') goto yy1154;
-			goto yy818;
+			if (yych == ',') goto yy820;
+			if (yych <= '-') goto yy1164;
+			goto yy820;
 		} else {
-			if (yych <= 'Z') goto yy1154;
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1154;
-			goto yy818;
+			if (yych <= 'Z') goto yy1164;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1164;
+			goto yy820;
 		}
 	}
-yy1098:
-	YYDEBUG(1098, *YYCURSOR);
+yy1106:
+	YYDEBUG(1106, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy1099;
+	if (yych == 'M') goto yy1107;
 	if (yych != 'm') goto yy56;
-yy1099:
-	YYDEBUG(1099, *YYCURSOR);
+yy1107:
+	YYDEBUG(1107, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy1157;
-		if (yych == '\t') goto yy1157;
+		if (yych <= 0x00) goto yy1167;
+		if (yych == '\t') goto yy1167;
 		goto yy56;
 	} else {
-		if (yych <= ' ') goto yy1157;
-		if (yych == '.') goto yy1159;
+		if (yych <= ' ') goto yy1167;
+		if (yych == '.') goto yy1169;
 		goto yy56;
 	}
-yy1100:
-	YYDEBUG(1100, *YYCURSOR);
+yy1108:
+	YYDEBUG(1108, *YYCURSOR);
 	++YYCURSOR;
-	goto yy940;
-yy1101:
-	YYDEBUG(1101, *YYCURSOR);
+	goto yy944;
+yy1109:
+	YYDEBUG(1109, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
-		if (yych == 'H') goto yy1160;
+		if (yych == 'H') goto yy1170;
 		if (yych <= 'M') goto yy56;
-		goto yy1161;
+		goto yy1171;
 	} else {
 		if (yych <= 'h') {
 			if (yych <= 'g') goto yy56;
-			goto yy1160;
+			goto yy1170;
 		} else {
-			if (yych == 'n') goto yy1161;
+			if (yych == 'n') goto yy1171;
 			goto yy56;
 		}
 	}
-yy1102:
-	YYDEBUG(1102, *YYCURSOR);
+yy1110:
+	YYDEBUG(1110, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	YYDEBUG(1103, *YYCURSOR);
+	YYDEBUG(1111, *YYCURSOR);
 	if (yych <= ' ') {
-		if (yych == '\t') goto yy1102;
+		if (yych == '\t') goto yy1110;
 		if (yych <= 0x1F) goto yy56;
-		goto yy1102;
+		goto yy1110;
 	} else {
 		if (yych <= 'O') {
 			if (yych <= 'N') goto yy56;
-			goto yy1162;
+			goto yy1172;
 		} else {
-			if (yych == 'o') goto yy1162;
+			if (yych == 'o') goto yy1172;
 			goto yy56;
 		}
 	}
-yy1104:
-	YYDEBUG(1104, *YYCURSOR);
+yy1112:
+	YYDEBUG(1112, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1163;
-	if (yych == 'a') goto yy1163;
+	if (yych == 'A') goto yy1173;
+	if (yych == 'a') goto yy1173;
 	goto yy56;
-yy1105:
-	YYDEBUG(1105, *YYCURSOR);
+yy1113:
+	YYDEBUG(1113, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1164;
-	if (yych == 'o') goto yy1164;
+	if (yych == 'O') goto yy1174;
+	if (yych == 'o') goto yy1174;
 	goto yy56;
-yy1106:
-	YYDEBUG(1106, *YYCURSOR);
+yy1114:
+	YYDEBUG(1114, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy1164;
-	if (yych == 'i') goto yy1164;
+	if (yych == 'I') goto yy1174;
+	if (yych == 'i') goto yy1174;
 	goto yy56;
-yy1107:
-	YYDEBUG(1107, *YYCURSOR);
+yy1115:
+	YYDEBUG(1115, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1165;
-	if (yych == 't') goto yy1165;
+	if (yych == 'T') goto yy1175;
+	if (yych == 't') goto yy1175;
 	goto yy56;
-yy1108:
-	YYDEBUG(1108, *YYCURSOR);
+yy1116:
+	YYDEBUG(1116, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy1034;
-	if (yych == 'h') goto yy1034;
+	if (yych == 'H') goto yy1041;
+	if (yych == 'h') goto yy1041;
 	goto yy56;
-yy1109:
-	YYDEBUG(1109, *YYCURSOR);
+yy1117:
+	YYDEBUG(1117, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy1112;
-	if (yych == 'r') goto yy1112;
+	if (yych == 'R') goto yy1120;
+	if (yych == 'r') goto yy1120;
 	goto yy56;
-yy1110:
-	YYDEBUG(1110, *YYCURSOR);
+yy1118:
+	YYDEBUG(1118, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy1166;
-	if (yych == 'n') goto yy1166;
+	if (yych == 'N') goto yy1176;
+	if (yych == 'n') goto yy1176;
 	goto yy56;
-yy1111:
-	YYDEBUG(1111, *YYCURSOR);
+yy1119:
+	YYDEBUG(1119, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1112;
+	if (yych == 'S') goto yy1120;
 	if (yych != 's') goto yy56;
-yy1112:
-	YYDEBUG(1112, *YYCURSOR);
+yy1120:
+	YYDEBUG(1120, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy1104;
-	if (yych == 'd') goto yy1104;
+	if (yych == 'D') goto yy1112;
+	if (yych == 'd') goto yy1112;
 	goto yy56;
-yy1113:
-	YYDEBUG(1113, *YYCURSOR);
+yy1121:
+	YYDEBUG(1121, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1111;
-	if (yych == 'e') goto yy1111;
+	if (yych == 'E') goto yy1119;
+	if (yych == 'e') goto yy1119;
 	goto yy56;
-yy1114:
-	YYDEBUG(1114, *YYCURSOR);
-	yyaccept = 31;
+yy1122:
+	YYDEBUG(1122, *YYCURSOR);
+	yyaccept = 30;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
-		if (yych == 'D') goto yy825;
-		if (yych >= 'S') goto yy1100;
+		if (yych == 'D') goto yy827;
+		if (yych >= 'S') goto yy1108;
 	} else {
 		if (yych <= 'd') {
-			if (yych >= 'd') goto yy825;
+			if (yych >= 'd') goto yy827;
 		} else {
-			if (yych == 's') goto yy1100;
+			if (yych == 's') goto yy1108;
 		}
 	}
-yy1115:
-	YYDEBUG(1115, *YYCURSOR);
-#line 1668 "parse_date.re"
+yy1123:
+	YYDEBUG(1123, *YYCURSOR);
+#line 1690 "parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -20537,9 +20592,9 @@ yy1115:
 		TIMELIB_HAVE_RELATIVE();
 
 		while(*ptr) {
-			i = timelib_get_relative_text((char **) &ptr, &behavior);
-			timelib_eat_spaces((char **) &ptr);
-			timelib_set_relative((char **) &ptr, i, behavior, s);
+			i = timelib_get_relative_text(&ptr, &behavior);
+			timelib_eat_spaces(&ptr);
+			timelib_set_relative(&ptr, i, behavior, s);
 			s->time->relative.weekday_behavior = 2;
 
 			/* to handle the format weekday + last/this/next week */
@@ -20551,19 +20606,19 @@ yy1115:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 20555 "<stdout>"
-yy1116:
-	YYDEBUG(1116, *YYCURSOR);
+#line 20610 "<stdout>"
+yy1124:
+	YYDEBUG(1124, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1167;
-	if (yych == 'o') goto yy1167;
+	if (yych == 'O') goto yy1177;
+	if (yych == 'o') goto yy1177;
 	goto yy56;
-yy1117:
-	YYDEBUG(1117, *YYCURSOR);
+yy1125:
+	YYDEBUG(1125, *YYCURSOR);
 	++YYCURSOR;
-yy1118:
-	YYDEBUG(1118, *YYCURSOR);
-#line 1016 "parse_date.re"
+yy1126:
+	YYDEBUG(1126, *YYCURSOR);
+#line 1021 "parse_date.re"
 	{
 		DEBUG_OUTPUT("yesterday");
 		TIMELIB_INIT;
@@ -20574,760 +20629,793 @@ yy1118:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 20578 "<stdout>"
-yy1119:
-	YYDEBUG(1119, *YYCURSOR);
-	yyaccept = 32;
+#line 20633 "<stdout>"
+yy1127:
+	YYDEBUG(1127, *YYCURSOR);
+	yyaccept = 31;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 128) {
-		goto yy917;
+		goto yy921;
 	}
 	if (yych <= '.') {
-		if (yych == '-') goto yy282;
-		goto yy1118;
+		if (yych == '-') goto yy283;
+		goto yy1126;
 	} else {
-		if (yych <= '/') goto yy282;
-		if (yych == '_') goto yy282;
-		goto yy1118;
+		if (yych <= '/') goto yy283;
+		if (yych == '_') goto yy283;
+		goto yy1126;
 	}
-yy1120:
-	YYDEBUG(1120, *YYCURSOR);
+yy1128:
+	YYDEBUG(1128, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1128;
+	if (yych <= '9') goto yy1138;
 	goto yy56;
-yy1121:
-	YYDEBUG(1121, *YYCURSOR);
+yy1129:
+	YYDEBUG(1129, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1128;
+	if (yych <= '1') goto yy1138;
 	goto yy56;
-yy1122:
-	YYDEBUG(1122, *YYCURSOR);
+yy1130:
+	YYDEBUG(1130, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == ':') goto yy1168;
+	if (yych <= '/') goto yy56;
+	if (yych <= '2') goto yy1178;
+	if (yych <= '3') goto yy1179;
 	goto yy56;
-yy1123:
-	YYDEBUG(1123, *YYCURSOR);
+yy1131:
+	YYDEBUG(1131, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy1180;
+	goto yy186;
+yy1132:
+	YYDEBUG(1132, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == ':') goto yy1181;
+	goto yy56;
+yy1133:
+	YYDEBUG(1133, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1125;
-	if (yych <= ':') goto yy1169;
+	if (yych <= '9') goto yy1135;
+	if (yych <= ':') goto yy1182;
 	goto yy56;
-yy1124:
-	YYDEBUG(1124, *YYCURSOR);
+yy1134:
+	YYDEBUG(1134, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '4') goto yy1125;
-	if (yych == ':') goto yy1169;
+	if (yych <= '4') goto yy1135;
+	if (yych == ':') goto yy1182;
 	goto yy56;
-yy1125:
-	YYDEBUG(1125, *YYCURSOR);
+yy1135:
+	YYDEBUG(1135, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == ':') goto yy1169;
+	if (yych == ':') goto yy1182;
 	goto yy56;
-yy1126:
-	YYDEBUG(1126, *YYCURSOR);
-	yyaccept = 16;
+yy1136:
+	YYDEBUG(1136, *YYCURSOR);
+	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy1061;
-	goto yy547;
-yy1127:
-	YYDEBUG(1127, *YYCURSOR);
-	yyaccept = 27;
+	if (yych == 'T') goto yy1070;
+	goto yy548;
+yy1137:
+	YYDEBUG(1137, *YYCURSOR);
+	yyaccept = 26;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych == 'T') goto yy1170;
-		if (yych <= 'm') goto yy996;
-		goto yy1062;
+		if (yych == 'T') goto yy1183;
+		if (yych <= 'm') goto yy1003;
+		goto yy1071;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy996;
-			goto yy1062;
+			if (yych <= 'q') goto yy1003;
+			goto yy1071;
 		} else {
-			if (yych <= 's') goto yy1063;
-			if (yych <= 't') goto yy1064;
-			goto yy996;
+			if (yych <= 's') goto yy1072;
+			if (yych <= 't') goto yy1073;
+			goto yy1003;
 		}
 	}
-yy1128:
-	YYDEBUG(1128, *YYCURSOR);
+yy1138:
+	YYDEBUG(1138, *YYCURSOR);
 	++YYCURSOR;
-	goto yy996;
-yy1129:
-	YYDEBUG(1129, *YYCURSOR);
-	yyaccept = 27;
+	goto yy1003;
+yy1139:
+	YYDEBUG(1139, *YYCURSOR);
+	yyaccept = 26;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'n') {
-		if (yych == '/') goto yy1128;
-		if (yych <= 'm') goto yy996;
-		goto yy1067;
+		if (yych == '/') goto yy1138;
+		if (yych <= 'm') goto yy1003;
+		goto yy1076;
 	} else {
 		if (yych <= 'r') {
-			if (yych <= 'q') goto yy996;
-			goto yy1067;
+			if (yych <= 'q') goto yy1003;
+			goto yy1076;
 		} else {
-			if (yych <= 's') goto yy1068;
-			if (yych <= 't') goto yy1069;
-			goto yy996;
+			if (yych <= 's') goto yy1077;
+			if (yych <= 't') goto yy1078;
+			goto yy1003;
 		}
 	}
-yy1130:
-	YYDEBUG(1130, *YYCURSOR);
+yy1140:
+	YYDEBUG(1140, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy1171;
+	if (yych <= '9') goto yy1184;
 	goto yy186;
-yy1131:
-	YYDEBUG(1131, *YYCURSOR);
+yy1141:
+	YYDEBUG(1141, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1172;
-	if (yych <= '9') goto yy1133;
-	if (yych <= ':') goto yy1173;
+	if (yych <= '5') goto yy1185;
+	if (yych <= '9') goto yy1143;
+	if (yych <= ':') goto yy1186;
 	goto yy56;
-yy1132:
-	YYDEBUG(1132, *YYCURSOR);
+yy1142:
+	YYDEBUG(1142, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '5') {
 		if (yych <= '/') goto yy56;
-		if (yych <= '4') goto yy1172;
-		goto yy1174;
+		if (yych <= '4') goto yy1185;
+		goto yy1187;
 	} else {
-		if (yych == ':') goto yy1173;
+		if (yych == ':') goto yy1186;
 		goto yy56;
 	}
-yy1133:
-	YYDEBUG(1133, *YYCURSOR);
+yy1143:
+	YYDEBUG(1143, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1174;
-	if (yych == ':') goto yy1173;
+	if (yych <= '5') goto yy1187;
+	if (yych == ':') goto yy1186;
 	goto yy56;
-yy1134:
-	YYDEBUG(1134, *YYCURSOR);
+yy1144:
+	YYDEBUG(1144, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1175;
-	if (yych <= '9') goto yy1136;
+	if (yych <= '5') goto yy1188;
+	if (yych <= '9') goto yy1146;
 	goto yy56;
-yy1135:
-	YYDEBUG(1135, *YYCURSOR);
+yy1145:
+	YYDEBUG(1145, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '4') goto yy1175;
-	if (yych <= '5') goto yy1174;
+	if (yych <= '4') goto yy1188;
+	if (yych <= '5') goto yy1187;
 	goto yy56;
-yy1136:
-	YYDEBUG(1136, *YYCURSOR);
+yy1146:
+	YYDEBUG(1146, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1174;
+	if (yych <= '5') goto yy1187;
 	goto yy56;
-yy1137:
-	YYDEBUG(1137, *YYCURSOR);
+yy1147:
+	YYDEBUG(1147, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == ' ') goto yy1176;
+	if (yych == ' ') goto yy1189;
 	goto yy56;
-yy1138:
-	YYDEBUG(1138, *YYCURSOR);
+yy1148:
+	YYDEBUG(1148, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy763;
-	if (yych == 'y') goto yy763;
+	if (yych == 'Y') goto yy765;
+	if (yych == 'y') goto yy765;
 	goto yy56;
-yy1139:
-	YYDEBUG(1139, *YYCURSOR);
+yy1149:
+	YYDEBUG(1149, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy763;
-	if (yych == 'r') goto yy763;
+	if (yych == 'R') goto yy765;
+	if (yych == 'r') goto yy765;
 	goto yy56;
-yy1140:
-	YYDEBUG(1140, *YYCURSOR);
+yy1150:
+	YYDEBUG(1150, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
-		if (yych == '.') goto yy1177;
+		if (yych == '.') goto yy1190;
 		goto yy56;
 	} else {
-		if (yych <= 'M') goto yy1178;
-		if (yych == 'm') goto yy1178;
+		if (yych <= 'M') goto yy1191;
+		if (yych == 'm') goto yy1191;
 		goto yy56;
 	}
-yy1141:
-	YYDEBUG(1141, *YYCURSOR);
+yy1151:
+	YYDEBUG(1151, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1023;
-	if (yych <= '9') goto yy1179;
-	goto yy1023;
-yy1142:
-	YYDEBUG(1142, *YYCURSOR);
+	if (yych <= '/') goto yy1030;
+	if (yych <= '9') goto yy1192;
+	goto yy1030;
+yy1152:
+	YYDEBUG(1152, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
-	YYDEBUG(1143, *YYCURSOR);
+	YYDEBUG(1153, *YYCURSOR);
 	if (yych <= 'A') {
 		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy1142;
+			if (yych == '\t') goto yy1152;
 			goto yy56;
 		} else {
-			if (yych <= ' ') goto yy1142;
+			if (yych <= ' ') goto yy1152;
 			if (yych <= '@') goto yy56;
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych != 'P') goto yy56;
 		} else {
-			if (yych <= 'a') goto yy1144;
+			if (yych <= 'a') goto yy1154;
 			if (yych != 'p') goto yy56;
 		}
 	}
-yy1144:
-	YYDEBUG(1144, *YYCURSOR);
+yy1154:
+	YYDEBUG(1154, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
-		if (yych == '.') goto yy1180;
+		if (yych == '.') goto yy1193;
 		goto yy56;
 	} else {
-		if (yych <= 'M') goto yy1181;
-		if (yych == 'm') goto yy1181;
+		if (yych <= 'M') goto yy1194;
+		if (yych == 'm') goto yy1194;
 		goto yy56;
 	}
-yy1145:
-	YYDEBUG(1145, *YYCURSOR);
+yy1155:
+	YYDEBUG(1155, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
-		if (yych == 'D') goto yy825;
+		if (yych == 'D') goto yy827;
 		if (yych <= 'R') goto yy56;
-		goto yy1100;
+		goto yy1108;
 	} else {
 		if (yych <= 'd') {
 			if (yych <= 'c') goto yy56;
-			goto yy825;
+			goto yy827;
 		} else {
-			if (yych == 's') goto yy1100;
+			if (yych == 's') goto yy1108;
 			goto yy56;
 		}
 	}
-yy1146:
-	YYDEBUG(1146, *YYCURSOR);
+yy1156:
+	YYDEBUG(1156, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
 	yych = *YYCURSOR;
-yy1147:
-	YYDEBUG(1147, *YYCURSOR);
+yy1157:
+	YYDEBUG(1157, *YYCURSOR);
 	if (yych <= '+') {
 		if (yych <= ' ') {
-			if (yych == '\t') goto yy1146;
+			if (yych == '\t') goto yy1156;
 			if (yych <= 0x1F) goto yy56;
-			goto yy1146;
+			goto yy1156;
 		} else {
-			if (yych == '(') goto yy1148;
+			if (yych == '(') goto yy1158;
 			if (yych <= '*') goto yy56;
-			goto yy1149;
+			goto yy1159;
 		}
 	} else {
 		if (yych <= 'F') {
-			if (yych == '-') goto yy1149;
+			if (yych == '-') goto yy1159;
 			if (yych <= '@') goto yy56;
-			goto yy1150;
+			goto yy1160;
 		} else {
 			if (yych <= 'Z') {
-				if (yych <= 'G') goto yy1151;
-				goto yy1150;
+				if (yych <= 'G') goto yy1161;
+				goto yy1160;
 			} else {
 				if (yych <= '`') goto yy56;
-				if (yych <= 'z') goto yy1152;
+				if (yych <= 'z') goto yy1162;
 				goto yy56;
 			}
 		}
 	}
-yy1148:
-	YYDEBUG(1148, *YYCURSOR);
+yy1158:
+	YYDEBUG(1158, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') goto yy56;
-	if (yych <= 'Z') goto yy1152;
+	if (yych <= 'Z') goto yy1162;
 	if (yych <= '`') goto yy56;
-	if (yych <= 'z') goto yy1152;
+	if (yych <= 'z') goto yy1162;
 	goto yy56;
-yy1149:
-	YYDEBUG(1149, *YYCURSOR);
+yy1159:
+	YYDEBUG(1159, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1182;
-	if (yych <= '2') goto yy1183;
-	if (yych <= '9') goto yy1184;
+	if (yych <= '1') goto yy1195;
+	if (yych <= '2') goto yy1196;
+	if (yych <= '9') goto yy1197;
 	goto yy56;
-yy1150:
-	YYDEBUG(1150, *YYCURSOR);
+yy1160:
+	YYDEBUG(1160, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
-		if (yych == ')') goto yy1028;
-		goto yy818;
+		if (yych == ')') goto yy1035;
+		goto yy820;
 	} else {
-		if (yych <= 'Z') goto yy1185;
-		if (yych <= '`') goto yy818;
-		if (yych <= 'z') goto yy1186;
-		goto yy818;
+		if (yych <= 'Z') goto yy1198;
+		if (yych <= '`') goto yy820;
+		if (yych <= 'z') goto yy1199;
+		goto yy820;
 	}
-yy1151:
-	YYDEBUG(1151, *YYCURSOR);
+yy1161:
+	YYDEBUG(1161, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
-		if (yych == ')') goto yy1028;
-		if (yych <= '@') goto yy818;
-		goto yy1185;
+		if (yych == ')') goto yy1035;
+		if (yych <= '@') goto yy820;
+		goto yy1198;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= 'M') goto yy1187;
-			goto yy1185;
+			if (yych <= 'M') goto yy1200;
+			goto yy1198;
 		} else {
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1186;
-			goto yy818;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1199;
+			goto yy820;
 		}
 	}
-yy1152:
-	YYDEBUG(1152, *YYCURSOR);
+yy1162:
+	YYDEBUG(1162, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
-		if (yych == ')') goto yy1028;
-		goto yy818;
+		if (yych == ')') goto yy1035;
+		goto yy820;
 	} else {
-		if (yych <= 'Z') goto yy1185;
-		if (yych <= '`') goto yy818;
-		if (yych <= 'z') goto yy1185;
-		goto yy818;
+		if (yych <= 'Z') goto yy1198;
+		if (yych <= '`') goto yy820;
+		if (yych <= 'z') goto yy1198;
+		goto yy820;
 	}
-yy1153:
-	YYDEBUG(1153, *YYCURSOR);
+yy1163:
+	YYDEBUG(1163, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
 	yych = *YYCURSOR;
-yy1154:
-	YYDEBUG(1154, *YYCURSOR);
+yy1164:
+	YYDEBUG(1164, *YYCURSOR);
 	if (yych <= '@') {
 		if (yych <= '\'') {
 			if (yych <= '\t') {
 				if (yych <= 0x08) goto yy56;
-				goto yy1153;
+				goto yy1163;
 			} else {
-				if (yych == ' ') goto yy1153;
+				if (yych == ' ') goto yy1163;
 				goto yy56;
 			}
 		} else {
 			if (yych <= '+') {
-				if (yych <= '(') goto yy1148;
+				if (yych <= '(') goto yy1158;
 				if (yych <= '*') goto yy56;
-				goto yy1149;
+				goto yy1159;
 			} else {
-				if (yych == '-') goto yy1149;
+				if (yych == '-') goto yy1159;
 				goto yy56;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
 			if (yych <= 'G') {
-				if (yych <= 'A') goto yy1155;
-				if (yych <= 'F') goto yy1150;
-				goto yy1151;
+				if (yych <= 'A') goto yy1165;
+				if (yych <= 'F') goto yy1160;
+				goto yy1161;
 			} else {
-				if (yych != 'P') goto yy1150;
+				if (yych != 'P') goto yy1160;
 			}
 		} else {
 			if (yych <= 'o') {
 				if (yych <= '`') goto yy56;
-				if (yych <= 'a') goto yy1156;
-				goto yy1152;
+				if (yych <= 'a') goto yy1166;
+				goto yy1162;
 			} else {
-				if (yych <= 'p') goto yy1156;
-				if (yych <= 'z') goto yy1152;
+				if (yych <= 'p') goto yy1166;
+				if (yych <= 'z') goto yy1162;
 				goto yy56;
 			}
 		}
 	}
-yy1155:
-	YYDEBUG(1155, *YYCURSOR);
-	yyaccept = 21;
+yy1165:
+	YYDEBUG(1165, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
 		if (yych <= '-') {
-			if (yych == ')') goto yy1028;
-			goto yy818;
+			if (yych == ')') goto yy1035;
+			goto yy820;
 		} else {
-			if (yych <= '.') goto yy1098;
-			if (yych <= '@') goto yy818;
-			goto yy1185;
+			if (yych <= '.') goto yy1106;
+			if (yych <= '@') goto yy820;
+			goto yy1198;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'M') goto yy1188;
-			if (yych <= 'Z') goto yy1185;
-			goto yy818;
+			if (yych <= 'M') goto yy1201;
+			if (yych <= 'Z') goto yy1198;
+			goto yy820;
 		} else {
-			if (yych == 'm') goto yy1189;
-			if (yych <= 'z') goto yy1186;
-			goto yy818;
+			if (yych == 'm') goto yy1202;
+			if (yych <= 'z') goto yy1199;
+			goto yy820;
 		}
 	}
-yy1156:
-	YYDEBUG(1156, *YYCURSOR);
-	yyaccept = 21;
+yy1166:
+	YYDEBUG(1166, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
 		if (yych <= '-') {
-			if (yych == ')') goto yy1028;
-			goto yy818;
+			if (yych == ')') goto yy1035;
+			goto yy820;
 		} else {
-			if (yych <= '.') goto yy1098;
-			if (yych <= '@') goto yy818;
-			goto yy1185;
+			if (yych <= '.') goto yy1106;
+			if (yych <= '@') goto yy820;
+			goto yy1198;
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'M') goto yy1188;
-			if (yych <= 'Z') goto yy1185;
-			goto yy818;
+			if (yych <= 'M') goto yy1201;
+			if (yych <= 'Z') goto yy1198;
+			goto yy820;
 		} else {
-			if (yych == 'm') goto yy1188;
-			if (yych <= 'z') goto yy1185;
-			goto yy818;
+			if (yych == 'm') goto yy1201;
+			if (yych <= 'z') goto yy1198;
+			goto yy820;
 		}
 	}
-yy1157:
-	YYDEBUG(1157, *YYCURSOR);
+yy1167:
+	YYDEBUG(1167, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(1158, *YYCURSOR);
-#line 1733 "parse_date.re"
+	YYDEBUG(1168, *YYCURSOR);
+#line 1755 "parse_date.re"
 	{
 		DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
 
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
 		if (*ptr == ':' || *ptr == '.') {
-			s->time->s = timelib_get_nr((char **) &ptr, 2);
+			s->time->s = timelib_get_nr(&ptr, 2);
 
 			if (*ptr == '.') {
-				s->time->us = timelib_get_frac_nr((char **) &ptr, 8);
+				s->time->us = timelib_get_frac_nr(&ptr, 8);
 			}
 		}
 
-		s->time->h += timelib_meridian((char **) &ptr, s->time->h);
+		s->time->h += timelib_meridian(&ptr, s->time->h);
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 21023 "<stdout>"
-yy1159:
-	YYDEBUG(1159, *YYCURSOR);
+#line 21092 "<stdout>"
+yy1169:
+	YYDEBUG(1169, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy1157;
+		if (yych <= 0x00) goto yy1167;
 		if (yych <= 0x08) goto yy56;
-		goto yy1157;
+		goto yy1167;
 	} else {
-		if (yych == ' ') goto yy1157;
+		if (yych == ' ') goto yy1167;
 		goto yy56;
 	}
-yy1160:
-	YYDEBUG(1160, *YYCURSOR);
+yy1170:
+	YYDEBUG(1170, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy1161;
+	if (yych == 'N') goto yy1171;
 	if (yych != 'n') goto yy56;
-yy1161:
-	YYDEBUG(1161, *YYCURSOR);
+yy1171:
+	YYDEBUG(1171, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy1190;
-	if (yych == 'i') goto yy1190;
+	if (yych == 'I') goto yy1203;
+	if (yych == 'i') goto yy1203;
 	goto yy56;
-yy1162:
-	YYDEBUG(1162, *YYCURSOR);
+yy1172:
+	YYDEBUG(1172, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy1191;
-	if (yych == 'f') goto yy1191;
+	if (yych == 'F') goto yy1204;
+	if (yych == 'f') goto yy1204;
 	goto yy56;
-yy1163:
-	YYDEBUG(1163, *YYCURSOR);
+yy1173:
+	YYDEBUG(1173, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1193;
-	if (yych == 'y') goto yy1193;
+	if (yych == 'Y') goto yy1206;
+	if (yych == 'y') goto yy1206;
 	goto yy56;
-yy1164:
-	YYDEBUG(1164, *YYCURSOR);
+yy1174:
+	YYDEBUG(1174, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy1194;
-	if (yych == 's') goto yy1194;
+	if (yych == 'S') goto yy1207;
+	if (yych == 's') goto yy1207;
 	goto yy56;
-yy1165:
-	YYDEBUG(1165, *YYCURSOR);
+yy1175:
+	YYDEBUG(1175, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1034;
-	if (yych == 'e') goto yy1034;
+	if (yych == 'E') goto yy1041;
+	if (yych == 'e') goto yy1041;
 	goto yy56;
-yy1166:
-	YYDEBUG(1166, *YYCURSOR);
+yy1176:
+	YYDEBUG(1176, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy1034;
-	if (yych == 'd') goto yy1034;
+	if (yych == 'D') goto yy1041;
+	if (yych == 'd') goto yy1041;
 	goto yy56;
-yy1167:
-	YYDEBUG(1167, *YYCURSOR);
+yy1177:
+	YYDEBUG(1177, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy1195;
-	if (yych == 'f') goto yy1195;
+	if (yych == 'F') goto yy1208;
+	if (yych == 'f') goto yy1208;
 	goto yy56;
-yy1168:
-	YYDEBUG(1168, *YYCURSOR);
+yy1178:
+	YYDEBUG(1178, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1197;
-	if (yych <= '2') goto yy1198;
+	if (yych <= '9') goto yy1210;
 	goto yy56;
-yy1169:
-	YYDEBUG(1169, *YYCURSOR);
+yy1179:
+	YYDEBUG(1179, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1199;
-	if (yych <= '9') goto yy1200;
+	if (yych <= '1') goto yy1210;
 	goto yy56;
-yy1170:
-	YYDEBUG(1170, *YYCURSOR);
+yy1180:
+	YYDEBUG(1180, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy1212;
+	goto yy186;
+yy1181:
+	YYDEBUG(1181, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1201;
-	if (yych <= '2') goto yy1202;
-	if (yych <= '9') goto yy1125;
+	if (yych <= '1') goto yy1213;
+	if (yych <= '2') goto yy1214;
 	goto yy56;
-yy1171:
-	YYDEBUG(1171, *YYCURSOR);
+yy1182:
+	YYDEBUG(1182, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '5') goto yy1215;
+	if (yych <= '9') goto yy1216;
+	goto yy56;
+yy1183:
+	YYDEBUG(1183, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych <= '1') goto yy1217;
+	if (yych <= '2') goto yy1218;
+	if (yych <= '9') goto yy1135;
+	goto yy56;
+yy1184:
+	YYDEBUG(1184, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
-	if (yych <= '9') goto yy1203;
+	if (yych <= '9') goto yy1219;
 	goto yy186;
-yy1172:
-	YYDEBUG(1172, *YYCURSOR);
+yy1185:
+	YYDEBUG(1185, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1204;
-	if (yych <= '9') goto yy1205;
+	if (yych <= '5') goto yy1220;
+	if (yych <= '9') goto yy1221;
 	if (yych >= ';') goto yy56;
-yy1173:
-	YYDEBUG(1173, *YYCURSOR);
+yy1186:
+	YYDEBUG(1186, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1206;
+	if (yych <= '5') goto yy1222;
 	goto yy56;
-yy1174:
-	YYDEBUG(1174, *YYCURSOR);
+yy1187:
+	YYDEBUG(1187, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1205;
+	if (yych <= '9') goto yy1221;
 	goto yy56;
-yy1175:
-	YYDEBUG(1175, *YYCURSOR);
+yy1188:
+	YYDEBUG(1188, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1204;
-	if (yych <= '9') goto yy1205;
+	if (yych <= '5') goto yy1220;
+	if (yych <= '9') goto yy1221;
 	goto yy56;
-yy1176:
-	YYDEBUG(1176, *YYCURSOR);
+yy1189:
+	YYDEBUG(1189, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1207;
-	if (yych <= '2') goto yy1208;
+	if (yych <= '1') goto yy1223;
+	if (yych <= '2') goto yy1224;
 	goto yy56;
-yy1177:
-	YYDEBUG(1177, *YYCURSOR);
+yy1190:
+	YYDEBUG(1190, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy1178;
+	if (yych == 'M') goto yy1191;
 	if (yych != 'm') goto yy56;
-yy1178:
-	YYDEBUG(1178, *YYCURSOR);
+yy1191:
+	YYDEBUG(1191, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy1209;
-		if (yych == '\t') goto yy1209;
+		if (yych <= 0x00) goto yy1225;
+		if (yych == '\t') goto yy1225;
 		goto yy56;
 	} else {
-		if (yych <= ' ') goto yy1209;
-		if (yych == '.') goto yy1211;
+		if (yych <= ' ') goto yy1225;
+		if (yych == '.') goto yy1227;
 		goto yy56;
 	}
-yy1179:
-	YYDEBUG(1179, *YYCURSOR);
+yy1192:
+	YYDEBUG(1192, *YYCURSOR);
 	++YYCURSOR;
-	goto yy1023;
-yy1180:
-	YYDEBUG(1180, *YYCURSOR);
+	goto yy1030;
+yy1193:
+	YYDEBUG(1193, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy1181;
+	if (yych == 'M') goto yy1194;
 	if (yych != 'm') goto yy56;
-yy1181:
-	YYDEBUG(1181, *YYCURSOR);
+yy1194:
+	YYDEBUG(1194, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 0x1F) {
-		if (yych <= 0x00) goto yy1212;
-		if (yych == '\t') goto yy1212;
+		if (yych <= 0x00) goto yy1228;
+		if (yych == '\t') goto yy1228;
 		goto yy56;
 	} else {
-		if (yych <= ' ') goto yy1212;
-		if (yych == '.') goto yy1213;
+		if (yych <= ' ') goto yy1228;
+		if (yych == '.') goto yy1229;
 		goto yy56;
 	}
-yy1182:
-	YYDEBUG(1182, *YYCURSOR);
+yy1195:
+	YYDEBUG(1195, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy818;
-	if (yych <= '9') goto yy1184;
-	if (yych <= ':') goto yy1214;
-	goto yy818;
-yy1183:
-	YYDEBUG(1183, *YYCURSOR);
+	if (yych <= '/') goto yy820;
+	if (yych <= '9') goto yy1197;
+	if (yych <= ':') goto yy1230;
+	goto yy820;
+yy1196:
+	YYDEBUG(1196, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '5') {
-		if (yych <= '/') goto yy818;
-		if (yych >= '5') goto yy1215;
+		if (yych <= '/') goto yy820;
+		if (yych >= '5') goto yy1231;
 	} else {
-		if (yych <= '9') goto yy1028;
-		if (yych <= ':') goto yy1214;
-		goto yy818;
+		if (yych <= '9') goto yy1035;
+		if (yych <= ':') goto yy1230;
+		goto yy820;
 	}
-yy1184:
-	YYDEBUG(1184, *YYCURSOR);
+yy1197:
+	YYDEBUG(1197, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy818;
-	if (yych <= '5') goto yy1215;
-	if (yych <= '9') goto yy1028;
-	if (yych <= ':') goto yy1214;
-	goto yy818;
-yy1185:
-	YYDEBUG(1185, *YYCURSOR);
+	if (yych <= '/') goto yy820;
+	if (yych <= '5') goto yy1231;
+	if (yych <= '9') goto yy1035;
+	if (yych <= ':') goto yy1230;
+	goto yy820;
+yy1198:
+	YYDEBUG(1198, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
-		if (yych == ')') goto yy1028;
-		goto yy818;
+		if (yych == ')') goto yy1035;
+		goto yy820;
 	} else {
-		if (yych <= 'Z') goto yy1216;
-		if (yych <= '`') goto yy818;
-		if (yych <= 'z') goto yy1216;
-		goto yy818;
+		if (yych <= 'Z') goto yy1232;
+		if (yych <= '`') goto yy820;
+		if (yych <= 'z') goto yy1232;
+		goto yy820;
 	}
-yy1186:
-	YYDEBUG(1186, *YYCURSOR);
-	yyaccept = 21;
+yy1199:
+	YYDEBUG(1199, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
-			if (yych == ')') goto yy1028;
-			goto yy818;
+			if (yych == ')') goto yy1035;
+			goto yy820;
 		} else {
-			if (yych == '.') goto yy818;
-			goto yy1217;
+			if (yych == '.') goto yy820;
+			goto yy1233;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy818;
-			if (yych <= 'Z') goto yy1216;
-			goto yy818;
+			if (yych <= '@') goto yy820;
+			if (yych <= 'Z') goto yy1232;
+			goto yy820;
 		} else {
-			if (yych <= '_') goto yy1217;
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1218;
-			goto yy818;
+			if (yych <= '_') goto yy1233;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1234;
+			goto yy820;
 		}
 	}
-yy1187:
-	YYDEBUG(1187, *YYCURSOR);
+yy1200:
+	YYDEBUG(1200, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
-		if (yych == ')') goto yy1028;
-		if (yych <= '@') goto yy818;
-		goto yy1216;
+		if (yych == ')') goto yy1035;
+		if (yych <= '@') goto yy820;
+		goto yy1232;
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= 'T') goto yy1219;
-			goto yy1216;
+			if (yych <= 'T') goto yy1235;
+			goto yy1232;
 		} else {
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1216;
-			goto yy818;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1232;
+			goto yy820;
 		}
 	}
-yy1188:
-	YYDEBUG(1188, *YYCURSOR);
-	yyaccept = 21;
+yy1201:
+	YYDEBUG(1201, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ')') {
 		if (yych <= '\t') {
-			if (yych <= 0x00) goto yy1157;
-			if (yych <= 0x08) goto yy818;
-			goto yy1157;
+			if (yych <= 0x00) goto yy1167;
+			if (yych <= 0x08) goto yy820;
+			goto yy1167;
 		} else {
-			if (yych == ' ') goto yy1157;
-			if (yych <= '(') goto yy818;
-			goto yy1028;
+			if (yych == ' ') goto yy1167;
+			if (yych <= '(') goto yy820;
+			goto yy1035;
 		}
 	} else {
 		if (yych <= '@') {
-			if (yych == '.') goto yy1159;
-			goto yy818;
+			if (yych == '.') goto yy1169;
+			goto yy820;
 		} else {
-			if (yych <= 'Z') goto yy1216;
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1216;
-			goto yy818;
+			if (yych <= 'Z') goto yy1232;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1232;
+			goto yy820;
 		}
 	}
-yy1189:
-	YYDEBUG(1189, *YYCURSOR);
-	yyaccept = 21;
+yy1202:
+	YYDEBUG(1202, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
 		if (yych <= 0x1F) {
-			if (yych <= 0x00) goto yy1157;
-			if (yych == '\t') goto yy1157;
-			goto yy818;
+			if (yych <= 0x00) goto yy1167;
+			if (yych == '\t') goto yy1167;
+			goto yy820;
 		} else {
 			if (yych <= '(') {
-				if (yych <= ' ') goto yy1157;
-				goto yy818;
+				if (yych <= ' ') goto yy1167;
+				goto yy820;
 			} else {
-				if (yych <= ')') goto yy1028;
-				if (yych <= ',') goto yy818;
-				goto yy1217;
+				if (yych <= ')') goto yy1035;
+				if (yych <= ',') goto yy820;
+				goto yy1233;
 			}
 		}
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '.') goto yy1159;
-			if (yych <= '/') goto yy1217;
-			if (yych <= '@') goto yy818;
-			goto yy1216;
+			if (yych <= '.') goto yy1169;
+			if (yych <= '/') goto yy1233;
+			if (yych <= '@') goto yy820;
+			goto yy1232;
 		} else {
 			if (yych <= '_') {
-				if (yych <= '^') goto yy818;
-				goto yy1217;
+				if (yych <= '^') goto yy820;
+				goto yy1233;
 			} else {
-				if (yych <= '`') goto yy818;
-				if (yych <= 'z') goto yy1218;
-				goto yy818;
+				if (yych <= '`') goto yy820;
+				if (yych <= 'z') goto yy1234;
+				goto yy820;
 			}
 		}
 	}
-yy1190:
-	YYDEBUG(1190, *YYCURSOR);
+yy1203:
+	YYDEBUG(1203, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy1220;
-	if (yych == 'g') goto yy1220;
+	if (yych == 'G') goto yy1236;
+	if (yych == 'g') goto yy1236;
 	goto yy56;
-yy1191:
-	YYDEBUG(1191, *YYCURSOR);
+yy1204:
+	YYDEBUG(1204, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(1192, *YYCURSOR);
-#line 1165 "parse_date.re"
+	YYDEBUG(1205, *YYCURSOR);
+#line 1175 "parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -21336,37 +21424,37 @@ yy1191:
 		TIMELIB_HAVE_RELATIVE();
 		TIMELIB_HAVE_SPECIAL_RELATIVE();
 
-		i = timelib_get_relative_text((char **) &ptr, &behavior);
-		timelib_eat_spaces((char **) &ptr);
+		i = timelib_get_relative_text(&ptr, &behavior);
+		timelib_eat_spaces(&ptr);
 		if (i > 0) { /* first, second... etc */
 			s->time->relative.special.type = TIMELIB_SPECIAL_DAY_OF_WEEK_IN_MONTH;
-			timelib_set_relative((char **) &ptr, i, 1, s);
+			timelib_set_relative(&ptr, i, 1, s);
 		} else { /* last */
 			s->time->relative.special.type = TIMELIB_SPECIAL_LAST_DAY_OF_WEEK_IN_MONTH;
-			timelib_set_relative((char **) &ptr, i, behavior, s);
+			timelib_set_relative(&ptr, i, behavior, s);
 		}
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEK_DAY_OF_MONTH;
 	}
-#line 21352 "<stdout>"
-yy1193:
-	YYDEBUG(1193, *YYCURSOR);
-	yyaccept = 25;
+#line 21440 "<stdout>"
+yy1206:
+	YYDEBUG(1206, *YYCURSOR);
+	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '\t') goto yy1102;
-	if (yych == ' ') goto yy1102;
-	goto yy940;
-yy1194:
-	YYDEBUG(1194, *YYCURSOR);
+	if (yych == '\t') goto yy1110;
+	if (yych == ' ') goto yy1110;
+	goto yy944;
+yy1207:
+	YYDEBUG(1207, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy1221;
-	if (yych == 'e') goto yy1221;
+	if (yych == 'E') goto yy1237;
+	if (yych == 'e') goto yy1237;
 	goto yy56;
-yy1195:
-	YYDEBUG(1195, *YYCURSOR);
+yy1208:
+	YYDEBUG(1208, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(1196, *YYCURSOR);
-#line 1125 "parse_date.re"
+	YYDEBUG(1209, *YYCURSOR);
+#line 1135 "parse_date.re"
 	{
 		DEBUG_OUTPUT("firstdayof | lastdayof");
 		TIMELIB_INIT;
@@ -21382,378 +21470,415 @@ yy1195:
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 21386 "<stdout>"
-yy1197:
-	YYDEBUG(1197, *YYCURSOR);
+#line 21474 "<stdout>"
+yy1210:
+	YYDEBUG(1210, *YYCURSOR);
+	++YYCURSOR;
+	YYDEBUG(1211, *YYCURSOR);
+#line 1368 "parse_date.re"
+	{
+		DEBUG_OUTPUT("iso8601datex");
+		TIMELIB_INIT;
+		TIMELIB_HAVE_DATE();
+		s->time->y = timelib_get_unsigned_nr(&ptr, 19);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		TIMELIB_DEINIT;
+		return TIMELIB_ISO_DATE;
+	}
+#line 21490 "<stdout>"
+yy1212:
+	YYDEBUG(1212, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy1238;
+	goto yy186;
+yy1213:
+	YYDEBUG(1213, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1222;
+	if (yych <= '9') goto yy1239;
 	goto yy56;
-yy1198:
-	YYDEBUG(1198, *YYCURSOR);
+yy1214:
+	YYDEBUG(1214, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '4') goto yy1222;
+	if (yych <= '4') goto yy1239;
 	goto yy56;
-yy1199:
-	YYDEBUG(1199, *YYCURSOR);
+yy1215:
+	YYDEBUG(1215, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1200;
-	if (yych <= ':') goto yy1223;
+	if (yych <= '9') goto yy1216;
+	if (yych <= ':') goto yy1240;
 	goto yy56;
-yy1200:
-	YYDEBUG(1200, *YYCURSOR);
+yy1216:
+	YYDEBUG(1216, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == ':') goto yy1223;
+	if (yych == ':') goto yy1240;
 	goto yy56;
-yy1201:
-	YYDEBUG(1201, *YYCURSOR);
+yy1217:
+	YYDEBUG(1217, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1224;
-	if (yych <= ':') goto yy1169;
+	if (yych <= '9') goto yy1241;
+	if (yych <= ':') goto yy1182;
 	goto yy56;
-yy1202:
-	YYDEBUG(1202, *YYCURSOR);
+yy1218:
+	YYDEBUG(1218, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '4') goto yy1224;
-	if (yych == ':') goto yy1169;
+	if (yych <= '4') goto yy1241;
+	if (yych == ':') goto yy1182;
 	goto yy56;
-yy1203:
-	YYDEBUG(1203, *YYCURSOR);
+yy1219:
+	YYDEBUG(1219, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy186;
 	if (yych <= '9') goto yy185;
 	goto yy186;
-yy1204:
-	YYDEBUG(1204, *YYCURSOR);
+yy1220:
+	YYDEBUG(1220, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1223;
-	if (yych <= '6') goto yy1225;
+	if (yych <= '5') goto yy1240;
+	if (yych <= '6') goto yy1242;
 	if (yych >= ':') goto yy56;
-yy1205:
-	YYDEBUG(1205, *YYCURSOR);
+yy1221:
+	YYDEBUG(1221, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1226;
-	if (yych <= '6') goto yy1227;
+	if (yych <= '5') goto yy1243;
+	if (yych <= '6') goto yy1244;
 	goto yy56;
-yy1206:
-	YYDEBUG(1206, *YYCURSOR);
+yy1222:
+	YYDEBUG(1222, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1228;
+	if (yych <= '9') goto yy1245;
 	goto yy56;
-yy1207:
-	YYDEBUG(1207, *YYCURSOR);
+yy1223:
+	YYDEBUG(1223, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1229;
+	if (yych <= '9') goto yy1246;
 	goto yy56;
-yy1208:
-	YYDEBUG(1208, *YYCURSOR);
+yy1224:
+	YYDEBUG(1224, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '4') goto yy1229;
+	if (yych <= '4') goto yy1246;
 	goto yy56;
-yy1209:
-	YYDEBUG(1209, *YYCURSOR);
+yy1225:
+	YYDEBUG(1225, *YYCURSOR);
 	++YYCURSOR;
-	YYDEBUG(1210, *YYCURSOR);
-#line 1204 "parse_date.re"
+	YYDEBUG(1226, *YYCURSOR);
+#line 1214 "parse_date.re"
 	{
 		DEBUG_OUTPUT("mssqltime");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
 		if (*ptr == ':' || *ptr == '.') {
-			s->time->s = timelib_get_nr((char **) &ptr, 2);
+			s->time->s = timelib_get_nr(&ptr, 2);
 
 			if (*ptr == ':' || *ptr == '.') {
-				s->time->us = timelib_get_frac_nr((char **) &ptr, 8);
+				s->time->us = timelib_get_frac_nr(&ptr, 8);
 			}
 		}
-		timelib_eat_spaces((char **) &ptr);
-		s->time->h += timelib_meridian((char **) &ptr, s->time->h);
+		timelib_eat_spaces(&ptr);
+		s->time->h += timelib_meridian(&ptr, s->time->h);
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 21486 "<stdout>"
-yy1211:
-	YYDEBUG(1211, *YYCURSOR);
+#line 21597 "<stdout>"
+yy1227:
+	YYDEBUG(1227, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy1209;
+		if (yych <= 0x00) goto yy1225;
 		if (yych <= 0x08) goto yy56;
-		goto yy1209;
+		goto yy1225;
 	} else {
-		if (yych == ' ') goto yy1209;
+		if (yych == ' ') goto yy1225;
 		goto yy56;
 	}
-yy1212:
-	YYDEBUG(1212, *YYCURSOR);
+yy1228:
+	YYDEBUG(1228, *YYCURSOR);
 	++YYCURSOR;
-	goto yy1092;
-yy1213:
-	YYDEBUG(1213, *YYCURSOR);
+	goto yy1100;
+yy1229:
+	YYDEBUG(1229, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '\t') {
-		if (yych <= 0x00) goto yy1212;
+		if (yych <= 0x00) goto yy1228;
 		if (yych <= 0x08) goto yy56;
-		goto yy1212;
+		goto yy1228;
 	} else {
-		if (yych == ' ') goto yy1212;
+		if (yych == ' ') goto yy1228;
 		goto yy56;
 	}
-yy1214:
-	YYDEBUG(1214, *YYCURSOR);
+yy1230:
+	YYDEBUG(1230, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy818;
-	if (yych <= '5') goto yy1215;
-	if (yych <= '9') goto yy1028;
-	goto yy818;
-yy1215:
-	YYDEBUG(1215, *YYCURSOR);
+	if (yych <= '/') goto yy820;
+	if (yych <= '5') goto yy1231;
+	if (yych <= '9') goto yy1035;
+	goto yy820;
+yy1231:
+	YYDEBUG(1231, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy818;
-	if (yych <= '9') goto yy1028;
-	goto yy818;
-yy1216:
-	YYDEBUG(1216, *YYCURSOR);
+	if (yych <= '/') goto yy820;
+	if (yych <= '9') goto yy1035;
+	goto yy820;
+yy1232:
+	YYDEBUG(1232, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
-		if (yych == ')') goto yy1028;
-		goto yy818;
+		if (yych == ')') goto yy1035;
+		goto yy820;
 	} else {
-		if (yych <= 'Z') goto yy1230;
-		if (yych <= '`') goto yy818;
-		if (yych <= 'z') goto yy1230;
-		goto yy818;
+		if (yych <= 'Z') goto yy1247;
+		if (yych <= '`') goto yy820;
+		if (yych <= 'z') goto yy1247;
+		goto yy820;
 	}
-yy1217:
-	YYDEBUG(1217, *YYCURSOR);
+yy1233:
+	YYDEBUG(1233, *YYCURSOR);
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yych <= '@') goto yy56;
-	if (yych <= 'Z') goto yy1231;
+	if (yych <= 'Z') goto yy1248;
 	if (yych <= '`') goto yy56;
-	if (yych <= 'z') goto yy1231;
+	if (yych <= 'z') goto yy1248;
 	goto yy56;
-yy1218:
-	YYDEBUG(1218, *YYCURSOR);
-	yyaccept = 21;
+yy1234:
+	YYDEBUG(1234, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
-			if (yych == ')') goto yy1028;
-			goto yy818;
+			if (yych == ')') goto yy1035;
+			goto yy820;
 		} else {
-			if (yych == '.') goto yy818;
-			goto yy1217;
+			if (yych == '.') goto yy820;
+			goto yy1233;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy818;
-			if (yych <= 'Z') goto yy1230;
-			goto yy818;
+			if (yych <= '@') goto yy820;
+			if (yych <= 'Z') goto yy1247;
+			goto yy820;
 		} else {
-			if (yych <= '_') goto yy1217;
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1233;
-			goto yy818;
+			if (yych <= '_') goto yy1233;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1250;
+			goto yy820;
 		}
 	}
-yy1219:
-	YYDEBUG(1219, *YYCURSOR);
-	yyaccept = 21;
+yy1235:
+	YYDEBUG(1235, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= ',') {
 		if (yych <= ')') {
-			if (yych <= '(') goto yy818;
-			goto yy1028;
+			if (yych <= '(') goto yy820;
+			goto yy1035;
 		} else {
-			if (yych == '+') goto yy1149;
-			goto yy818;
+			if (yych == '+') goto yy1159;
+			goto yy820;
 		}
 	} else {
 		if (yych <= 'Z') {
-			if (yych <= '-') goto yy1149;
-			if (yych <= '@') goto yy818;
-			goto yy1230;
+			if (yych <= '-') goto yy1159;
+			if (yych <= '@') goto yy820;
+			goto yy1247;
 		} else {
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1230;
-			goto yy818;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1247;
+			goto yy820;
 		}
 	}
-yy1220:
-	YYDEBUG(1220, *YYCURSOR);
+yy1236:
+	YYDEBUG(1236, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy1234;
-	if (yych == 'h') goto yy1234;
+	if (yych == 'H') goto yy1251;
+	if (yych == 'h') goto yy1251;
 	goto yy56;
-yy1221:
-	YYDEBUG(1221, *YYCURSOR);
+yy1237:
+	YYDEBUG(1237, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy1235;
-	if (yych == 'c') goto yy1235;
+	if (yych == 'C') goto yy1252;
+	if (yych == 'c') goto yy1252;
 	goto yy56;
-yy1222:
-	YYDEBUG(1222, *YYCURSOR);
+yy1238:
+	YYDEBUG(1238, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy1253;
+	goto yy186;
+yy1239:
+	YYDEBUG(1239, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == ':') goto yy1236;
+	if (yych == ':') goto yy1254;
 	goto yy56;
-yy1223:
-	YYDEBUG(1223, *YYCURSOR);
+yy1240:
+	YYDEBUG(1240, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1237;
-	if (yych <= '6') goto yy1239;
-	if (yych <= '9') goto yy1240;
+	if (yych <= '5') goto yy1255;
+	if (yych <= '6') goto yy1257;
+	if (yych <= '9') goto yy1258;
 	goto yy56;
-yy1224:
-	YYDEBUG(1224, *YYCURSOR);
+yy1241:
+	YYDEBUG(1241, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == ':') goto yy1241;
+	if (yych == ':') goto yy1259;
 	goto yy56;
-yy1225:
-	YYDEBUG(1225, *YYCURSOR);
+yy1242:
+	YYDEBUG(1242, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '0') goto yy1237;
-	if (yych <= '5') goto yy1226;
-	if (yych <= '6') goto yy1227;
+	if (yych <= '0') goto yy1255;
+	if (yych <= '5') goto yy1243;
+	if (yych <= '6') goto yy1244;
 	goto yy56;
-yy1226:
-	YYDEBUG(1226, *YYCURSOR);
+yy1243:
+	YYDEBUG(1243, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1240;
+	if (yych <= '9') goto yy1258;
 	goto yy56;
-yy1227:
-	YYDEBUG(1227, *YYCURSOR);
+yy1244:
+	YYDEBUG(1244, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '0') goto yy1240;
+	if (yych == '0') goto yy1258;
 	goto yy56;
-yy1228:
-	YYDEBUG(1228, *YYCURSOR);
+yy1245:
+	YYDEBUG(1245, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == ':') goto yy1205;
+	if (yych == ':') goto yy1221;
 	goto yy56;
-yy1229:
-	YYDEBUG(1229, *YYCURSOR);
+yy1246:
+	YYDEBUG(1246, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == ':') goto yy1173;
+	if (yych == ':') goto yy1186;
 	goto yy56;
-yy1230:
-	YYDEBUG(1230, *YYCURSOR);
+yy1247:
+	YYDEBUG(1247, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
-		if (yych == ')') goto yy1028;
-		goto yy818;
+		if (yych == ')') goto yy1035;
+		goto yy820;
 	} else {
-		if (yych <= 'Z') goto yy1242;
-		if (yych <= '`') goto yy818;
-		if (yych <= 'z') goto yy1242;
-		goto yy818;
+		if (yych <= 'Z') goto yy1260;
+		if (yych <= '`') goto yy820;
+		if (yych <= 'z') goto yy1260;
+		goto yy820;
 	}
-yy1231:
-	YYDEBUG(1231, *YYCURSOR);
-	yyaccept = 21;
+yy1248:
+	YYDEBUG(1248, *YYCURSOR);
+	yyaccept = 20;
 	YYMARKER = ++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	YYDEBUG(1232, *YYCURSOR);
+	YYDEBUG(1249, *YYCURSOR);
 	if (yych <= '@') {
 		if (yych <= '-') {
-			if (yych <= ',') goto yy818;
-			goto yy1217;
+			if (yych <= ',') goto yy820;
+			goto yy1233;
 		} else {
-			if (yych == '/') goto yy1217;
-			goto yy818;
+			if (yych == '/') goto yy1233;
+			goto yy820;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'Z') goto yy1231;
-			if (yych <= '^') goto yy818;
-			goto yy1217;
+			if (yych <= 'Z') goto yy1248;
+			if (yych <= '^') goto yy820;
+			goto yy1233;
 		} else {
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1231;
-			goto yy818;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1248;
+			goto yy820;
 		}
 	}
-yy1233:
-	YYDEBUG(1233, *YYCURSOR);
-	yyaccept = 21;
+yy1250:
+	YYDEBUG(1250, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
-			if (yych == ')') goto yy1028;
-			goto yy818;
+			if (yych == ')') goto yy1035;
+			goto yy820;
 		} else {
-			if (yych == '.') goto yy818;
-			goto yy1217;
+			if (yych == '.') goto yy820;
+			goto yy1233;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy818;
-			if (yych <= 'Z') goto yy1242;
-			goto yy818;
+			if (yych <= '@') goto yy820;
+			if (yych <= 'Z') goto yy1260;
+			goto yy820;
 		} else {
-			if (yych <= '_') goto yy1217;
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1243;
-			goto yy818;
+			if (yych <= '_') goto yy1233;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1261;
+			goto yy820;
 		}
 	}
-yy1234:
-	YYDEBUG(1234, *YYCURSOR);
+yy1251:
+	YYDEBUG(1251, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1034;
-	if (yych == 't') goto yy1034;
+	if (yych == 'T') goto yy1041;
+	if (yych == 't') goto yy1041;
 	goto yy56;
-yy1235:
-	YYDEBUG(1235, *YYCURSOR);
+yy1252:
+	YYDEBUG(1252, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy1110;
-	if (yych == 'o') goto yy1110;
+	if (yych == 'O') goto yy1118;
+	if (yych == 'o') goto yy1118;
 	goto yy56;
-yy1236:
-	YYDEBUG(1236, *YYCURSOR);
+yy1253:
+	YYDEBUG(1253, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy186;
+	if (yych <= '9') goto yy1262;
+	goto yy186;
+yy1254:
+	YYDEBUG(1254, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1244;
+	if (yych <= '5') goto yy1263;
 	goto yy56;
-yy1237:
-	YYDEBUG(1237, *YYCURSOR);
+yy1255:
+	YYDEBUG(1255, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1238;
-	if (yych <= '9') goto yy1240;
-yy1238:
-	YYDEBUG(1238, *YYCURSOR);
-#line 1493 "parse_date.re"
+	if (yych <= '/') goto yy1256;
+	if (yych <= '9') goto yy1258;
+yy1256:
+	YYDEBUG(1256, *YYCURSOR);
+#line 1515 "parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
-		s->time->s = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr(&ptr, 4);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
+		s->time->s = timelib_get_nr(&ptr, 2);
 		if (*ptr == '.') {
-			s->time->us = timelib_get_frac_nr((char **) &ptr, 9);
+			s->time->us = timelib_get_frac_nr(&ptr, 9);
 			if (*ptr) { /* timezone is optional */
-				s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+				s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 				if (tz_not_found) {
 					add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 				}
@@ -21762,385 +21887,425 @@ yy1238:
 		TIMELIB_DEINIT;
 		return TIMELIB_XMLRPC_SOAP;
 	}
-#line 21766 "<stdout>"
-yy1239:
-	YYDEBUG(1239, *YYCURSOR);
+#line 21891 "<stdout>"
+yy1257:
+	YYDEBUG(1257, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != '0') goto yy1238;
-yy1240:
-	YYDEBUG(1240, *YYCURSOR);
+	if (yych != '0') goto yy1256;
+yy1258:
+	YYDEBUG(1258, *YYCURSOR);
 	++YYCURSOR;
-	goto yy1238;
-yy1241:
-	YYDEBUG(1241, *YYCURSOR);
+	goto yy1256;
+yy1259:
+	YYDEBUG(1259, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1245;
-	if (yych <= '9') goto yy1200;
+	if (yych <= '5') goto yy1264;
+	if (yych <= '9') goto yy1216;
 	goto yy56;
-yy1242:
-	YYDEBUG(1242, *YYCURSOR);
+yy1260:
+	YYDEBUG(1260, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '@') {
-		if (yych == ')') goto yy1028;
-		goto yy818;
+		if (yych == ')') goto yy1035;
+		goto yy820;
 	} else {
-		if (yych <= 'Z') goto yy1246;
-		if (yych <= '`') goto yy818;
-		if (yych <= 'z') goto yy1246;
-		goto yy818;
+		if (yych <= 'Z') goto yy1265;
+		if (yych <= '`') goto yy820;
+		if (yych <= 'z') goto yy1265;
+		goto yy820;
 	}
-yy1243:
-	YYDEBUG(1243, *YYCURSOR);
-	yyaccept = 21;
+yy1261:
+	YYDEBUG(1261, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
-			if (yych == ')') goto yy1028;
-			goto yy818;
+			if (yych == ')') goto yy1035;
+			goto yy820;
 		} else {
-			if (yych == '.') goto yy818;
-			goto yy1217;
+			if (yych == '.') goto yy820;
+			goto yy1233;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy818;
-			if (yych <= 'Z') goto yy1246;
-			goto yy818;
+			if (yych <= '@') goto yy820;
+			if (yych <= 'Z') goto yy1265;
+			goto yy820;
 		} else {
-			if (yych <= '_') goto yy1217;
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1247;
-			goto yy818;
+			if (yych <= '_') goto yy1233;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1266;
+			goto yy820;
 		}
 	}
-yy1244:
-	YYDEBUG(1244, *YYCURSOR);
+yy1262:
+	YYDEBUG(1262, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1248;
+	if (yych <= '9') goto yy1267;
 	goto yy56;
-yy1245:
-	YYDEBUG(1245, *YYCURSOR);
+yy1263:
+	YYDEBUG(1263, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1249;
-	if (yych <= ':') goto yy1223;
+	if (yych <= '9') goto yy1268;
 	goto yy56;
-yy1246:
-	YYDEBUG(1246, *YYCURSOR);
+yy1264:
+	YYDEBUG(1264, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == ')') goto yy1028;
-	goto yy818;
-yy1247:
-	YYDEBUG(1247, *YYCURSOR);
-	yyaccept = 21;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy1269;
+	if (yych <= ':') goto yy1240;
+	goto yy56;
+yy1265:
+	YYDEBUG(1265, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == ')') goto yy1035;
+	goto yy820;
+yy1266:
+	YYDEBUG(1266, *YYCURSOR);
+	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
 		if (yych <= ')') {
-			if (yych <= '(') goto yy818;
-			goto yy1028;
+			if (yych <= '(') goto yy820;
+			goto yy1035;
 		} else {
-			if (yych == '-') goto yy1217;
-			goto yy818;
+			if (yych == '-') goto yy1233;
+			goto yy820;
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= '/') goto yy1217;
-			if (yych <= '^') goto yy818;
-			goto yy1217;
+			if (yych <= '/') goto yy1233;
+			if (yych <= '^') goto yy820;
+			goto yy1233;
 		} else {
-			if (yych <= '`') goto yy818;
-			if (yych <= 'z') goto yy1250;
-			goto yy818;
+			if (yych <= '`') goto yy820;
+			if (yych <= 'z') goto yy1270;
+			goto yy820;
 		}
 	}
-yy1248:
-	YYDEBUG(1248, *YYCURSOR);
+yy1267:
+	YYDEBUG(1267, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == ':') goto yy1252;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy1272;
 	goto yy56;
-yy1249:
-	YYDEBUG(1249, *YYCURSOR);
+yy1268:
+	YYDEBUG(1268, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == ':') goto yy1253;
+	if (yych == ':') goto yy1273;
 	goto yy56;
-yy1250:
-	YYDEBUG(1250, *YYCURSOR);
+yy1269:
+	YYDEBUG(1269, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == ':') goto yy1274;
+	goto yy56;
+yy1270:
+	YYDEBUG(1270, *YYCURSOR);
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	YYDEBUG(1251, *YYCURSOR);
+	YYDEBUG(1271, *YYCURSOR);
 	if (yych <= '/') {
-		if (yych == '-') goto yy1217;
+		if (yych == '-') goto yy1233;
 		if (yych <= '.') goto yy56;
-		goto yy1217;
+		goto yy1233;
 	} else {
 		if (yych <= '_') {
 			if (yych <= '^') goto yy56;
-			goto yy1217;
+			goto yy1233;
 		} else {
 			if (yych <= '`') goto yy56;
-			if (yych <= 'z') goto yy1250;
+			if (yych <= 'z') goto yy1270;
 			goto yy56;
 		}
 	}
-yy1252:
-	YYDEBUG(1252, *YYCURSOR);
+yy1272:
+	YYDEBUG(1272, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1254;
-	if (yych <= '6') goto yy1255;
+	if (yych <= '9') goto yy1275;
 	goto yy56;
-yy1253:
-	YYDEBUG(1253, *YYCURSOR);
+yy1273:
+	YYDEBUG(1273, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '5') goto yy1256;
-	if (yych <= '6') goto yy1257;
-	if (yych <= '9') goto yy1240;
+	if (yych <= '5') goto yy1276;
+	if (yych <= '6') goto yy1277;
 	goto yy56;
-yy1254:
-	YYDEBUG(1254, *YYCURSOR);
+yy1274:
+	YYDEBUG(1274, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
+	if (yych <= '5') goto yy1278;
+	if (yych <= '6') goto yy1279;
 	if (yych <= '9') goto yy1258;
 	goto yy56;
-yy1255:
-	YYDEBUG(1255, *YYCURSOR);
+yy1275:
+	YYDEBUG(1275, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '0') goto yy1258;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy1280;
 	goto yy56;
-yy1256:
-	YYDEBUG(1256, *YYCURSOR);
+yy1276:
+	YYDEBUG(1276, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1238;
-	if (yych <= '9') goto yy1259;
-	goto yy1238;
-yy1257:
-	YYDEBUG(1257, *YYCURSOR);
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy1281;
+	goto yy56;
+yy1277:
+	YYDEBUG(1277, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '0') goto yy1259;
-	goto yy1238;
-yy1258:
-	YYDEBUG(1258, *YYCURSOR);
+	if (yych == '0') goto yy1281;
+	goto yy56;
+yy1278:
+	YYDEBUG(1278, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy1256;
+	if (yych <= '9') goto yy1282;
+	goto yy1256;
+yy1279:
+	YYDEBUG(1279, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '0') goto yy1282;
+	goto yy1256;
+yy1280:
+	YYDEBUG(1280, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '\t') goto yy1260;
-	if (yych == ' ') goto yy1260;
+	if (yych == '-') goto yy864;
+	if (yych <= '/') goto yy56;
+	if (yych <= '9') goto yy1283;
 	goto yy56;
-yy1259:
-	YYDEBUG(1259, *YYCURSOR);
-	yyaccept = 33;
+yy1281:
+	YYDEBUG(1281, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '\t') goto yy1284;
+	if (yych == ' ') goto yy1284;
+	goto yy56;
+yy1282:
+	YYDEBUG(1282, *YYCURSOR);
+	yyaccept = 32;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy1262;
-	goto yy1238;
-yy1260:
-	YYDEBUG(1260, *YYCURSOR);
+	if (yych == '.') goto yy1286;
+	goto yy1256;
+yy1283:
+	YYDEBUG(1283, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == '-') goto yy864;
+	goto yy56;
+yy1284:
+	YYDEBUG(1284, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
 	yych = *YYCURSOR;
-	YYDEBUG(1261, *YYCURSOR);
+	YYDEBUG(1285, *YYCURSOR);
 	if (yych <= '*') {
 		if (yych <= '\t') {
 			if (yych <= 0x08) goto yy56;
-			goto yy1260;
+			goto yy1284;
 		} else {
-			if (yych == ' ') goto yy1260;
+			if (yych == ' ') goto yy1284;
 			goto yy56;
 		}
 	} else {
 		if (yych <= '-') {
 			if (yych == ',') goto yy56;
-			goto yy1263;
+			goto yy1287;
 		} else {
-			if (yych == 'G') goto yy1264;
+			if (yych == 'G') goto yy1288;
 			goto yy56;
 		}
 	}
-yy1262:
-	YYDEBUG(1262, *YYCURSOR);
+yy1286:
+	YYDEBUG(1286, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1265;
+	if (yych <= '9') goto yy1289;
 	goto yy56;
-yy1263:
-	YYDEBUG(1263, *YYCURSOR);
+yy1287:
+	YYDEBUG(1287, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1267;
-	if (yych <= '2') goto yy1269;
-	if (yych <= '9') goto yy1270;
+	if (yych <= '1') goto yy1291;
+	if (yych <= '2') goto yy1293;
+	if (yych <= '9') goto yy1294;
 	goto yy56;
-yy1264:
-	YYDEBUG(1264, *YYCURSOR);
+yy1288:
+	YYDEBUG(1288, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy1271;
+	if (yych == 'M') goto yy1295;
 	goto yy56;
-yy1265:
-	YYDEBUG(1265, *YYCURSOR);
-	yyaccept = 33;
+yy1289:
+	YYDEBUG(1289, *YYCURSOR);
+	yyaccept = 32;
 	YYMARKER = ++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
 	yych = *YYCURSOR;
-	YYDEBUG(1266, *YYCURSOR);
+	YYDEBUG(1290, *YYCURSOR);
 	if (yych <= '-') {
-		if (yych == '+') goto yy1272;
-		if (yych <= ',') goto yy1238;
-		goto yy1272;
+		if (yych == '+') goto yy1296;
+		if (yych <= ',') goto yy1256;
+		goto yy1296;
 	} else {
 		if (yych <= '9') {
-			if (yych <= '/') goto yy1238;
-			goto yy1265;
+			if (yych <= '/') goto yy1256;
+			goto yy1289;
 		} else {
-			if (yych == 'G') goto yy1273;
-			goto yy1238;
+			if (yych == 'G') goto yy1297;
+			goto yy1256;
 		}
 	}
-yy1267:
-	YYDEBUG(1267, *YYCURSOR);
+yy1291:
+	YYDEBUG(1291, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1268;
-	if (yych <= '9') goto yy1270;
-	if (yych <= ':') goto yy1274;
-yy1268:
-	YYDEBUG(1268, *YYCURSOR);
-#line 1599 "parse_date.re"
+	if (yych <= '/') goto yy1292;
+	if (yych <= '9') goto yy1294;
+	if (yych <= ':') goto yy1298;
+yy1292:
+	YYDEBUG(1292, *YYCURSOR);
+#line 1621 "parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("clf");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
 		TIMELIB_HAVE_DATE();
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
-		s->time->s = timelib_get_nr((char **) &ptr, 2);
-		s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->y = timelib_get_nr(&ptr, 4);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
+		s->time->s = timelib_get_nr(&ptr, 2);
+		s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 		if (tz_not_found) {
 			add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 		}
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 22028 "<stdout>"
-yy1269:
-	YYDEBUG(1269, *YYCURSOR);
+#line 22193 "<stdout>"
+yy1293:
+	YYDEBUG(1293, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '5') {
-		if (yych <= '/') goto yy1268;
-		if (yych >= '5') goto yy1275;
+		if (yych <= '/') goto yy1292;
+		if (yych >= '5') goto yy1299;
 	} else {
-		if (yych <= '9') goto yy1276;
-		if (yych <= ':') goto yy1274;
-		goto yy1268;
+		if (yych <= '9') goto yy1300;
+		if (yych <= ':') goto yy1298;
+		goto yy1292;
 	}
-yy1270:
-	YYDEBUG(1270, *YYCURSOR);
+yy1294:
+	YYDEBUG(1294, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1268;
-	if (yych <= '5') goto yy1275;
-	if (yych <= '9') goto yy1276;
-	if (yych <= ':') goto yy1274;
-	goto yy1268;
-yy1271:
-	YYDEBUG(1271, *YYCURSOR);
+	if (yych <= '/') goto yy1292;
+	if (yych <= '5') goto yy1299;
+	if (yych <= '9') goto yy1300;
+	if (yych <= ':') goto yy1298;
+	goto yy1292;
+yy1295:
+	YYDEBUG(1295, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1277;
+	if (yych == 'T') goto yy1301;
 	goto yy56;
-yy1272:
-	YYDEBUG(1272, *YYCURSOR);
+yy1296:
+	YYDEBUG(1296, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '1') goto yy1278;
-	if (yych <= '2') goto yy1279;
-	if (yych <= '9') goto yy1280;
+	if (yych <= '1') goto yy1302;
+	if (yych <= '2') goto yy1303;
+	if (yych <= '9') goto yy1304;
 	goto yy56;
-yy1273:
-	YYDEBUG(1273, *YYCURSOR);
+yy1297:
+	YYDEBUG(1297, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy1281;
+	if (yych == 'M') goto yy1305;
 	goto yy56;
-yy1274:
-	YYDEBUG(1274, *YYCURSOR);
+yy1298:
+	YYDEBUG(1298, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1268;
-	if (yych <= '5') goto yy1275;
-	if (yych <= '9') goto yy1276;
-	goto yy1268;
-yy1275:
-	YYDEBUG(1275, *YYCURSOR);
+	if (yych <= '/') goto yy1292;
+	if (yych <= '5') goto yy1299;
+	if (yych <= '9') goto yy1300;
+	goto yy1292;
+yy1299:
+	YYDEBUG(1299, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1268;
-	if (yych >= ':') goto yy1268;
-yy1276:
-	YYDEBUG(1276, *YYCURSOR);
+	if (yych <= '/') goto yy1292;
+	if (yych >= ':') goto yy1292;
+yy1300:
+	YYDEBUG(1300, *YYCURSOR);
 	++YYCURSOR;
-	goto yy1268;
-yy1277:
-	YYDEBUG(1277, *YYCURSOR);
+	goto yy1292;
+yy1301:
+	YYDEBUG(1301, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '+') goto yy1263;
-	if (yych == '-') goto yy1263;
+	if (yych == '+') goto yy1287;
+	if (yych == '-') goto yy1287;
 	goto yy56;
-yy1278:
-	YYDEBUG(1278, *YYCURSOR);
+yy1302:
+	YYDEBUG(1302, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1238;
-	if (yych <= '9') goto yy1280;
-	if (yych <= ':') goto yy1282;
-	goto yy1238;
-yy1279:
-	YYDEBUG(1279, *YYCURSOR);
+	if (yych <= '/') goto yy1256;
+	if (yych <= '9') goto yy1304;
+	if (yych <= ':') goto yy1306;
+	goto yy1256;
+yy1303:
+	YYDEBUG(1303, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '5') {
-		if (yych <= '/') goto yy1238;
-		if (yych >= '5') goto yy1237;
+		if (yych <= '/') goto yy1256;
+		if (yych >= '5') goto yy1255;
 	} else {
-		if (yych <= '9') goto yy1240;
-		if (yych <= ':') goto yy1282;
-		goto yy1238;
+		if (yych <= '9') goto yy1258;
+		if (yych <= ':') goto yy1306;
+		goto yy1256;
 	}
-yy1280:
-	YYDEBUG(1280, *YYCURSOR);
+yy1304:
+	YYDEBUG(1304, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1238;
-	if (yych <= '5') goto yy1237;
-	if (yych <= '9') goto yy1240;
-	if (yych <= ':') goto yy1282;
-	goto yy1238;
-yy1281:
-	YYDEBUG(1281, *YYCURSOR);
+	if (yych <= '/') goto yy1256;
+	if (yych <= '5') goto yy1255;
+	if (yych <= '9') goto yy1258;
+	if (yych <= ':') goto yy1306;
+	goto yy1256;
+yy1305:
+	YYDEBUG(1305, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1283;
+	if (yych == 'T') goto yy1307;
 	goto yy56;
-yy1282:
-	YYDEBUG(1282, *YYCURSOR);
+yy1306:
+	YYDEBUG(1306, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy1238;
-	if (yych <= '5') goto yy1237;
-	if (yych <= '9') goto yy1240;
-	goto yy1238;
-yy1283:
-	YYDEBUG(1283, *YYCURSOR);
+	if (yych <= '/') goto yy1256;
+	if (yych <= '5') goto yy1255;
+	if (yych <= '9') goto yy1258;
+	goto yy1256;
+yy1307:
+	YYDEBUG(1307, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '+') goto yy1272;
-	if (yych == '-') goto yy1272;
+	if (yych == '+') goto yy1296;
+	if (yych == '-') goto yy1296;
 	goto yy56;
 }
-#line 1818 "parse_date.re"
+#line 1840 "parse_date.re"
 
 }
 
 #define YYMAXFILL 33
 
 
-timelib_time* timelib_strtotime(char *s, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper)
+timelib_time *timelib_strtotime(const char *s, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper)
 {
 	Scanner in;
 	int t;
-	char *e = s + len - 1;
+	const char *e = s + len - 1;
 
 	memset(&in, 0, sizeof(in));
 	in.errors = timelib_malloc(sizeof(timelib_error_container));
@@ -22316,16 +22481,16 @@ static timelib_format_specifier_code timelib_lookup_format(char input, const tim
 	return TIMELIB_FORMAT_LITERAL;
 }
 
-timelib_time *timelib_parse_from_format(char *format, char *string, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper)
+timelib_time *timelib_parse_from_format(const char *format, const char *string, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper)
 {
 	return timelib_parse_from_format_with_map(format, string, len, errors, tzdb, tz_get_wrapper, &default_format_config);
 }
 
-timelib_time *timelib_parse_from_format_with_map(char *format, char *string, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper, const timelib_format_config* format_config)
+timelib_time *timelib_parse_from_format_with_map(const char *format, const char *string, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper, const timelib_format_config* format_config)
 {
-	char        *fptr = format;
-	char        *ptr = string;
-	char        *begin;
+	const char  *fptr = format;
+	const char  *ptr = string;
+	const char  *begin;
 	timelib_sll  tmp;
 	Scanner      in;
 	Scanner     *s = &in;
@@ -22399,7 +22564,7 @@ timelib_time *timelib_parse_from_format_with_map(char *format, char *string, siz
 				{
 					const timelib_relunit* tmprel = 0;
 
-					tmprel = timelib_lookup_relunit((char **) &ptr);
+					tmprel = timelib_lookup_relunit(&ptr);
 					if (!tmprel) {
 						add_pbf_error(s, TIMELIB_ERR_NO_TEXTUAL_DAY, "A textual day could not be found", string, begin);
 						break;
@@ -22414,81 +22579,107 @@ timelib_time *timelib_parse_from_format_with_map(char *format, char *string, siz
 			case TIMELIB_FORMAT_DAY_TWO_DIGIT: /* two digit day, without leading zero */
 			case TIMELIB_FORMAT_DAY_TWO_DIGIT_PADDED: /* two digit day, with leading zero */
 				TIMELIB_CHECK_NUMBER;
-				if ((s->time->d = timelib_get_nr((char **) &ptr, 2)) == TIMELIB_UNSET) {
+				if ((s->time->d = timelib_get_nr(&ptr, 2)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_DAY, "A two digit day could not be found", string, begin);
+					break;
 				}
+
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_DAY_SUFFIX: /* day suffix, ignored, nor checked */
-				timelib_skip_day_suffix((char **) &ptr);
+				timelib_skip_day_suffix(&ptr);
 				break;
 			case TIMELIB_FORMAT_DAY_OF_YEAR: /* day of year - resets month (0 based) - also initializes everything else to !TIMELIB_UNSET */
 				TIMELIB_CHECK_NUMBER;
-				if ((tmp = timelib_get_nr((char **) &ptr, 3)) == TIMELIB_UNSET) {
+				if ((tmp = timelib_get_nr(&ptr, 3)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_THREE_DIGIT_DAY_OF_YEAR, "A three digit day-of-year could not be found", string, begin);
-				} else {
-					s->time->m = 1;
-					s->time->d = tmp + 1;
-					timelib_do_normalize(s->time);
+					break;
 				}
+
+				s->time->have_date = 1;
+				s->time->m = 1;
+				s->time->d = tmp + 1;
+				timelib_do_normalize(s->time);
 				break;
 
 			case TIMELIB_FORMAT_MONTH_TWO_DIGIT: /* two digit month, without leading zero */
 			case TIMELIB_FORMAT_MONTH_TWO_DIGIT_PADDED: /* two digit month, with leading zero */
 				TIMELIB_CHECK_NUMBER;
-				if ((s->time->m = timelib_get_nr((char **) &ptr, 2)) == TIMELIB_UNSET) {
+				if ((s->time->m = timelib_get_nr(&ptr, 2)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_MONTH, "A two digit month could not be found", string, begin);
+					break;
 				}
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_TEXTUAL_MONTH_3_LETTER: /* three letter month */
 			case TIMELIB_FORMAT_TEXTUAL_MONTH_FULL: /* full month */
-				tmp = timelib_lookup_month((char **) &ptr);
+				tmp = timelib_lookup_month(&ptr);
 				if (!tmp) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TEXTUAL_MONTH, "A textual month could not be found", string, begin);
-				} else {
-					s->time->m = tmp;
+					break;
 				}
+
+				s->time->have_date = 1;
+				s->time->m = tmp;
 				break;
 			case TIMELIB_FORMAT_YEAR_TWO_DIGIT: /* two digit year */
 				{
 					int length = 0;
 					TIMELIB_CHECK_NUMBER;
-					if ((s->time->y = timelib_get_nr_ex((char **) &ptr, 2, &length)) == TIMELIB_UNSET) {
+					if ((s->time->y = timelib_get_nr_ex(&ptr, 2, &length)) == TIMELIB_UNSET) {
 						add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_YEAR, "A two digit year could not be found", string, begin);
+						break;
 					}
+					
+					s->time->have_date = 1;
 					TIMELIB_PROCESS_YEAR(s->time->y, length);
 				}
 				break;
 			case TIMELIB_FORMAT_YEAR_FOUR_DIGIT: /* four digit year */
 				TIMELIB_CHECK_NUMBER;
-				if ((s->time->y = timelib_get_nr((char **) &ptr, 4)) == TIMELIB_UNSET) {
+				if ((s->time->y = timelib_get_nr(&ptr, 4)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_FOUR_DIGIT_YEAR, "A four digit year could not be found", string, begin);
+					break;
 				}
+
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_HOUR_TWO_DIGIT_12_MAX: /* two digit hour, without leading zero */
 			case TIMELIB_FORMAT_HOUR_TWO_DIGIT_12_MAX_PADDED: /* two digit hour, with leading zero */
 				TIMELIB_CHECK_NUMBER;
-				if ((s->time->h = timelib_get_nr((char **) &ptr, 2)) == TIMELIB_UNSET) {
+				if ((s->time->h = timelib_get_nr(&ptr, 2)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_HOUR, "A two digit hour could not be found", string, begin);
+					break;
 				}
 				if (s->time->h > 12) {
 					add_pbf_error(s, TIMELIB_ERR_HOUR_LARGER_THAN_12, "Hour can not be higher than 12", string, begin);
+					break;
 				}
+
+				s->time->have_time = 1;
 				break;
 			case TIMELIB_FORMAT_HOUR_TWO_DIGIT_24_MAX_PADDED: /* two digit hour, with leading zero */
 			case TIMELIB_FORMAT_HOUR_TWO_DIGIT_24_MAX: /* two digit hour, without leading zero */
 				TIMELIB_CHECK_NUMBER;
-				if ((s->time->h = timelib_get_nr((char **) &ptr, 2)) == TIMELIB_UNSET) {
+				if ((s->time->h = timelib_get_nr(&ptr, 2)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_HOUR, "A two digit hour could not be found", string, begin);
+					break;
 				}
+
+				s->time->have_time = 1;
 				break;
 			case TIMELIB_FORMAT_MERIDIAN: /* am/pm/a.m./p.m. AM/PM/A.M./P.M. */
 				if (s->time->h == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_MERIDIAN_BEFORE_HOUR, "Meridian can only come after an hour has been found", string, begin);
-				} else if ((tmp = timelib_meridian_with_check((char **) &ptr, s->time->h)) == TIMELIB_UNSET) {
+					break;
+				}
+				if ((tmp = timelib_meridian_with_check(&ptr, s->time->h)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_MERIDIAN, "A meridian could not be found", string, begin);
-				} else {
-					s->time->h += tmp;
+					break;
 				}
+
+				s->time->have_time = 1;
+				s->time->h += tmp;
 				break;
 			case TIMELIB_FORMAT_MINUTE_TWO_DIGIT: /* two digit minute, with leading zero */
 				{
@@ -22496,12 +22687,14 @@ timelib_time *timelib_parse_from_format_with_map(char *format, char *string, siz
 					timelib_sll min;
 
 					TIMELIB_CHECK_NUMBER;
-					min = timelib_get_nr_ex((char **) &ptr, 2, &length);
+					min = timelib_get_nr_ex(&ptr, 2, &length);
 					if (min == TIMELIB_UNSET || length != 2) {
 						add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_MINUTE, "A two digit minute could not be found", string, begin);
-					} else {
-						s->time->i = min;
+						break;
 					}
+
+					s->time->have_time = 1;
+					s->time->i = min;
 				}
 				break;
 			case TIMELIB_FORMAT_SECOND_TWO_DIGIT: /* two digit second, with leading zero */
@@ -22510,73 +22703,77 @@ timelib_time *timelib_parse_from_format_with_map(char *format, char *string, siz
 					timelib_sll sec;
 
 					TIMELIB_CHECK_NUMBER;
-					sec = timelib_get_nr_ex((char **) &ptr, 2, &length);
+					sec = timelib_get_nr_ex(&ptr, 2, &length);
 					if (sec == TIMELIB_UNSET || length != 2) {
 						add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_SECOND, "A two digit second could not be found", string, begin);
-					} else {
-						s->time->s = sec;
+						break;
 					}
+
+					s->time->have_time = 1;
+					s->time->s = sec;
 				}
 				break;
 			case TIMELIB_FORMAT_MICROSECOND_SIX_DIGIT: /* up to six digit microsecond */
 				{
 					double f;
-					char *tptr;
+					const char *tptr;
 
 					TIMELIB_CHECK_NUMBER;
 					tptr = ptr;
-					if ((f = timelib_get_nr((char **) &ptr, 6)) == TIMELIB_UNSET || (ptr - tptr < 1)) {
+					if ((f = timelib_get_nr(&ptr, 6)) == TIMELIB_UNSET || (ptr - tptr < 1)) {
 						add_pbf_error(s, TIMELIB_ERR_NO_SIX_DIGIT_MICROSECOND, "A six digit microsecond could not be found", string, begin);
-					} else {
-						s->time->us = (f * pow(10, 6 - (ptr - tptr)));
+						break;
 					}
+
+					s->time->us = (f * pow(10, 6 - (ptr - tptr)));
 				}
 				break;
 			case TIMELIB_FORMAT_MILLISECOND_THREE_DIGIT: /* up to three digit millisecond */
 				{
 					double f;
-					char *tptr;
+					const char *tptr;
 
 					TIMELIB_CHECK_NUMBER;
 					tptr = ptr;
-					if ((f = timelib_get_nr((char **) &ptr, 3)) == TIMELIB_UNSET || (ptr - tptr < 1)) {
+					if ((f = timelib_get_nr(&ptr, 3)) == TIMELIB_UNSET || (ptr - tptr < 1)) {
 						add_pbf_error(s, TIMELIB_ERR_NO_THREE_DIGIT_MILLISECOND, "A three digit millisecond could not be found", string, begin);
-					} else {
-						s->time->us = (f * pow(10, 3 - (ptr - tptr)) * 1000);
+						break;
 					}
+					
+					s->time->us = (f * pow(10, 3 - (ptr - tptr)) * 1000);
 				}
 				break;
 			case TIMELIB_FORMAT_WHITESPACE: /* any sort of whitespace (' ' and \t) */
-				timelib_eat_spaces((char **) &ptr);
+				timelib_eat_spaces(&ptr);
 				break;
 			case TIMELIB_FORMAT_EPOCH_SECONDS: /* epoch seconds */
 				TIMELIB_CHECK_SIGNED_NUMBER;
-				TIMELIB_HAVE_RELATIVE();
-				tmp = timelib_get_unsigned_nr((char **) &ptr, 24);
-				s->time->y = 1970;
-				s->time->m = 1;
-				s->time->d = 1;
-				s->time->h = s->time->i = s->time->s = 0;
-				s->time->relative.s += tmp;
+				tmp = timelib_get_unsigned_nr(&ptr, 24);
+				s->time->have_zone = 1;
+				s->time->sse = tmp;
 				s->time->is_localtime = 1;
 				s->time->zone_type = TIMELIB_ZONETYPE_OFFSET;
 				s->time->z = 0;
 				s->time->dst = 0;
+				timelib_update_from_sse(s->time);
 				break;
+
 			case TIMELIB_FORMAT_ANY_SEPARATOR: /* separation symbol */
-				if (timelib_lookup_format(*ptr, format_map) == TIMELIB_FORMAT_SEPARATOR) {
-					++ptr;
-				} else {
+				if (timelib_lookup_format(*ptr, format_map) != TIMELIB_FORMAT_SEPARATOR) {
 					add_pbf_error(s, TIMELIB_ERR_NO_SEP_SYMBOL, "The separation symbol ([;:/.,-]) could not be found", string, begin);
+					break;
 				}
+				
+				++ptr;
 				break;
 
 			case TIMELIB_FORMAT_SEPARATOR:
-				if (*ptr == *fptr) {
-					++ptr;
-				} else {
+				if (*ptr != *fptr) {
 					add_pbf_error(s, TIMELIB_ERR_NO_SEP_SYMBOL, "The separation symbol could not be found", string, begin);
+					break;
 				}
+
+				++ptr;
 				break;
 
 			case TIMELIB_FORMAT_RESET_ALL: /* reset all fields to default */
@@ -22592,62 +22789,80 @@ timelib_time *timelib_parse_from_format_with_map(char *format, char *string, siz
 				break;
 
 			case TIMELIB_FORMAT_ESCAPE: /* escaped char */
-				if(!fptr[1]) {
+				if (!fptr[1]) {
 					add_pbf_error(s, TIMELIB_ERR_EXPECTED_ESCAPE_CHAR, "Escaped character expected", string, begin);
 					break;
 				}
 				fptr++;
-				if (*ptr == *fptr) {
-					++ptr;
-				} else {
+				if (*ptr != *fptr) {
 					add_pbf_error(s, TIMELIB_ERR_NO_ESCAPED_CHAR, "The escaped character could not be found", string, begin);
+					break;
 				}
+
+				++ptr;
 				break;
 
 			case TIMELIB_FORMAT_SKIP_TO_SEPARATOR: /* random chars until a separator or number ([ \t.,:;/-0123456789]) */
-				timelib_eat_until_separator((char **) &ptr);
+				timelib_eat_until_separator(&ptr);
 				break;
 
 			case TIMELIB_FORMAT_ALLOW_EXTRA_CHARACTERS: /* allow extra chars in the format */
 				allow_extra = true;
 				break;
 			case TIMELIB_FORMAT_YEAR_ISO:
-				if ((iso_year = timelib_get_nr((char **) &ptr, 4)) == TIMELIB_UNSET) {
+				if ((iso_year = timelib_get_nr(&ptr, 4)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_FOUR_DIGIT_YEAR_ISO, "A four digit ISO year could not be found", string, begin);
+					break;
 				}
+
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_WEEK_OF_YEAR_ISO:
-				if ((iso_week_of_year = timelib_get_nr((char **) &ptr, 2)) == TIMELIB_UNSET) {
+				if ((iso_week_of_year = timelib_get_nr(&ptr, 2)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_WEEK, "A two digit ISO week could not be found", string, begin);
+					break;
 				}
 				/* Range is 1 - 53  for ISO week of year */
 				if (iso_week_of_year < 1 || iso_week_of_year > 53) {
 					add_pbf_error(s, TIMELIB_ERR_INVALID_WEEK, "ISO Week must be between 1 and 53", string, begin);
+					break;
 				}
+
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_DAY_OF_WEEK_ISO:
-				if ((iso_day_of_week = timelib_get_nr((char **) &ptr, 1)) == TIMELIB_UNSET) {
+				if ((iso_day_of_week = timelib_get_nr(&ptr, 1)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_DAY_OF_WEEK, "A single digit day of week could not be found", string, begin);
+					break;
 				}
 				if (iso_day_of_week < 1 || iso_day_of_week > 7) {
 					add_pbf_error(s, TIMELIB_ERR_INVALID_DAY_OF_WEEK, "Day of week must be between 1 and 7", string, begin);
+					break;
 				}
+
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_TIMEZONE_OFFSET: /* timezone */
 				{
 					int tz_not_found;
 
-					s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+					s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 					if (tz_not_found) {
 						add_pbf_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database", string, begin);
+						break;
 					}
+
+					s->time->have_zone = 1;
 				}
 				break;
 			case TIMELIB_FORMAT_TIMEZONE_OFFSET_MINUTES: /* timezone format +/-mmm */
-				s->time->z = timelib_parse_tz_minutes((char **) &ptr, s->time);
+				s->time->z = timelib_parse_tz_minutes(&ptr, s->time);
 				if (s->time->z == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_INVALID_TZ_OFFSET, "Invalid timezone offset in minutes", string, begin);
+					break;
 				}
+
+				s->time->have_zone = 1;
 				break;
 			case TIMELIB_FORMAT_LITERAL:
 			default:
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index 4a8fd0f8ef..67db6fafb0 100644
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -351,7 +351,7 @@ static void add_error(Scanner *s, int error_code, char *error)
 	s->errors->error_messages[s->errors->error_count - 1].message = timelib_strdup(error);
 }
 
-static void add_pbf_warning(Scanner *s, int error_code, char *error, char *sptr, char *cptr)
+static void add_pbf_warning(Scanner *s, int error_code, char *error, const char *sptr, const char *cptr)
 {
 	s->errors->warning_count++;
 	s->errors->warning_messages = timelib_realloc(s->errors->warning_messages, s->errors->warning_count * sizeof(timelib_error_message));
@@ -361,7 +361,7 @@ static void add_pbf_warning(Scanner *s, int error_code, char *error, char *sptr,
 	s->errors->warning_messages[s->errors->warning_count - 1].message = timelib_strdup(error);
 }
 
-static void add_pbf_error(Scanner *s, int error_code, char *error, char *sptr, char *cptr)
+static void add_pbf_error(Scanner *s, int error_code, char *error, const char *sptr, const char *cptr)
 {
 	s->errors->error_count++;
 	s->errors->error_messages = timelib_realloc(s->errors->error_messages, s->errors->error_count * sizeof(timelib_error_message));
@@ -371,7 +371,7 @@ static void add_pbf_error(Scanner *s, int error_code, char *error, char *sptr, c
 	s->errors->error_messages[s->errors->error_count - 1].message = timelib_strdup(error);
 }
 
-static timelib_sll timelib_meridian(char **ptr, timelib_sll h)
+static timelib_sll timelib_meridian(const char **ptr, timelib_sll h)
 {
 	timelib_sll retval = 0;
 
@@ -398,7 +398,7 @@ static timelib_sll timelib_meridian(char **ptr, timelib_sll h)
 	return retval;
 }
 
-static timelib_sll timelib_meridian_with_check(char **ptr, timelib_sll h)
+static timelib_sll timelib_meridian_with_check(const char **ptr, timelib_sll h)
 {
 	timelib_sll retval = 0;
 
@@ -442,9 +442,10 @@ static char *timelib_string(Scanner *s)
 	return tmp;
 }
 
-static timelib_sll timelib_get_nr_ex(char **ptr, int max_length, int *scanned_length)
+static timelib_sll timelib_get_nr_ex(const char **ptr, int max_length, int *scanned_length)
 {
-	char *begin, *end, *str;
+	const char *begin, *end;
+	char *str;
 	timelib_sll tmp_nr = TIMELIB_UNSET;
 	int len = 0;
 
@@ -470,12 +471,12 @@ static timelib_sll timelib_get_nr_ex(char **ptr, int max_length, int *scanned_le
 	return tmp_nr;
 }
 
-static timelib_sll timelib_get_nr(char **ptr, int max_length)
+static timelib_sll timelib_get_nr(const char **ptr, int max_length)
 {
 	return timelib_get_nr_ex(ptr, max_length, NULL);
 }
 
-static void timelib_skip_day_suffix(char **ptr)
+static void timelib_skip_day_suffix(const char **ptr)
 {
 	if (isspace(**ptr)) {
 		return;
@@ -485,9 +486,10 @@ static void timelib_skip_day_suffix(char **ptr)
 	}
 }
 
-static timelib_sll timelib_get_frac_nr(char **ptr, int max_length)
+static timelib_sll timelib_get_frac_nr(const char **ptr, int max_length)
 {
-	char *begin, *end, *str;
+	const char *begin, *end;
+	char *str;
 	double tmp_nr = TIMELIB_UNSET;
 	int len = 0;
 
@@ -510,7 +512,7 @@ static timelib_sll timelib_get_frac_nr(char **ptr, int max_length)
 	return tmp_nr;
 }
 
-static timelib_ull timelib_get_unsigned_nr(char **ptr, int max_length)
+static timelib_ull timelib_get_unsigned_nr(const char **ptr, int max_length)
 {
 	timelib_ull dir = 1;
 
@@ -531,10 +533,10 @@ static timelib_ull timelib_get_unsigned_nr(char **ptr, int max_length)
 	return dir * timelib_get_nr(ptr, max_length);
 }
 
-static timelib_sll timelib_lookup_relative_text(char **ptr, int *behavior)
+static timelib_sll timelib_lookup_relative_text(const char **ptr, int *behavior)
 {
 	char *word;
-	char *begin = *ptr, *end;
+	const char *begin = *ptr, *end;
 	timelib_sll  value = 0;
 	const timelib_lookup_table *tp;
 
@@ -556,7 +558,7 @@ static timelib_sll timelib_lookup_relative_text(char **ptr, int *behavior)
 	return value;
 }
 
-static timelib_sll timelib_get_relative_text(char **ptr, int *behavior)
+static timelib_sll timelib_get_relative_text(const char **ptr, int *behavior)
 {
 	while (**ptr == ' ' || **ptr == '\t' || **ptr == '-' || **ptr == '/') {
 		++*ptr;
@@ -564,10 +566,10 @@ static timelib_sll timelib_get_relative_text(char **ptr, int *behavior)
 	return timelib_lookup_relative_text(ptr, behavior);
 }
 
-static timelib_long timelib_lookup_month(char **ptr)
+static timelib_long timelib_lookup_month(const char **ptr)
 {
 	char *word;
-	char *begin = *ptr, *end;
+	const char *begin = *ptr, *end;
 	timelib_long  value = 0;
 	const timelib_lookup_table *tp;
 
@@ -588,7 +590,7 @@ static timelib_long timelib_lookup_month(char **ptr)
 	return value;
 }
 
-static timelib_long timelib_get_month(char **ptr)
+static timelib_long timelib_get_month(const char **ptr)
 {
 	while (**ptr == ' ' || **ptr == '\t' || **ptr == '-' || **ptr == '.' || **ptr == '/') {
 		++*ptr;
@@ -596,14 +598,14 @@ static timelib_long timelib_get_month(char **ptr)
 	return timelib_lookup_month(ptr);
 }
 
-static void timelib_eat_spaces(char **ptr)
+static void timelib_eat_spaces(const char **ptr)
 {
 	while (**ptr == ' ' || **ptr == '\t') {
 		++*ptr;
 	}
 }
 
-static void timelib_eat_until_separator(char **ptr)
+static void timelib_eat_until_separator(const char **ptr)
 {
 	++*ptr;
 	while (strchr(" \t.,:;/-0123456789", **ptr) == NULL) {
@@ -611,10 +613,10 @@ static void timelib_eat_until_separator(char **ptr)
 	}
 }
 
-static const timelib_relunit* timelib_lookup_relunit(char **ptr)
+static const timelib_relunit* timelib_lookup_relunit(const char **ptr)
 {
 	char *word;
-	char *begin = *ptr, *end;
+	const char *begin = *ptr, *end;
 	const timelib_relunit *tp, *value = NULL;
 
 	while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t' && **ptr != ';' && **ptr != ':' &&
@@ -636,7 +638,7 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
 	return value;
 }
 
-static void timelib_set_relative(char **ptr, timelib_sll amount, int behavior, Scanner *s)
+static void timelib_set_relative(const char **ptr, timelib_sll amount, int behavior, Scanner *s)
 {
 	const timelib_relunit* relunit;
 
@@ -707,10 +709,10 @@ static const timelib_tz_lookup_table* abbr_search(const char *word, timelib_long
 	return NULL;
 }
 
-static timelib_long timelib_lookup_abbr(char **ptr, int *dst, char **tz_abbr, int *found)
+static timelib_long timelib_lookup_abbr(const char **ptr, int *dst, char **tz_abbr, int *found)
 {
 	char *word;
-	char *begin = *ptr, *end;
+	const char *begin = *ptr, *end;
 	timelib_long  value = 0;
 	const timelib_tz_lookup_table *tp;
 
@@ -737,9 +739,9 @@ static timelib_long timelib_lookup_abbr(char **ptr, int *dst, char **tz_abbr, in
 #define sHOUR(a) (int)(a * 3600)
 #define sMIN(a) (int)(a * 60)
 
-static timelib_long timelib_parse_tz_cor(char **ptr)
+static timelib_long timelib_parse_tz_cor(const char **ptr)
 {
-	char *begin = *ptr, *end;
+	const char *begin = *ptr, *end;
 	timelib_long  tmp;
 
 	while (isdigit(**ptr) || **ptr == ':') {
@@ -770,10 +772,10 @@ static timelib_long timelib_parse_tz_cor(char **ptr)
 	return 0;
 }
 
-static timelib_long timelib_parse_tz_minutes(char **ptr, timelib_time *t)
+static timelib_long timelib_parse_tz_minutes(const char **ptr, timelib_time *t)
 {
 	timelib_long retval = TIMELIB_UNSET;
-	char *begin = *ptr;
+	const char *begin = *ptr;
 
 	/* First character must be +/- */
 	if (**ptr != '+' && **ptr != '-') {
@@ -801,7 +803,7 @@ static timelib_long timelib_parse_tz_minutes(char **ptr, timelib_time *t)
 	return retval;
 }
 
-timelib_long timelib_parse_zone(char **ptr, int *dst, timelib_time *t, int *tz_not_found, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_wrapper)
+timelib_long timelib_parse_zone(const char **ptr, int *dst, timelib_time *t, int *tz_not_found, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_wrapper)
 {
 	timelib_tzinfo *res;
 	timelib_long            retval = 0;
@@ -877,7 +879,8 @@ timelib_long timelib_parse_zone(char **ptr, int *dst, timelib_time *t, int *tz_n
 static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 {
 	uchar *cursor = s->cur;
-	char *str, *ptr = NULL;
+	char *str;
+	const char *ptr = NULL;
 
 std:
 	s->tok = cursor;
@@ -909,6 +912,7 @@ year  = [0-9]{1,4};
 year2 = [0-9]{2};
 year4 = [0-9]{4};
 year4withsign = [+-]? [0-9]{4};
+yearx = [+-] [0-9]{5,19};
 
 dayofyear = "00"[1-9] | "0"[1-9][0-9] | [1-2][0-9][0-9] | "3"[0-5][0-9] | "36"[0-6];
 weekofyear = "0"[1-9] | [1-4][0-9] | "5"[0-3];
@@ -951,6 +955,7 @@ iso8601dateslash = year4 "/" monthlz "/" daylz "/"?;
 dateslash        = year4 "/" month "/" day;
 iso8601date4     = year4withsign "-" monthlz "-" daylz;
 iso8601date2     = year2 "-" monthlz "-" daylz;
+iso8601datex     = yearx "-" monthlz "-" daylz;
 gnudateshorter   = year4 "-" month;
 gnudateshort     = year "-" month "-" day;
 pointeddate4     = day [.\t-] month [.-] year4;
@@ -985,7 +990,7 @@ clf              = day "/" monthabbr "/" year4 ":" hour24lz ":" minutelz ":" sec
 
 /* Timestamp format: @1126396800 */
 timestamp        = "@" "-"? [0-9]+;
-timestampms      = "@" "-"? [0-9]+ "." [0-9]{6};
+timestampms      = "@" "-"? [0-9]+ "." [0-9]{0,6};
 
 /* To fix some ambiguities */
 dateshortwithtimeshort12  = datenoyear timeshort12;
@@ -1077,7 +1082,7 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_UNHAVE_TIME();
 		TIMELIB_HAVE_TZ();
 
-		i = timelib_get_unsigned_nr((char **) &ptr, 24);
+		i = timelib_get_unsigned_nr(&ptr, 24);
 		s->time->y = 1970;
 		s->time->m = 1;
 		s->time->d = 1;
@@ -1096,6 +1101,7 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 	timestampms
 	{
 		timelib_ull i, us;
+		const char *ptr_before;
 
 		TIMELIB_INIT;
 		TIMELIB_HAVE_RELATIVE();
@@ -1103,8 +1109,12 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_UNHAVE_TIME();
 		TIMELIB_HAVE_TZ();
 
-		i = timelib_get_unsigned_nr((char **) &ptr, 24);
-		us = timelib_get_unsigned_nr((char **) &ptr, 24);
+		i = timelib_get_unsigned_nr(&ptr, 24);
+
+		ptr_before = ptr;
+		us = timelib_get_unsigned_nr(&ptr, 6);
+		us = us * pow(10, 7 - (ptr - ptr_before));
+
 		s->time->y = 1970;
 		s->time->m = 1;
 		s->time->d = 1;
@@ -1146,15 +1156,15 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_HAVE_TIME();
 
 		if (*ptr == 'b') {
-			s->time->h = timelib_get_nr((char **) &ptr, 2);
+			s->time->h = timelib_get_nr(&ptr, 2);
 			s->time->i = 15;
 		} else {
-			s->time->h = timelib_get_nr((char **) &ptr, 2) - 1;
+			s->time->h = timelib_get_nr(&ptr, 2) - 1;
 			s->time->i = 45;
 		}
 		if (*ptr != '\0' ) {
-			timelib_eat_spaces((char **) &ptr);
-			s->time->h += timelib_meridian((char **) &ptr, s->time->h);
+			timelib_eat_spaces(&ptr);
+			s->time->h += timelib_meridian(&ptr, s->time->h);
 		}
 
 		TIMELIB_DEINIT;
@@ -1170,14 +1180,14 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_HAVE_RELATIVE();
 		TIMELIB_HAVE_SPECIAL_RELATIVE();
 
-		i = timelib_get_relative_text((char **) &ptr, &behavior);
-		timelib_eat_spaces((char **) &ptr);
+		i = timelib_get_relative_text(&ptr, &behavior);
+		timelib_eat_spaces(&ptr);
 		if (i > 0) { /* first, second... etc */
 			s->time->relative.special.type = TIMELIB_SPECIAL_DAY_OF_WEEK_IN_MONTH;
-			timelib_set_relative((char **) &ptr, i, 1, s);
+			timelib_set_relative(&ptr, i, 1, s);
 		} else { /* last */
 			s->time->relative.special.type = TIMELIB_SPECIAL_LAST_DAY_OF_WEEK_IN_MONTH;
-			timelib_set_relative((char **) &ptr, i, behavior, s);
+			timelib_set_relative(&ptr, i, behavior, s);
 		}
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEK_DAY_OF_MONTH;
@@ -1188,14 +1198,14 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
 		if (*ptr == ':' || *ptr == '.') {
-			s->time->i = timelib_get_nr((char **) &ptr, 2);
+			s->time->i = timelib_get_nr(&ptr, 2);
 			if (*ptr == ':' || *ptr == '.') {
-				s->time->s = timelib_get_nr((char **) &ptr, 2);
+				s->time->s = timelib_get_nr(&ptr, 2);
 			}
 		}
-		s->time->h += timelib_meridian((char **) &ptr, s->time->h);
+		s->time->h += timelib_meridian(&ptr, s->time->h);
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME12;
 	}
@@ -1205,17 +1215,17 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("mssqltime");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
 		if (*ptr == ':' || *ptr == '.') {
-			s->time->s = timelib_get_nr((char **) &ptr, 2);
+			s->time->s = timelib_get_nr(&ptr, 2);
 
 			if (*ptr == ':' || *ptr == '.') {
-				s->time->us = timelib_get_frac_nr((char **) &ptr, 8);
+				s->time->us = timelib_get_frac_nr(&ptr, 8);
 			}
 		}
-		timelib_eat_spaces((char **) &ptr);
-		s->time->h += timelib_meridian((char **) &ptr, s->time->h);
+		timelib_eat_spaces(&ptr);
+		s->time->h += timelib_meridian(&ptr, s->time->h);
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
@@ -1226,18 +1236,18 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
 		if (*ptr == ':' || *ptr == '.') {
-			s->time->s = timelib_get_nr((char **) &ptr, 2);
+			s->time->s = timelib_get_nr(&ptr, 2);
 
 			if (*ptr == '.') {
-				s->time->us = timelib_get_frac_nr((char **) &ptr, 8);
+				s->time->us = timelib_get_frac_nr(&ptr, 8);
 			}
 		}
 
 		if (*ptr != '\0') {
-			s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+			s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 			if (tz_not_found) {
 				add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 			}
@@ -1252,12 +1262,12 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_INIT;
 		switch (s->time->have_time) {
 			case 0:
-				s->time->h = timelib_get_nr((char **) &ptr, 2);
-				s->time->i = timelib_get_nr((char **) &ptr, 2);
+				s->time->h = timelib_get_nr(&ptr, 2);
+				s->time->i = timelib_get_nr(&ptr, 2);
 				s->time->s = 0;
 				break;
 			case 1:
-				s->time->y = timelib_get_nr((char **) &ptr, 4);
+				s->time->y = timelib_get_nr(&ptr, 4);
 				break;
 			default:
 				TIMELIB_DEINIT;
@@ -1275,13 +1285,13 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_INIT;
 		switch (s->time->have_time) {
 			case 0:
-				s->time->h = timelib_get_nr((char **) &ptr, 2);
-				s->time->i = timelib_get_nr((char **) &ptr, 2);
+				s->time->h = timelib_get_nr(&ptr, 2);
+				s->time->i = timelib_get_nr(&ptr, 2);
 				s->time->s = 0;
-				s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, s->tzdb, tz_get_wrapper);
+				s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, s->tzdb, tz_get_wrapper);
 				break;
 			case 1:
-				s->time->y = timelib_get_nr((char **) &ptr, 4);
+				s->time->y = timelib_get_nr(&ptr, 4);
 				break;
 			default:
 				TIMELIB_DEINIT;
@@ -1298,12 +1308,12 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("iso8601nocolon");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
-		s->time->s = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
+		s->time->s = timelib_get_nr(&ptr, 2);
 
 		if (*ptr != '\0') {
-			s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+			s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 			if (tz_not_found) {
 				add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 			}
@@ -1318,10 +1328,10 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("americanshort | american");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		if (*ptr == '/') {
-			s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
+			s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
 			TIMELIB_PROCESS_YEAR(s->time->y, length);
 		}
 		TIMELIB_DEINIT;
@@ -1333,9 +1343,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_unsigned_nr((char **) &ptr, 4);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_unsigned_nr(&ptr, 4);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
@@ -1346,22 +1356,34 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("iso8601date2");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
 
+	iso8601datex
+	{
+		DEBUG_OUTPUT("iso8601datex");
+		TIMELIB_INIT;
+		TIMELIB_HAVE_DATE();
+		s->time->y = timelib_get_unsigned_nr(&ptr, 19);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		TIMELIB_DEINIT;
+		return TIMELIB_ISO_DATE;
+	}
+
 	gnudateshorter
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshorter");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->m = timelib_get_nr(&ptr, 2);
 		s->time->d = 1;
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
@@ -1374,9 +1396,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("gnudateshort");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
@@ -1388,10 +1410,10 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("datefull");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		timelib_skip_day_suffix((char **) &ptr);
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		timelib_skip_day_suffix(&ptr);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL;
@@ -1402,9 +1424,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("pointed date YYYY");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->y = timelib_get_nr(&ptr, 4);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
@@ -1415,9 +1437,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("pointed date YY");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 2, &length);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 2, &length);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
@@ -1429,8 +1451,8 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("datenoday");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
 		s->time->d = 1;
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
@@ -1443,8 +1465,8 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("datenodayrev");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->m = timelib_get_month((char **) &ptr);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->m = timelib_get_month(&ptr);
 		s->time->d = 1;
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
@@ -1457,9 +1479,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("datetextual | datenoyear");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
@@ -1470,9 +1492,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("datenoyearrev");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		timelib_skip_day_suffix((char **) &ptr);
-		s->time->m = timelib_get_month((char **) &ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		timelib_skip_day_suffix(&ptr);
+		s->time->m = timelib_get_month(&ptr);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
@@ -1482,9 +1504,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("datenocolon");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr(&ptr, 4);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NOCOLON;
 	}
@@ -1496,16 +1518,16 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
-		s->time->m = timelib_get_nr((char **) &ptr, 2);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
-		s->time->s = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr(&ptr, 4);
+		s->time->m = timelib_get_nr(&ptr, 2);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
+		s->time->s = timelib_get_nr(&ptr, 2);
 		if (*ptr == '.') {
-			s->time->us = timelib_get_frac_nr((char **) &ptr, 9);
+			s->time->us = timelib_get_frac_nr(&ptr, 9);
 			if (*ptr) { /* timezone is optional */
-				s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+				s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 				if (tz_not_found) {
 					add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 				}
@@ -1521,8 +1543,8 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("pgydotd");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->d = timelib_get_nr((char **) &ptr, 3);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->d = timelib_get_nr(&ptr, 3);
 		s->time->m = 1;
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
@@ -1537,9 +1559,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_HAVE_DATE();
 		TIMELIB_HAVE_RELATIVE();
 
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
-		w = timelib_get_nr((char **) &ptr, 2);
-		d = timelib_get_nr((char **) &ptr, 1);
+		s->time->y = timelib_get_nr(&ptr, 4);
+		w = timelib_get_nr(&ptr, 2);
+		d = timelib_get_nr(&ptr, 1);
 		s->time->m = 1;
 		s->time->d = 1;
 		s->time->relative.d = timelib_daynr_from_weeknr(s->time->y, w, d);
@@ -1556,8 +1578,8 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_HAVE_DATE();
 		TIMELIB_HAVE_RELATIVE();
 
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
-		w = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr(&ptr, 4);
+		w = timelib_get_nr(&ptr, 2);
 		d = 1;
 		s->time->m = 1;
 		s->time->d = 1;
@@ -1573,9 +1595,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("pgtextshort");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
@@ -1587,9 +1609,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("pgtextreverse");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length);
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->y = timelib_get_nr_ex(&ptr, 4, &length);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
 		TIMELIB_PROCESS_YEAR(s->time->y, length);
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
@@ -1602,13 +1624,13 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TIME();
 		TIMELIB_HAVE_DATE();
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
-		s->time->s = timelib_get_nr((char **) &ptr, 2);
-		s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+		s->time->d = timelib_get_nr(&ptr, 2);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->y = timelib_get_nr(&ptr, 4);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
+		s->time->s = timelib_get_nr(&ptr, 2);
+		s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 		if (tz_not_found) {
 			add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 		}
@@ -1620,7 +1642,7 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 	{
 		DEBUG_OUTPUT("year4");
 		TIMELIB_INIT;
-		s->time->y = timelib_get_nr((char **) &ptr, 4);
+		s->time->y = timelib_get_nr(&ptr, 4);
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
@@ -1654,7 +1676,7 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_HAVE_RELATIVE();
 		TIMELIB_HAVE_WEEKDAY_RELATIVE();
 		TIMELIB_UNHAVE_TIME();
-		relunit = timelib_lookup_relunit((char**) &ptr);
+		relunit = timelib_lookup_relunit(&ptr);
 		s->time->relative.weekday = relunit->multiplier;
 		if (s->time->relative.weekday_behavior != 2) {
 			s->time->relative.weekday_behavior = 1;
@@ -1673,9 +1695,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_HAVE_RELATIVE();
 
 		while(*ptr) {
-			i = timelib_get_relative_text((char **) &ptr, &behavior);
-			timelib_eat_spaces((char **) &ptr);
-			timelib_set_relative((char **) &ptr, i, behavior, s);
+			i = timelib_get_relative_text(&ptr, &behavior);
+			timelib_eat_spaces(&ptr);
+			timelib_set_relative(&ptr, i, behavior, s);
 			s->time->relative.weekday_behavior = 2;
 
 			/* to handle the format weekday + last/this/next week */
@@ -1697,9 +1719,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_HAVE_RELATIVE();
 
 		while(*ptr) {
-			i = timelib_get_relative_text((char **) &ptr, &behavior);
-			timelib_eat_spaces((char **) &ptr);
-			timelib_set_relative((char **) &ptr, i, behavior, s);
+			i = timelib_get_relative_text(&ptr, &behavior);
+			timelib_eat_spaces(&ptr);
+			timelib_set_relative(&ptr, i, behavior, s);
 		}
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
@@ -1710,7 +1732,7 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("monthtext");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_lookup_month((char **) &ptr);
+		s->time->m = timelib_lookup_month(&ptr);
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
@@ -1721,7 +1743,7 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("tzcorrection | tz");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_TZ();
-		s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+		s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 		if (tz_not_found) {
 			add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 		}
@@ -1734,21 +1756,21 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
 
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
 		if (*ptr == ':' || *ptr == '.') {
-			s->time->s = timelib_get_nr((char **) &ptr, 2);
+			s->time->s = timelib_get_nr(&ptr, 2);
 
 			if (*ptr == '.') {
-				s->time->us = timelib_get_frac_nr((char **) &ptr, 8);
+				s->time->us = timelib_get_frac_nr(&ptr, 8);
 			}
 		}
 
-		s->time->h += timelib_meridian((char **) &ptr, s->time->h);
+		s->time->h += timelib_meridian(&ptr, s->time->h);
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
@@ -1759,22 +1781,22 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz");
 		TIMELIB_INIT;
 		TIMELIB_HAVE_DATE();
-		s->time->m = timelib_get_month((char **) &ptr);
-		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->m = timelib_get_month(&ptr);
+		s->time->d = timelib_get_nr(&ptr, 2);
 
 		TIMELIB_HAVE_TIME();
-		s->time->h = timelib_get_nr((char **) &ptr, 2);
-		s->time->i = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr(&ptr, 2);
+		s->time->i = timelib_get_nr(&ptr, 2);
 		if (*ptr == ':') {
-			s->time->s = timelib_get_nr((char **) &ptr, 2);
+			s->time->s = timelib_get_nr(&ptr, 2);
 
 			if (*ptr == '.') {
-				s->time->us = timelib_get_frac_nr((char **) &ptr, 8);
+				s->time->us = timelib_get_frac_nr(&ptr, 8);
 			}
 		}
 
 		if (*ptr != '\0') {
-			s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+			s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 			if (tz_not_found) {
 				add_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database");
 			}
@@ -1791,9 +1813,9 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		TIMELIB_HAVE_RELATIVE();
 
 		while(*ptr) {
-			i = timelib_get_unsigned_nr((char **) &ptr, 24);
-			timelib_eat_spaces((char **) &ptr);
-			timelib_set_relative((char **) &ptr, i, 1, s);
+			i = timelib_get_unsigned_nr(&ptr, 24);
+			timelib_eat_spaces(&ptr);
+			timelib_set_relative(&ptr, i, 1, s);
 		}
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
@@ -1820,11 +1842,11 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 
 /*!max:re2c */
 
-timelib_time* timelib_strtotime(char *s, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper)
+timelib_time *timelib_strtotime(const char *s, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper)
 {
 	Scanner in;
 	int t;
-	char *e = s + len - 1;
+	const char *e = s + len - 1;
 
 	memset(&in, 0, sizeof(in));
 	in.errors = timelib_malloc(sizeof(timelib_error_container));
@@ -2000,16 +2022,16 @@ static timelib_format_specifier_code timelib_lookup_format(char input, const tim
 	return TIMELIB_FORMAT_LITERAL;
 }
 
-timelib_time *timelib_parse_from_format(char *format, char *string, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper)
+timelib_time *timelib_parse_from_format(const char *format, const char *string, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper)
 {
 	return timelib_parse_from_format_with_map(format, string, len, errors, tzdb, tz_get_wrapper, &default_format_config);
 }
 
-timelib_time *timelib_parse_from_format_with_map(char *format, char *string, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper, const timelib_format_config* format_config)
+timelib_time *timelib_parse_from_format_with_map(const char *format, const char *string, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper, const timelib_format_config* format_config)
 {
-	char        *fptr = format;
-	char        *ptr = string;
-	char        *begin;
+	const char  *fptr = format;
+	const char  *ptr = string;
+	const char  *begin;
 	timelib_sll  tmp;
 	Scanner      in;
 	Scanner     *s = &in;
@@ -2083,7 +2105,7 @@ timelib_time *timelib_parse_from_format_with_map(char *format, char *string, siz
 				{
 					const timelib_relunit* tmprel = 0;
 
-					tmprel = timelib_lookup_relunit((char **) &ptr);
+					tmprel = timelib_lookup_relunit(&ptr);
 					if (!tmprel) {
 						add_pbf_error(s, TIMELIB_ERR_NO_TEXTUAL_DAY, "A textual day could not be found", string, begin);
 						break;
@@ -2098,81 +2120,107 @@ timelib_time *timelib_parse_from_format_with_map(char *format, char *string, siz
 			case TIMELIB_FORMAT_DAY_TWO_DIGIT: /* two digit day, without leading zero */
 			case TIMELIB_FORMAT_DAY_TWO_DIGIT_PADDED: /* two digit day, with leading zero */
 				TIMELIB_CHECK_NUMBER;
-				if ((s->time->d = timelib_get_nr((char **) &ptr, 2)) == TIMELIB_UNSET) {
+				if ((s->time->d = timelib_get_nr(&ptr, 2)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_DAY, "A two digit day could not be found", string, begin);
+					break;
 				}
+
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_DAY_SUFFIX: /* day suffix, ignored, nor checked */
-				timelib_skip_day_suffix((char **) &ptr);
+				timelib_skip_day_suffix(&ptr);
 				break;
 			case TIMELIB_FORMAT_DAY_OF_YEAR: /* day of year - resets month (0 based) - also initializes everything else to !TIMELIB_UNSET */
 				TIMELIB_CHECK_NUMBER;
-				if ((tmp = timelib_get_nr((char **) &ptr, 3)) == TIMELIB_UNSET) {
+				if ((tmp = timelib_get_nr(&ptr, 3)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_THREE_DIGIT_DAY_OF_YEAR, "A three digit day-of-year could not be found", string, begin);
-				} else {
-					s->time->m = 1;
-					s->time->d = tmp + 1;
-					timelib_do_normalize(s->time);
+					break;
 				}
+
+				s->time->have_date = 1;
+				s->time->m = 1;
+				s->time->d = tmp + 1;
+				timelib_do_normalize(s->time);
 				break;
 
 			case TIMELIB_FORMAT_MONTH_TWO_DIGIT: /* two digit month, without leading zero */
 			case TIMELIB_FORMAT_MONTH_TWO_DIGIT_PADDED: /* two digit month, with leading zero */
 				TIMELIB_CHECK_NUMBER;
-				if ((s->time->m = timelib_get_nr((char **) &ptr, 2)) == TIMELIB_UNSET) {
+				if ((s->time->m = timelib_get_nr(&ptr, 2)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_MONTH, "A two digit month could not be found", string, begin);
+					break;
 				}
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_TEXTUAL_MONTH_3_LETTER: /* three letter month */
 			case TIMELIB_FORMAT_TEXTUAL_MONTH_FULL: /* full month */
-				tmp = timelib_lookup_month((char **) &ptr);
+				tmp = timelib_lookup_month(&ptr);
 				if (!tmp) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TEXTUAL_MONTH, "A textual month could not be found", string, begin);
-				} else {
-					s->time->m = tmp;
+					break;
 				}
+
+				s->time->have_date = 1;
+				s->time->m = tmp;
 				break;
 			case TIMELIB_FORMAT_YEAR_TWO_DIGIT: /* two digit year */
 				{
 					int length = 0;
 					TIMELIB_CHECK_NUMBER;
-					if ((s->time->y = timelib_get_nr_ex((char **) &ptr, 2, &length)) == TIMELIB_UNSET) {
+					if ((s->time->y = timelib_get_nr_ex(&ptr, 2, &length)) == TIMELIB_UNSET) {
 						add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_YEAR, "A two digit year could not be found", string, begin);
+						break;
 					}
+					
+					s->time->have_date = 1;
 					TIMELIB_PROCESS_YEAR(s->time->y, length);
 				}
 				break;
 			case TIMELIB_FORMAT_YEAR_FOUR_DIGIT: /* four digit year */
 				TIMELIB_CHECK_NUMBER;
-				if ((s->time->y = timelib_get_nr((char **) &ptr, 4)) == TIMELIB_UNSET) {
+				if ((s->time->y = timelib_get_nr(&ptr, 4)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_FOUR_DIGIT_YEAR, "A four digit year could not be found", string, begin);
+					break;
 				}
+
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_HOUR_TWO_DIGIT_12_MAX: /* two digit hour, without leading zero */
 			case TIMELIB_FORMAT_HOUR_TWO_DIGIT_12_MAX_PADDED: /* two digit hour, with leading zero */
 				TIMELIB_CHECK_NUMBER;
-				if ((s->time->h = timelib_get_nr((char **) &ptr, 2)) == TIMELIB_UNSET) {
+				if ((s->time->h = timelib_get_nr(&ptr, 2)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_HOUR, "A two digit hour could not be found", string, begin);
+					break;
 				}
 				if (s->time->h > 12) {
 					add_pbf_error(s, TIMELIB_ERR_HOUR_LARGER_THAN_12, "Hour can not be higher than 12", string, begin);
+					break;
 				}
+
+				s->time->have_time = 1;
 				break;
 			case TIMELIB_FORMAT_HOUR_TWO_DIGIT_24_MAX_PADDED: /* two digit hour, with leading zero */
 			case TIMELIB_FORMAT_HOUR_TWO_DIGIT_24_MAX: /* two digit hour, without leading zero */
 				TIMELIB_CHECK_NUMBER;
-				if ((s->time->h = timelib_get_nr((char **) &ptr, 2)) == TIMELIB_UNSET) {
+				if ((s->time->h = timelib_get_nr(&ptr, 2)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_HOUR, "A two digit hour could not be found", string, begin);
+					break;
 				}
+
+				s->time->have_time = 1;
 				break;
 			case TIMELIB_FORMAT_MERIDIAN: /* am/pm/a.m./p.m. AM/PM/A.M./P.M. */
 				if (s->time->h == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_MERIDIAN_BEFORE_HOUR, "Meridian can only come after an hour has been found", string, begin);
-				} else if ((tmp = timelib_meridian_with_check((char **) &ptr, s->time->h)) == TIMELIB_UNSET) {
+					break;
+				}
+				if ((tmp = timelib_meridian_with_check(&ptr, s->time->h)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_MERIDIAN, "A meridian could not be found", string, begin);
-				} else {
-					s->time->h += tmp;
+					break;
 				}
+
+				s->time->have_time = 1;
+				s->time->h += tmp;
 				break;
 			case TIMELIB_FORMAT_MINUTE_TWO_DIGIT: /* two digit minute, with leading zero */
 				{
@@ -2180,12 +2228,14 @@ timelib_time *timelib_parse_from_format_with_map(char *format, char *string, siz
 					timelib_sll min;
 
 					TIMELIB_CHECK_NUMBER;
-					min = timelib_get_nr_ex((char **) &ptr, 2, &length);
+					min = timelib_get_nr_ex(&ptr, 2, &length);
 					if (min == TIMELIB_UNSET || length != 2) {
 						add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_MINUTE, "A two digit minute could not be found", string, begin);
-					} else {
-						s->time->i = min;
+						break;
 					}
+
+					s->time->have_time = 1;
+					s->time->i = min;
 				}
 				break;
 			case TIMELIB_FORMAT_SECOND_TWO_DIGIT: /* two digit second, with leading zero */
@@ -2194,73 +2244,77 @@ timelib_time *timelib_parse_from_format_with_map(char *format, char *string, siz
 					timelib_sll sec;
 
 					TIMELIB_CHECK_NUMBER;
-					sec = timelib_get_nr_ex((char **) &ptr, 2, &length);
+					sec = timelib_get_nr_ex(&ptr, 2, &length);
 					if (sec == TIMELIB_UNSET || length != 2) {
 						add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_SECOND, "A two digit second could not be found", string, begin);
-					} else {
-						s->time->s = sec;
+						break;
 					}
+
+					s->time->have_time = 1;
+					s->time->s = sec;
 				}
 				break;
 			case TIMELIB_FORMAT_MICROSECOND_SIX_DIGIT: /* up to six digit microsecond */
 				{
 					double f;
-					char *tptr;
+					const char *tptr;
 
 					TIMELIB_CHECK_NUMBER;
 					tptr = ptr;
-					if ((f = timelib_get_nr((char **) &ptr, 6)) == TIMELIB_UNSET || (ptr - tptr < 1)) {
+					if ((f = timelib_get_nr(&ptr, 6)) == TIMELIB_UNSET || (ptr - tptr < 1)) {
 						add_pbf_error(s, TIMELIB_ERR_NO_SIX_DIGIT_MICROSECOND, "A six digit microsecond could not be found", string, begin);
-					} else {
-						s->time->us = (f * pow(10, 6 - (ptr - tptr)));
+						break;
 					}
+
+					s->time->us = (f * pow(10, 6 - (ptr - tptr)));
 				}
 				break;
 			case TIMELIB_FORMAT_MILLISECOND_THREE_DIGIT: /* up to three digit millisecond */
 				{
 					double f;
-					char *tptr;
+					const char *tptr;
 
 					TIMELIB_CHECK_NUMBER;
 					tptr = ptr;
-					if ((f = timelib_get_nr((char **) &ptr, 3)) == TIMELIB_UNSET || (ptr - tptr < 1)) {
+					if ((f = timelib_get_nr(&ptr, 3)) == TIMELIB_UNSET || (ptr - tptr < 1)) {
 						add_pbf_error(s, TIMELIB_ERR_NO_THREE_DIGIT_MILLISECOND, "A three digit millisecond could not be found", string, begin);
-					} else {
-						s->time->us = (f * pow(10, 3 - (ptr - tptr)) * 1000);
+						break;
 					}
+					
+					s->time->us = (f * pow(10, 3 - (ptr - tptr)) * 1000);
 				}
 				break;
 			case TIMELIB_FORMAT_WHITESPACE: /* any sort of whitespace (' ' and \t) */
-				timelib_eat_spaces((char **) &ptr);
+				timelib_eat_spaces(&ptr);
 				break;
 			case TIMELIB_FORMAT_EPOCH_SECONDS: /* epoch seconds */
 				TIMELIB_CHECK_SIGNED_NUMBER;
-				TIMELIB_HAVE_RELATIVE();
-				tmp = timelib_get_unsigned_nr((char **) &ptr, 24);
-				s->time->y = 1970;
-				s->time->m = 1;
-				s->time->d = 1;
-				s->time->h = s->time->i = s->time->s = 0;
-				s->time->relative.s += tmp;
+				tmp = timelib_get_unsigned_nr(&ptr, 24);
+				s->time->have_zone = 1;
+				s->time->sse = tmp;
 				s->time->is_localtime = 1;
 				s->time->zone_type = TIMELIB_ZONETYPE_OFFSET;
 				s->time->z = 0;
 				s->time->dst = 0;
+				timelib_update_from_sse(s->time);
 				break;
+
 			case TIMELIB_FORMAT_ANY_SEPARATOR: /* separation symbol */
-				if (timelib_lookup_format(*ptr, format_map) == TIMELIB_FORMAT_SEPARATOR) {
-					++ptr;
-				} else {
+				if (timelib_lookup_format(*ptr, format_map) != TIMELIB_FORMAT_SEPARATOR) {
 					add_pbf_error(s, TIMELIB_ERR_NO_SEP_SYMBOL, "The separation symbol ([;:/.,-]) could not be found", string, begin);
+					break;
 				}
+				
+				++ptr;
 				break;
 
 			case TIMELIB_FORMAT_SEPARATOR:
-				if (*ptr == *fptr) {
-					++ptr;
-				} else {
+				if (*ptr != *fptr) {
 					add_pbf_error(s, TIMELIB_ERR_NO_SEP_SYMBOL, "The separation symbol could not be found", string, begin);
+					break;
 				}
+
+				++ptr;
 				break;
 
 			case TIMELIB_FORMAT_RESET_ALL: /* reset all fields to default */
@@ -2276,62 +2330,80 @@ timelib_time *timelib_parse_from_format_with_map(char *format, char *string, siz
 				break;
 
 			case TIMELIB_FORMAT_ESCAPE: /* escaped char */
-				if(!fptr[1]) {
+				if (!fptr[1]) {
 					add_pbf_error(s, TIMELIB_ERR_EXPECTED_ESCAPE_CHAR, "Escaped character expected", string, begin);
 					break;
 				}
 				fptr++;
-				if (*ptr == *fptr) {
-					++ptr;
-				} else {
+				if (*ptr != *fptr) {
 					add_pbf_error(s, TIMELIB_ERR_NO_ESCAPED_CHAR, "The escaped character could not be found", string, begin);
+					break;
 				}
+
+				++ptr;
 				break;
 
 			case TIMELIB_FORMAT_SKIP_TO_SEPARATOR: /* random chars until a separator or number ([ \t.,:;/-0123456789]) */
-				timelib_eat_until_separator((char **) &ptr);
+				timelib_eat_until_separator(&ptr);
 				break;
 
 			case TIMELIB_FORMAT_ALLOW_EXTRA_CHARACTERS: /* allow extra chars in the format */
 				allow_extra = true;
 				break;
 			case TIMELIB_FORMAT_YEAR_ISO:
-				if ((iso_year = timelib_get_nr((char **) &ptr, 4)) == TIMELIB_UNSET) {
+				if ((iso_year = timelib_get_nr(&ptr, 4)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_FOUR_DIGIT_YEAR_ISO, "A four digit ISO year could not be found", string, begin);
+					break;
 				}
+
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_WEEK_OF_YEAR_ISO:
-				if ((iso_week_of_year = timelib_get_nr((char **) &ptr, 2)) == TIMELIB_UNSET) {
+				if ((iso_week_of_year = timelib_get_nr(&ptr, 2)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_TWO_DIGIT_WEEK, "A two digit ISO week could not be found", string, begin);
+					break;
 				}
 				/* Range is 1 - 53  for ISO week of year */
 				if (iso_week_of_year < 1 || iso_week_of_year > 53) {
 					add_pbf_error(s, TIMELIB_ERR_INVALID_WEEK, "ISO Week must be between 1 and 53", string, begin);
+					break;
 				}
+
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_DAY_OF_WEEK_ISO:
-				if ((iso_day_of_week = timelib_get_nr((char **) &ptr, 1)) == TIMELIB_UNSET) {
+				if ((iso_day_of_week = timelib_get_nr(&ptr, 1)) == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_NO_DAY_OF_WEEK, "A single digit day of week could not be found", string, begin);
+					break;
 				}
 				if (iso_day_of_week < 1 || iso_day_of_week > 7) {
 					add_pbf_error(s, TIMELIB_ERR_INVALID_DAY_OF_WEEK, "Day of week must be between 1 and 7", string, begin);
+					break;
 				}
+
+				s->time->have_date = 1;
 				break;
 			case TIMELIB_FORMAT_TIMEZONE_OFFSET: /* timezone */
 				{
 					int tz_not_found;
 
-					s->time->z = timelib_parse_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
+					s->time->z = timelib_parse_zone(&ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb, tz_get_wrapper);
 					if (tz_not_found) {
 						add_pbf_error(s, TIMELIB_ERR_TZID_NOT_FOUND, "The timezone could not be found in the database", string, begin);
+						break;
 					}
+
+					s->time->have_zone = 1;
 				}
 				break;
 			case TIMELIB_FORMAT_TIMEZONE_OFFSET_MINUTES: /* timezone format +/-mmm */
-				s->time->z = timelib_parse_tz_minutes((char **) &ptr, s->time);
+				s->time->z = timelib_parse_tz_minutes(&ptr, s->time);
 				if (s->time->z == TIMELIB_UNSET) {
 					add_pbf_error(s, TIMELIB_ERR_INVALID_TZ_OFFSET, "Invalid timezone offset in minutes", string, begin);
+					break;
 				}
+
+				s->time->have_zone = 1;
 				break;
 			case TIMELIB_FORMAT_LITERAL:
 			default:
diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c
index 80c20b4f70..7313df7a50 100644
--- a/ext/date/lib/parse_iso_intervals.c
+++ b/ext/date/lib/parse_iso_intervals.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 2.0.3 on Mon Aug 31 11:41:00 2020 */
+/* Generated by re2c 2.0.3 on Mon Aug 31 11:54:50 2020 */
 #line 1 "parse_iso_intervals.re"
 /*
  * The MIT License (MIT)
@@ -105,9 +105,10 @@ static char *timelib_string(Scanner *s)
 	return tmp;
 }
 
-static timelib_sll timelib_get_nr(char **ptr, int max_length)
+static timelib_sll timelib_get_nr(const char **ptr, int max_length)
 {
-	char *begin, *end, *str;
+	const char *begin, *end;
+	char *str;
 	timelib_sll tmp_nr = TIMELIB_UNSET;
 	int len = 0;
 
@@ -130,7 +131,7 @@ static timelib_sll timelib_get_nr(char **ptr, int max_length)
 	return tmp_nr;
 }
 
-static timelib_ull timelib_get_unsigned_nr(char **ptr, int max_length)
+static timelib_ull timelib_get_unsigned_nr(const char **ptr, int max_length)
 {
 	timelib_ull dir = 1;
 
@@ -169,16 +170,17 @@ static timelib_ull timelib_get_unsigned_nr(char **ptr, int max_length)
 static int scan(Scanner *s)
 {
 	uchar *cursor = s->cur;
-	char *str, *ptr = NULL;
+	char *str;
+	const char *ptr = NULL;
 
 std:
 	s->tok = cursor;
 	s->len = 0;
-#line 202 "parse_iso_intervals.re"
+#line 204 "parse_iso_intervals.re"
 
 
 
-#line 182 "<stdout>"
+#line 184 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
@@ -245,32 +247,32 @@ yy2:
 	YYDEBUG(2, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(3, *YYCURSOR);
-#line 309 "parse_iso_intervals.re"
+#line 311 "parse_iso_intervals.re"
 	{
 		s->pos = cursor; s->line++;
 		goto std;
 	}
-#line 254 "<stdout>"
+#line 256 "<stdout>"
 yy4:
 	YYDEBUG(4, *YYCURSOR);
 	++YYCURSOR;
 yy5:
 	YYDEBUG(5, *YYCURSOR);
-#line 315 "parse_iso_intervals.re"
+#line 317 "parse_iso_intervals.re"
 	{
 		add_error(s, "Unexpected character");
 		goto std;
 	}
-#line 265 "<stdout>"
+#line 267 "<stdout>"
 yy6:
 	YYDEBUG(6, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(7, *YYCURSOR);
-#line 304 "parse_iso_intervals.re"
+#line 306 "parse_iso_intervals.re"
 	{
 		goto std;
 	}
-#line 274 "<stdout>"
+#line 276 "<stdout>"
 yy8:
 	YYDEBUG(8, *YYCURSOR);
 	yyaccept = 0;
@@ -287,7 +289,7 @@ yy9:
 	if (yych == 'T') goto yy15;
 yy10:
 	YYDEBUG(10, *YYCURSOR);
-#line 242 "parse_iso_intervals.re"
+#line 244 "parse_iso_intervals.re"
 	{
 		timelib_sll nr;
 		int         in_time = 0;
@@ -304,7 +306,7 @@ yy10:
 				break;
 			}
 
-			nr = timelib_get_unsigned_nr((char **) &ptr, 12);
+			nr = timelib_get_unsigned_nr(&ptr, 12);
 			switch (*ptr) {
 				case 'Y': s->period->y = nr; break;
 				case 'W': s->period->d = nr * 7; break;
@@ -328,7 +330,7 @@ yy10:
 		TIMELIB_DEINIT;
 		return TIMELIB_PERIOD;
 	}
-#line 332 "<stdout>"
+#line 334 "<stdout>"
 yy11:
 	YYDEBUG(11, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -387,17 +389,17 @@ yy16:
 		goto yy16;
 	}
 	YYDEBUG(18, *YYCURSOR);
-#line 207 "parse_iso_intervals.re"
+#line 209 "parse_iso_intervals.re"
 	{
 		DEBUG_OUTPUT("recurrences");
 		TIMELIB_INIT;
 		ptr++;
-		s->recurrences = timelib_get_unsigned_nr((char **) &ptr, 9);
+		s->recurrences = timelib_get_unsigned_nr(&ptr, 9);
 		TIMELIB_DEINIT;
 		s->have_recurrences = 1;
 		return TIMELIB_PERIOD;
 	}
-#line 401 "<stdout>"
+#line 403 "<stdout>"
 yy19:
 	YYDEBUG(19, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -892,7 +894,7 @@ yy89:
 	YYDEBUG(89, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(90, *YYCURSOR);
-#line 218 "parse_iso_intervals.re"
+#line 220 "parse_iso_intervals.re"
 	{
 		timelib_time *current;
 
@@ -905,17 +907,17 @@ yy89:
 		}
 		DEBUG_OUTPUT("datetimebasic | datetimeextended");
 		TIMELIB_INIT;
-		current->y = timelib_get_nr((char **) &ptr, 4);
-		current->m = timelib_get_nr((char **) &ptr, 2);
-		current->d = timelib_get_nr((char **) &ptr, 2);
-		current->h = timelib_get_nr((char **) &ptr, 2);
-		current->i = timelib_get_nr((char **) &ptr, 2);
-		current->s = timelib_get_nr((char **) &ptr, 2);
+		current->y = timelib_get_nr(&ptr, 4);
+		current->m = timelib_get_nr(&ptr, 2);
+		current->d = timelib_get_nr(&ptr, 2);
+		current->h = timelib_get_nr(&ptr, 2);
+		current->i = timelib_get_nr(&ptr, 2);
+		current->s = timelib_get_nr(&ptr, 2);
 		s->have_date = 1;
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 919 "<stdout>"
+#line 921 "<stdout>"
 yy91:
 	YYDEBUG(91, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -935,28 +937,28 @@ yy91:
 	YYDEBUG(95, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(96, *YYCURSOR);
-#line 284 "parse_iso_intervals.re"
+#line 286 "parse_iso_intervals.re"
 	{
 		DEBUG_OUTPUT("combinedrep");
 		TIMELIB_INIT;
-		s->period->y = timelib_get_unsigned_nr((char **) &ptr, 4);
+		s->period->y = timelib_get_unsigned_nr(&ptr, 4);
 		ptr++;
-		s->period->m = timelib_get_unsigned_nr((char **) &ptr, 2);
+		s->period->m = timelib_get_unsigned_nr(&ptr, 2);
 		ptr++;
-		s->period->d = timelib_get_unsigned_nr((char **) &ptr, 2);
+		s->period->d = timelib_get_unsigned_nr(&ptr, 2);
 		ptr++;
-		s->period->h = timelib_get_unsigned_nr((char **) &ptr, 2);
+		s->period->h = timelib_get_unsigned_nr(&ptr, 2);
 		ptr++;
-		s->period->i = timelib_get_unsigned_nr((char **) &ptr, 2);
+		s->period->i = timelib_get_unsigned_nr(&ptr, 2);
 		ptr++;
-		s->period->s = timelib_get_unsigned_nr((char **) &ptr, 2);
+		s->period->s = timelib_get_unsigned_nr(&ptr, 2);
 		s->have_period = 1;
 		TIMELIB_DEINIT;
 		return TIMELIB_PERIOD;
 	}
-#line 958 "<stdout>"
+#line 960 "<stdout>"
 }
-#line 319 "parse_iso_intervals.re"
+#line 321 "parse_iso_intervals.re"
 
 }
 #ifdef PHP_WIN32
@@ -966,14 +968,14 @@ yy91:
 #define YYMAXFILL 20
 
 
-void timelib_strtointerval(char *s, size_t len,
+void timelib_strtointerval(const char *s, size_t len,
                            timelib_time **begin, timelib_time **end,
 						   timelib_rel_time **period, int *recurrences,
 						   timelib_error_container **errors)
 {
 	Scanner in;
 	int t;
-	char *e = s + len - 1;
+	const char *e = s + len - 1;
 
 	memset(&in, 0, sizeof(in));
 	in.errors = timelib_malloc(sizeof(timelib_error_container));
diff --git a/ext/date/lib/parse_iso_intervals.re b/ext/date/lib/parse_iso_intervals.re
index 6e863eabf3..55680758f0 100644
--- a/ext/date/lib/parse_iso_intervals.re
+++ b/ext/date/lib/parse_iso_intervals.re
@@ -103,9 +103,10 @@ static char *timelib_string(Scanner *s)
 	return tmp;
 }
 
-static timelib_sll timelib_get_nr(char **ptr, int max_length)
+static timelib_sll timelib_get_nr(const char **ptr, int max_length)
 {
-	char *begin, *end, *str;
+	const char *begin, *end;
+	char *str;
 	timelib_sll tmp_nr = TIMELIB_UNSET;
 	int len = 0;
 
@@ -128,7 +129,7 @@ static timelib_sll timelib_get_nr(char **ptr, int max_length)
 	return tmp_nr;
 }
 
-static timelib_ull timelib_get_unsigned_nr(char **ptr, int max_length)
+static timelib_ull timelib_get_unsigned_nr(const char **ptr, int max_length)
 {
 	timelib_ull dir = 1;
 
@@ -167,7 +168,8 @@ static timelib_ull timelib_get_unsigned_nr(char **ptr, int max_length)
 static int scan(Scanner *s)
 {
 	uchar *cursor = s->cur;
-	char *str, *ptr = NULL;
+	char *str;
+	const char *ptr = NULL;
 
 std:
 	s->tok = cursor;
@@ -208,7 +210,7 @@ isoweek          = year4 "-"? "W" weekofyear;
 		DEBUG_OUTPUT("recurrences");
 		TIMELIB_INIT;
 		ptr++;
-		s->recurrences = timelib_get_unsigned_nr((char **) &ptr, 9);
+		s->recurrences = timelib_get_unsigned_nr(&ptr, 9);
 		TIMELIB_DEINIT;
 		s->have_recurrences = 1;
 		return TIMELIB_PERIOD;
@@ -227,12 +229,12 @@ isoweek          = year4 "-"? "W" weekofyear;
 		}
 		DEBUG_OUTPUT("datetimebasic | datetimeextended");
 		TIMELIB_INIT;
-		current->y = timelib_get_nr((char **) &ptr, 4);
-		current->m = timelib_get_nr((char **) &ptr, 2);
-		current->d = timelib_get_nr((char **) &ptr, 2);
-		current->h = timelib_get_nr((char **) &ptr, 2);
-		current->i = timelib_get_nr((char **) &ptr, 2);
-		current->s = timelib_get_nr((char **) &ptr, 2);
+		current->y = timelib_get_nr(&ptr, 4);
+		current->m = timelib_get_nr(&ptr, 2);
+		current->d = timelib_get_nr(&ptr, 2);
+		current->h = timelib_get_nr(&ptr, 2);
+		current->i = timelib_get_nr(&ptr, 2);
+		current->s = timelib_get_nr(&ptr, 2);
 		s->have_date = 1;
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
@@ -255,7 +257,7 @@ isoweek          = year4 "-"? "W" weekofyear;
 				break;
 			}
 
-			nr = timelib_get_unsigned_nr((char **) &ptr, 12);
+			nr = timelib_get_unsigned_nr(&ptr, 12);
 			switch (*ptr) {
 				case 'Y': s->period->y = nr; break;
 				case 'W': s->period->d = nr * 7; break;
@@ -284,17 +286,17 @@ isoweek          = year4 "-"? "W" weekofyear;
 	{
 		DEBUG_OUTPUT("combinedrep");
 		TIMELIB_INIT;
-		s->period->y = timelib_get_unsigned_nr((char **) &ptr, 4);
+		s->period->y = timelib_get_unsigned_nr(&ptr, 4);
 		ptr++;
-		s->period->m = timelib_get_unsigned_nr((char **) &ptr, 2);
+		s->period->m = timelib_get_unsigned_nr(&ptr, 2);
 		ptr++;
-		s->period->d = timelib_get_unsigned_nr((char **) &ptr, 2);
+		s->period->d = timelib_get_unsigned_nr(&ptr, 2);
 		ptr++;
-		s->period->h = timelib_get_unsigned_nr((char **) &ptr, 2);
+		s->period->h = timelib_get_unsigned_nr(&ptr, 2);
 		ptr++;
-		s->period->i = timelib_get_unsigned_nr((char **) &ptr, 2);
+		s->period->i = timelib_get_unsigned_nr(&ptr, 2);
 		ptr++;
-		s->period->s = timelib_get_unsigned_nr((char **) &ptr, 2);
+		s->period->s = timelib_get_unsigned_nr(&ptr, 2);
 		s->have_period = 1;
 		TIMELIB_DEINIT;
 		return TIMELIB_PERIOD;
@@ -324,14 +326,14 @@ isoweek          = year4 "-"? "W" weekofyear;
 
 /*!max:re2c */
 
-void timelib_strtointerval(char *s, size_t len,
+void timelib_strtointerval(const char *s, size_t len,
                            timelib_time **begin, timelib_time **end,
 						   timelib_rel_time **period, int *recurrences,
 						   timelib_error_container **errors)
 {
 	Scanner in;
 	int t;
-	char *e = s + len - 1;
+	const char *e = s + len - 1;
 
 	memset(&in, 0, sizeof(in));
 	in.errors = timelib_malloc(sizeof(timelib_error_container));
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index 020da3135e..233c55c14c 100644
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@ -39,6 +39,12 @@
 # endif
 #endif
 
+#if (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN))
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  define WORDS_BIGENDIAN
+# endif
+#endif
+
 #if defined(__s390__)
 # if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 #  define WORDS_BIGENDIAN
@@ -412,7 +418,7 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
 	}
 }
 
-static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
+static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb)
 {
 	int left = 0, right = tzdb->index_size - 1;
 
@@ -449,7 +455,7 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
 	return tzdb->index;
 }
 
-int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
+int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
 {
 	const unsigned char *tzf;
 	return (seek_to_tz_position(&tzf, timezone, tzdb));
@@ -482,7 +488,7 @@ static void read_64bit_header(const unsigned char **tzf, timelib_tzinfo *tz)
 	*tzf += sizeof(buffer);
 }
 
-static timelib_tzinfo* timelib_tzinfo_ctor(char *name)
+static timelib_tzinfo* timelib_tzinfo_ctor(const char *name)
 {
 	timelib_tzinfo *t;
 	t = timelib_calloc(1, sizeof(timelib_tzinfo));
@@ -491,7 +497,7 @@ static timelib_tzinfo* timelib_tzinfo_ctor(char *name)
 	return t;
 }
 
-timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code)
+timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
 {
 	const unsigned char *tzf;
 	timelib_tzinfo *tmp;
diff --git a/ext/date/lib/timelib.c b/ext/date/lib/timelib.c
index fc86619d63..45849458c2 100644
--- a/ext/date/lib/timelib.c
+++ b/ext/date/lib/timelib.c
@@ -115,7 +115,7 @@ timelib_rel_time* timelib_rel_time_clone(timelib_rel_time *rel)
 	return tmp;
 }
 
-void timelib_time_tz_abbr_update(timelib_time* tm, char* tz_abbr)
+void timelib_time_tz_abbr_update(timelib_time* tm, const char* tz_abbr)
 {
 	unsigned int i;
 	size_t tz_abbr_len = strlen(tz_abbr);
diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h
index 29e95e5e87..042b813e5d 100644
--- a/ext/date/lib/timelib.h
+++ b/ext/date/lib/timelib.h
@@ -322,9 +322,9 @@ typedef struct _timelib_tzdb {
 # define timelib_free    free
 #endif
 
-#define TIMELIB_VERSION 201804
-#define TIMELIB_EXTENDED_VERSION 20180401
-#define TIMELIB_ASCII_VERSION "2018.04"
+#define TIMELIB_VERSION 202001
+#define TIMELIB_EXTENDED_VERSION 20201001
+#define TIMELIB_ASCII_VERSION "2020.01"
 
 #define TIMELIB_NONE             0x00
 #define TIMELIB_OVERRIDE_TIME    0x01
@@ -401,7 +401,7 @@ typedef struct _timelib_format_config {
 } timelib_format_config;
 
 /* Function pointers */
-typedef timelib_tzinfo* (*timelib_tz_get_wrapper)(char *tzname, const timelib_tzdb *tzdb, int *error_code);
+typedef timelib_tzinfo* (*timelib_tz_get_wrapper)(const char *tzname, const timelib_tzdb *tzdb, int *error_code);
 
 /* From dow.c */
 /* Calculates the day of the week from y, m, and d. 0=Sunday..6=Saturday */
@@ -459,7 +459,7 @@ int timelib_valid_date(timelib_sll y, timelib_sll m, timelib_sll d);
  * The returned timelib_time* value is dynamically allocated and should be
  * freed with timelib_time_dtor().
  */
-timelib_time *timelib_strtotime(char *s, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper);
+timelib_time *timelib_strtotime(const char *s, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper);
 
 /* Parses the date/time string in 's' with length 'len' into the constituent
  * parts of timelib_time* according to the format in 'format'.
@@ -480,7 +480,7 @@ timelib_time *timelib_strtotime(char *s, size_t len, timelib_error_container **e
  * The returned timelib_time* value is dynamically allocated and should be
  * freed with timelib_time_dtor().
  */
-timelib_time *timelib_parse_from_format(char *format, char *s, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper);
+timelib_time *timelib_parse_from_format(const char *format, const char *s, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper);
 
 /* Parses the date/time string in 's' with length 'len' into the constituent
  * parts of timelib_time* according to the format in 'format' with format
@@ -494,7 +494,7 @@ timelib_time *timelib_parse_from_format(char *format, char *s, size_t len, timel
  * Note: 'format_map' must be terminated with specifier '\0' to indicate to the
  * parser that there are no more format specifiers in the list.
  */
-timelib_time *timelib_parse_from_format_with_map(char *format, char *s, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper, const timelib_format_config* format_config);
+timelib_time *timelib_parse_from_format_with_map(const char *format, const char *s, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper, const timelib_format_config* format_config);
 
 /* Fills the gaps in the parsed timelib_time with information from the reference date/time in 'now'
  *
@@ -552,7 +552,7 @@ const timelib_tz_lookup_table *timelib_timezone_abbreviations_list(void);
 /**
  * DEPRECATED, but still used by PHP.
  */
-timelib_long timelib_parse_zone(char **ptr, int *dst, timelib_time *t, int *tz_not_found, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_wrapper);
+timelib_long timelib_parse_zone(const char **ptr, int *dst, timelib_time *t, int *tz_not_found, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_wrapper);
 
 /* From parse_iso_intervals.re */
 
@@ -566,7 +566,7 @@ timelib_long timelib_parse_zone(char **ptr, int *dst, timelib_time *t, int *tz_n
  * occurred, inspect errors->errors_count. To see whether warnings have occurred,
  * inspect errors->warnings_count.
  */
-void timelib_strtointerval(char *s, size_t len,
+void timelib_strtointerval(const char *s, size_t len,
                            timelib_time **begin, timelib_time **end,
                            timelib_rel_time **period, int *recurrences,
                            timelib_error_container **errors);
@@ -665,7 +665,7 @@ void timelib_set_timezone(timelib_time *t, timelib_tzinfo *tz);
  * Returns whether the time zone ID 'timezone' is available in the time zone
  * database as pointed to be 'tzdb'.
  */
-int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb);
+int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb);
 
 /**
  * Converts the binary stored time zone information from 'tzdb' for the time
@@ -682,7 +682,7 @@ int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb);
  * be freed after use. Although it is recommended that a cache of each used
  * time zone is kept.
  */
-timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code);
+timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code);
 
 /**
  * Frees up the resources allocated by 'timelib_parse_tzfile'.
@@ -754,7 +754,7 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
  * Unlike 'timelib_builtin_db', the return value of this function must be freed
  * with the 'timelib_zoneinfo_dtor' function.
  */
-timelib_tzdb *timelib_zoneinfo(char *directory);
+timelib_tzdb *timelib_zoneinfo(const char *directory);
 
 /**
  * Frees up the resources as created through 'timelib_zoneinfo'.
diff --git a/ext/date/lib/timelib_private.h b/ext/date/lib/timelib_private.h
index 586f3d70da..23d0457faa 100644
--- a/ext/date/lib/timelib_private.h
+++ b/ext/date/lib/timelib_private.h
@@ -131,7 +131,7 @@ struct _tlinfo
 int timelib_apply_localtime(timelib_time *t, unsigned int localtime);
 
 /* From parse_tz.c */
-void timelib_time_tz_abbr_update(timelib_time* tm, char* tz_abbr);
+void timelib_time_tz_abbr_update(timelib_time* tm, const char* tz_abbr);
 
 /* From timelib.c */
 int timelib_strcasecmp(const char *s1, const char *s2);
diff --git a/ext/date/lib/timezonemap.h b/ext/date/lib/timezonemap.h
index c21280bca0..21b7998fcf 100644
--- a/ext/date/lib/timezonemap.h
+++ b/ext/date/lib/timezonemap.h
@@ -472,8 +472,8 @@
 	{ "chst",  0,  36000, "Pacific/Guam"                  },
 	{ "chst",  0,  36000, "Pacific/Saipan"                },
 	{ "dmt",   0,  -1521, "Europe/Dublin"                 },
-	{ "eat",   0,  10800, "Africa/Khartoum"               },
 	{ "eat",   0,  10800, "Africa/Addis_Ababa"            },
+	{ "eat",   0,  10800, "Africa/Khartoum"               },
 	{ "eat",   0,  10800, "Africa/Asmara"                 },
 	{ "eat",   0,  10800, "Africa/Asmera"                 },
 	{ "eat",   0,  10800, "Africa/Dar_es_Salaam"          },
diff --git a/ext/date/tests/DateTimeZone_getLocation.phpt b/ext/date/tests/DateTimeZone_getLocation.phpt
index 0d9a43f5e7..4d89ef6183 100644
--- a/ext/date/tests/DateTimeZone_getLocation.phpt
+++ b/ext/date/tests/DateTimeZone_getLocation.phpt
@@ -47,3 +47,10 @@ Array
     [longitude] => %f
     [comments] => %s
 )
+Array
+(
+    [country_code] => %s
+    [latitude] => %f
+    [longitude] => %f
+    [comments] => %s
+)
diff --git a/ext/date/tests/big_year.phpt b/ext/date/tests/big_year.phpt
index d1e70b6b0a..799361729d 100644
--- a/ext/date/tests/big_year.phpt
+++ b/ext/date/tests/big_year.phpt
@@ -6,12 +6,12 @@ Handling of large year values
 <?php
 date_default_timezone_set("America/Toronto");
 
-$t = mktime(0,0,0,1,1,292277026596);
+$t = mktime(0,0,0,1,1,2922770265);
 
 var_dump(date("r", $t));
 
 echo "OK\n";
 ?>
 --EXPECT--
-string(39) "Fri, 01 Jan 292277026596 00:00:00 -0500"
+string(%d) "%s, 01 Jan 2922770265 00:00:00 -0500"
 OK