Improve support for microseconds with Date/Timemicroseconds

It fixes several bugs:

- Fixed bug #45554 (Inconsistent behavior of the u format char).
- Fixed bug #48225 (DateTime parser doesn't set microseconds for "now").
- Fixed bug #52514 (microseconds are missing in DateTime class).
- Fixed bug #52519 (microseconds in DateInterval are missing).
- Fixed bug #68506 (General DateTime improvments needed for microseconds to become useful).
- Fixed bug #73109 (timelib_meridian doesn't parse dots correctly).
- Fixed bug #73247 (DateTime constructor does not initialise microseconds property).

It also updates timelib to 2016.04, and updates a data mapping file, which
causes changes to the volatile abbreviations tests.

1 files changed, 632 insertions, 572 deletions

diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index a23dc81db2..c1547a0f32 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.15.3 on Fri Sep 30 20:30:54 2016 */
+/* Generated by re2c 0.15.3 on Wed Oct  5 11:54:35 2016 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
  * The MIT License (MIT)
@@ -824,7 +824,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 std:
 	s->tok = cursor;
 	s->len = 0;
-#line 950 "ext/date/lib/parse_date.re"
+#line 951 "ext/date/lib/parse_date.re"
 
 
 
@@ -951,19 +951,19 @@ yy2:
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'D') goto yy140;
-			goto yy1523;
+			goto yy1531;
 		}
 	} else {
 		if (yych <= 'd') {
 			if (yych <= 'Z') goto yy140;
 			if (yych >= 'a') goto yy145;
 		} else {
-			if (yych <= 'e') goto yy1532;
+			if (yych <= 'e') goto yy1540;
 			if (yych <= 'z') goto yy145;
 		}
 	}
 yy3:
-#line 1630 "ext/date/lib/parse_date.re"
+#line 1659 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("tzcorrection | tz");
@@ -986,7 +986,7 @@ yy4:
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'D') goto yy140;
-			goto yy1523;
+			goto yy1531;
 		}
 	} else {
 		if (yych <= 'd') {
@@ -994,7 +994,7 @@ yy4:
 			if (yych <= '`') goto yy3;
 			goto yy140;
 		} else {
-			if (yych <= 'e') goto yy1523;
+			if (yych <= 'e') goto yy1531;
 			if (yych <= 'z') goto yy140;
 			goto yy3;
 		}
@@ -1008,12 +1008,12 @@ yy5:
 			goto yy140;
 		} else {
 			if (yych <= 'H') {
-				if (yych <= 'E') goto yy1494;
+				if (yych <= 'E') goto yy1502;
 				goto yy140;
 			} else {
-				if (yych <= 'I') goto yy1495;
+				if (yych <= 'I') goto yy1503;
 				if (yych <= 'N') goto yy140;
-				goto yy1493;
+				goto yy1501;
 			}
 		}
 	} else {
@@ -1022,15 +1022,15 @@ yy5:
 				if (yych <= 'Z') goto yy140;
 				goto yy3;
 			} else {
-				if (yych == 'e') goto yy1510;
+				if (yych == 'e') goto yy1518;
 				goto yy145;
 			}
 		} else {
 			if (yych <= 'n') {
-				if (yych <= 'i') goto yy1511;
+				if (yych <= 'i') goto yy1519;
 				goto yy145;
 			} else {
-				if (yych <= 'o') goto yy1509;
+				if (yych <= 'o') goto yy1517;
 				if (yych <= 'z') goto yy145;
 				goto yy3;
 			}
@@ -1045,12 +1045,12 @@ yy6:
 			goto yy140;
 		} else {
 			if (yych <= 'H') {
-				if (yych <= 'E') goto yy1494;
+				if (yych <= 'E') goto yy1502;
 				goto yy140;
 			} else {
-				if (yych <= 'I') goto yy1495;
+				if (yych <= 'I') goto yy1503;
 				if (yych <= 'N') goto yy140;
-				goto yy1493;
+				goto yy1501;
 			}
 		}
 	} else {
@@ -1059,15 +1059,15 @@ yy6:
 				if (yych <= 'Z') goto yy140;
 				goto yy3;
 			} else {
-				if (yych == 'e') goto yy1494;
+				if (yych == 'e') goto yy1502;
 				goto yy140;
 			}
 		} else {
 			if (yych <= 'n') {
-				if (yych <= 'i') goto yy1495;
+				if (yych <= 'i') goto yy1503;
 				goto yy140;
 			} else {
-				if (yych <= 'o') goto yy1493;
+				if (yych <= 'o') goto yy1501;
 				if (yych <= 'z') goto yy140;
 				goto yy3;
 			}
@@ -1079,24 +1079,24 @@ yy7:
 		if (yych <= 'A') {
 			if (yych == ')') goto yy139;
 			if (yych <= '@') goto yy3;
-			goto yy1463;
+			goto yy1471;
 		} else {
-			if (yych == 'I') goto yy1464;
+			if (yych == 'I') goto yy1472;
 			if (yych <= 'N') goto yy140;
-			goto yy1465;
+			goto yy1473;
 		}
 	} else {
 		if (yych <= 'h') {
 			if (yych <= 'Z') goto yy140;
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1478;
+			if (yych <= 'a') goto yy1486;
 			goto yy145;
 		} else {
 			if (yych <= 'n') {
-				if (yych <= 'i') goto yy1479;
+				if (yych <= 'i') goto yy1487;
 				goto yy145;
 			} else {
-				if (yych <= 'o') goto yy1480;
+				if (yych <= 'o') goto yy1488;
 				if (yych <= 'z') goto yy145;
 				goto yy3;
 			}
@@ -1108,24 +1108,24 @@ yy8:
 		if (yych <= 'A') {
 			if (yych == ')') goto yy139;
 			if (yych <= '@') goto yy3;
-			goto yy1463;
+			goto yy1471;
 		} else {
-			if (yych == 'I') goto yy1464;
+			if (yych == 'I') goto yy1472;
 			if (yych <= 'N') goto yy140;
-			goto yy1465;
+			goto yy1473;
 		}
 	} else {
 		if (yych <= 'h') {
 			if (yych <= 'Z') goto yy140;
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1463;
+			if (yych <= 'a') goto yy1471;
 			goto yy140;
 		} else {
 			if (yych <= 'n') {
-				if (yych <= 'i') goto yy1464;
+				if (yych <= 'i') goto yy1472;
 				goto yy140;
 			} else {
-				if (yych <= 'o') goto yy1465;
+				if (yych <= 'o') goto yy1473;
 				if (yych <= 'z') goto yy140;
 				goto yy3;
 			}
@@ -1137,15 +1137,15 @@ yy9:
 	switch (yych) {
 	case ')':	goto yy139;
 	case '0':
-	case '1':	goto yy1393;
-	case '2':	goto yy1394;
+	case '1':	goto yy1401;
+	case '2':	goto yy1402;
 	case '3':
 	case '4':
 	case '5':
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy1395;
+	case '9':	goto yy1403;
 	case 'A':
 	case 'B':
 	case 'C':
@@ -1167,11 +1167,11 @@ yy9:
 	case 'X':
 	case 'Y':
 	case 'Z':	goto yy140;
-	case 'E':	goto yy1388;
-	case 'H':	goto yy1389;
-	case 'O':	goto yy1390;
-	case 'U':	goto yy1391;
-	case 'W':	goto yy1392;
+	case 'E':	goto yy1396;
+	case 'H':	goto yy1397;
+	case 'O':	goto yy1398;
+	case 'U':	goto yy1399;
+	case 'W':	goto yy1400;
 	case 'a':
 	case 'b':
 	case 'c':
@@ -1193,11 +1193,11 @@ yy9:
 	case 'x':
 	case 'y':
 	case 'z':	goto yy145;
-	case 'e':	goto yy1431;
-	case 'h':	goto yy1432;
-	case 'o':	goto yy1433;
-	case 'u':	goto yy1434;
-	case 'w':	goto yy1435;
+	case 'e':	goto yy1439;
+	case 'h':	goto yy1440;
+	case 'o':	goto yy1441;
+	case 'u':	goto yy1442;
+	case 'w':	goto yy1443;
 	default:	goto yy3;
 	}
 yy10:
@@ -1206,15 +1206,15 @@ yy10:
 	switch (yych) {
 	case ')':	goto yy139;
 	case '0':
-	case '1':	goto yy1393;
-	case '2':	goto yy1394;
+	case '1':	goto yy1401;
+	case '2':	goto yy1402;
 	case '3':
 	case '4':
 	case '5':
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy1395;
+	case '9':	goto yy1403;
 	case 'A':
 	case 'B':
 	case 'C':
@@ -1258,15 +1258,15 @@ yy10:
 	case 'y':
 	case 'z':	goto yy140;
 	case 'E':
-	case 'e':	goto yy1388;
+	case 'e':	goto yy1396;
 	case 'H':
-	case 'h':	goto yy1389;
+	case 'h':	goto yy1397;
 	case 'O':
-	case 'o':	goto yy1390;
+	case 'o':	goto yy1398;
 	case 'U':
-	case 'u':	goto yy1391;
+	case 'u':	goto yy1399;
 	case 'W':
-	case 'w':	goto yy1392;
+	case 'w':	goto yy1400;
 	default:	goto yy3;
 	}
 yy11:
@@ -1276,7 +1276,7 @@ yy11:
 	if (yych <= '/') goto yy12;
 	if (yych <= '9') goto yy1385;
 yy12:
-#line 1725 "ext/date/lib/parse_date.re"
+#line 1754 "ext/date/lib/parse_date.re"
 	{
 		add_error(s, "Unexpected character");
 		goto std;
@@ -2295,7 +2295,7 @@ yy48:
 	if (yych <= '/') goto yy49;
 	if (yych <= '9') goto yy54;
 yy49:
-#line 1714 "ext/date/lib/parse_date.re"
+#line 1743 "ext/date/lib/parse_date.re"
 	{
 		goto std;
 	}
@@ -2305,7 +2305,7 @@ yy50:
 	goto yy49;
 yy51:
 	++YYCURSOR;
-#line 1719 "ext/date/lib/parse_date.re"
+#line 1748 "ext/date/lib/parse_date.re"
 	{
 		s->pos = cursor; s->line++;
 		goto std;
@@ -2372,7 +2372,7 @@ yy54:
 	}
 yy56:
 	YYCURSOR = YYMARKER;
-	if (yyaccept <= 16) {
+	if (yyaccept <= 17) {
 		if (yyaccept <= 8) {
 			if (yyaccept <= 4) {
 				if (yyaccept <= 2) {
@@ -2408,98 +2408,102 @@ yy56:
 				}
 			}
 		} else {
-			if (yyaccept <= 12) {
-				if (yyaccept <= 10) {
-					if (yyaccept == 9) {
-						goto yy392;
+			if (yyaccept <= 13) {
+				if (yyaccept <= 11) {
+					if (yyaccept <= 10) {
+						if (yyaccept == 9) {
+							goto yy392;
+						} else {
+							goto yy475;
+						}
 					} else {
-						goto yy475;
+						goto yy490;
 					}
 				} else {
-					if (yyaccept == 11) {
-						goto yy490;
-					} else {
+					if (yyaccept == 12) {
 						goto yy611;
+					} else {
+						goto yy656;
 					}
 				}
 			} else {
-				if (yyaccept <= 14) {
-					if (yyaccept == 13) {
-						goto yy656;
-					} else {
+				if (yyaccept <= 15) {
+					if (yyaccept == 14) {
 						goto yy666;
+					} else {
+						goto yy763;
 					}
 				} else {
-					if (yyaccept == 15) {
-						goto yy763;
-					} else {
+					if (yyaccept == 16) {
 						goto yy783;
+					} else {
+						goto yy814;
 					}
 				}
 			}
 		}
 	} else {
-		if (yyaccept <= 25) {
-			if (yyaccept <= 21) {
-				if (yyaccept <= 19) {
-					if (yyaccept <= 18) {
-						if (yyaccept == 17) {
-							goto yy814;
-						} else {
+		if (yyaccept <= 26) {
+			if (yyaccept <= 22) {
+				if (yyaccept <= 20) {
+					if (yyaccept <= 19) {
+						if (yyaccept == 18) {
 							goto yy821;
+						} else {
+							goto yy848;
 						}
 					} else {
-						goto yy848;
+						goto yy793;
 					}
 				} else {
-					if (yyaccept == 20) {
-						goto yy793;
-					} else {
+					if (yyaccept == 21) {
 						goto yy454;
+					} else {
+						goto yy973;
 					}
 				}
 			} else {
-				if (yyaccept <= 23) {
-					if (yyaccept == 22) {
-						goto yy973;
-					} else {
+				if (yyaccept <= 24) {
+					if (yyaccept == 23) {
 						goto yy842;
+					} else {
+						goto yy1067;
 					}
 				} else {
-					if (yyaccept == 24) {
-						goto yy1067;
-					} else {
+					if (yyaccept == 25) {
 						goto yy1075;
+					} else {
+						goto yy1117;
 					}
 				}
 			}
 		} else {
-			if (yyaccept <= 29) {
-				if (yyaccept <= 27) {
-					if (yyaccept == 26) {
-						goto yy1117;
-					} else {
+			if (yyaccept <= 30) {
+				if (yyaccept <= 28) {
+					if (yyaccept == 27) {
 						goto yy1141;
+					} else {
+						goto yy1294;
 					}
 				} else {
-					if (yyaccept == 28) {
-						goto yy1294;
+					if (yyaccept == 29) {
+						goto yy1387;
 					} else {
-						goto yy1417;
+						goto yy1425;
 					}
 				}
 			} else {
-				if (yyaccept <= 31) {
-					if (yyaccept == 30) {
-						goto yy1420;
+				if (yyaccept <= 32) {
+					if (yyaccept == 31) {
+						goto yy1428;
 					} else {
-						goto yy1500;
+						goto yy1508;
 					}
 				} else {
-					if (yyaccept == 32) {
-						goto yy1508;
+					if (yyaccept == 33) {
+						goto yy1516;
 					} else {
-						goto yy1531;
+						goto yy1539;
 					}
 				}
 			}
@@ -2677,7 +2681,7 @@ yy71:
 	if (yych == 'S') goto yy73;
 	if (yych == 's') goto yy73;
 yy72:
-#line 1698 "ext/date/lib/parse_date.re"
+#line 1727 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
 		DEBUG_OUTPUT("relative");
@@ -2692,7 +2696,7 @@ yy72:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 2696 "<stdout>"
+#line 2700 "<stdout>"
 yy73:
 	yych = *++YYCURSOR;
 	if (yych == 'D') goto yy74;
@@ -3360,7 +3364,7 @@ yy165:
 		}
 	}
 yy166:
-#line 1561 "ext/date/lib/parse_date.re"
+#line 1590 "ext/date/lib/parse_date.re"
 	{
 		const timelib_relunit* relunit;
 		DEBUG_OUTPUT("daytext");
@@ -3377,7 +3381,7 @@ yy166:
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEKDAY;
 	}
-#line 3381 "<stdout>"
+#line 3385 "<stdout>"
 yy167:
 	yych = *++YYCURSOR;
 	if (yych <= 'K') {
@@ -3870,7 +3874,7 @@ yy192:
 		}
 	}
 yy193:
-#line 1620 "ext/date/lib/parse_date.re"
+#line 1649 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("monthtext");
 		TIMELIB_INIT;
@@ -3879,7 +3883,7 @@ yy193:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 3883 "<stdout>"
+#line 3887 "<stdout>"
 yy194:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 21) YYFILL(21);
@@ -3925,7 +3929,7 @@ yy197:
 		}
 	}
 yy198:
-#line 1366 "ext/date/lib/parse_date.re"
+#line 1395 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datetextual | datenoyear");
@@ -3938,7 +3942,7 @@ yy198:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 3942 "<stdout>"
+#line 3946 "<stdout>"
 yy199:
 	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -4183,7 +4187,7 @@ yy221:
 		if (yych <= ':') goto yy224;
 	}
 yy222:
-#line 1668 "ext/date/lib/parse_date.re"
+#line 1697 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz");
@@ -4212,7 +4216,7 @@ yy222:
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 4216 "<stdout>"
+#line 4220 "<stdout>"
 yy223:
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -4854,7 +4858,7 @@ yy276:
 	}
 yy277:
 	++YYCURSOR;
-#line 1644 "ext/date/lib/parse_date.re"
+#line 1673 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12");
 		TIMELIB_INIT;
@@ -4877,7 +4881,7 @@ yy277:
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 4881 "<stdout>"
+#line 4885 "<stdout>"
 yy279:
 	yych = *++YYCURSOR;
 	if (yych <= 0x1F) {
@@ -5039,7 +5043,7 @@ yy292:
 yy293:
 	++YYCURSOR;
 yy294:
-#line 1338 "ext/date/lib/parse_date.re"
+#line 1367 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenoday");
@@ -5052,7 +5056,7 @@ yy294:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 5056 "<stdout>"
+#line 5060 "<stdout>"
 yy295:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
@@ -6203,7 +6207,7 @@ yy361:
 	if ((yych = *YYCURSOR) <= '/') goto yy363;
 	if (yych <= '9') goto yy364;
 yy363:
-#line 1482 "ext/date/lib/parse_date.re"
+#line 1511 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextshort");
@@ -6216,7 +6220,7 @@ yy363:
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 6220 "<stdout>"
+#line 6224 "<stdout>"
 yy364:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy363;
@@ -6825,7 +6829,7 @@ yy391:
 		if (yych <= 'z') goto yy142;
 	}
 yy392:
-#line 1540 "ext/date/lib/parse_date.re"
+#line 1569 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("ago");
 		TIMELIB_INIT;
@@ -6845,7 +6849,7 @@ yy392:
 		TIMELIB_DEINIT;
 		return TIMELIB_AGO;
 	}
-#line 6849 "<stdout>"
+#line 6853 "<stdout>"
 yy393:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -8533,7 +8537,7 @@ yy452:
 yy453:
 	++YYCURSOR;
 yy454:
-#line 1243 "ext/date/lib/parse_date.re"
+#line 1272 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash");
 		TIMELIB_INIT;
@@ -8544,7 +8548,7 @@ yy454:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 8548 "<stdout>"
+#line 8552 "<stdout>"
 yy455:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -9080,7 +9084,7 @@ yy474:
 		}
 	}
 yy475:
-#line 1380 "ext/date/lib/parse_date.re"
+#line 1409 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenoyearrev");
 		TIMELIB_INIT;
@@ -9091,7 +9095,7 @@ yy475:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 9095 "<stdout>"
+#line 9099 "<stdout>"
 yy476:
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -9219,7 +9223,7 @@ yy485:
 	}
 yy487:
 	++YYCURSOR;
-#line 1098 "ext/date/lib/parse_date.re"
+#line 1127 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12");
 		TIMELIB_INIT;
@@ -9235,7 +9239,7 @@ yy487:
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME12;
 	}
-#line 9239 "<stdout>"
+#line 9243 "<stdout>"
 yy489:
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -9246,7 +9250,7 @@ yy489:
 		if (yych <= ':') goto yy492;
 	}
 yy490:
-#line 1135 "ext/date/lib/parse_date.re"
+#line 1164 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long");
@@ -9271,7 +9275,7 @@ yy490:
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 9275 "<stdout>"
+#line 9279 "<stdout>"
 yy491:
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -9548,7 +9552,7 @@ yy520:
 	}
 yy522:
 	++YYCURSOR;
-#line 1115 "ext/date/lib/parse_date.re"
+#line 1144 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("mssqltime");
 		TIMELIB_INIT;
@@ -9567,7 +9571,7 @@ yy522:
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 9571 "<stdout>"
+#line 9575 "<stdout>"
 yy524:
 	yyaccept = 11;
 	YYMARKER = ++YYCURSOR;
@@ -9662,7 +9666,7 @@ yy533:
 	if ((yych = *YYCURSOR) <= '/') goto yy534;
 	if (yych <= '9') goto yy540;
 yy534:
-#line 1297 "ext/date/lib/parse_date.re"
+#line 1326 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datefull");
@@ -9676,7 +9680,7 @@ yy534:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL;
 	}
-#line 9680 "<stdout>"
+#line 9684 "<stdout>"
 yy535:
 	yych = *++YYCURSOR;
 	if (yych == 'M') goto yy536;
@@ -10340,7 +10344,7 @@ yy604:
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
 	++YYCURSOR;
-#line 1312 "ext/date/lib/parse_date.re"
+#line 1341 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("pointed date YYYY");
 		TIMELIB_INIT;
@@ -10351,7 +10355,7 @@ yy604:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 10355 "<stdout>"
+#line 10359 "<stdout>"
 yy607:
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -10382,7 +10386,7 @@ yy610:
 	if (yych <= '/') goto yy611;
 	if (yych <= '9') goto yy604;
 yy611:
-#line 1324 "ext/date/lib/parse_date.re"
+#line 1353 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pointed date YY");
@@ -10395,7 +10399,7 @@ yy611:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 10399 "<stdout>"
+#line 10403 "<stdout>"
 yy612:
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -10991,7 +10995,7 @@ yy655:
 		}
 	}
 yy656:
-#line 1283 "ext/date/lib/parse_date.re"
+#line 1312 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshort");
@@ -11004,7 +11008,7 @@ yy656:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 11008 "<stdout>"
+#line 11012 "<stdout>"
 yy657:
 	yyaccept = 13;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -11100,7 +11104,7 @@ yy665:
 		}
 	}
 yy666:
-#line 1227 "ext/date/lib/parse_date.re"
+#line 1256 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("americanshort | american");
@@ -11115,7 +11119,7 @@ yy666:
 		TIMELIB_DEINIT;
 		return TIMELIB_AMERICAN;
 	}
-#line 11119 "<stdout>"
+#line 11123 "<stdout>"
 yy667:
 	yyaccept = 14;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -11314,7 +11318,7 @@ yy699:
 	if (yych <= '9') goto yy702;
 	if (yych <= ':') goto yy703;
 yy700:
-#line 1510 "ext/date/lib/parse_date.re"
+#line 1539 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("clf");
@@ -11334,7 +11338,7 @@ yy700:
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 11338 "<stdout>"
+#line 11342 "<stdout>"
 yy701:
 	yych = *++YYCURSOR;
 	if (yych <= '5') {
@@ -11821,7 +11825,7 @@ yy762:
 		if (yych <= 't') goto yy662;
 	}
 yy763:
-#line 1255 "ext/date/lib/parse_date.re"
+#line 1284 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("iso8601date2");
@@ -11834,7 +11838,7 @@ yy763:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 11838 "<stdout>"
+#line 11842 "<stdout>"
 yy764:
 	yych = *++YYCURSOR;
 	if (yych == 'C') goto yy765;
@@ -11865,7 +11869,7 @@ yy769:
 	if (yych >= '2') goto yy56;
 yy770:
 	++YYCURSOR;
-#line 1496 "ext/date/lib/parse_date.re"
+#line 1525 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextreverse");
@@ -11878,7 +11882,7 @@ yy770:
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 11882 "<stdout>"
+#line 11886 "<stdout>"
 yy772:
 	yych = *++YYCURSOR;
 	if (yych == 'V') goto yy765;
@@ -12003,7 +12007,7 @@ yy782:
 	default:	goto yy783;
 	}
 yy783:
-#line 1531 "ext/date/lib/parse_date.re"
+#line 1560 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("year4");
 		TIMELIB_INIT;
@@ -12011,7 +12015,7 @@ yy783:
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 12015 "<stdout>"
+#line 12019 "<stdout>"
 yy784:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -12149,7 +12153,7 @@ yy792:
 		if (yych <= 'X') goto yy883;
 	}
 yy793:
-#line 1352 "ext/date/lib/parse_date.re"
+#line 1381 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenodayrev");
@@ -12162,7 +12166,7 @@ yy793:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 12166 "<stdout>"
+#line 12170 "<stdout>"
 yy794:
 	yych = *++YYCURSOR;
 	if (yych == 'I') goto yy927;
@@ -12356,7 +12360,7 @@ yy813:
 	if (yych <= '/') goto yy814;
 	if (yych <= '7') goto yy816;
 yy814:
-#line 1463 "ext/date/lib/parse_date.re"
+#line 1492 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweek");
@@ -12374,14 +12378,14 @@ yy814:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 12378 "<stdout>"
+#line 12382 "<stdout>"
 yy815:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= '8') goto yy56;
 yy816:
 	++YYCURSOR;
-#line 1444 "ext/date/lib/parse_date.re"
+#line 1473 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweekday");
@@ -12399,7 +12403,7 @@ yy816:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 12403 "<stdout>"
+#line 12407 "<stdout>"
 yy818:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
@@ -12459,7 +12463,7 @@ yy820:
 		}
 	}
 yy821:
-#line 1430 "ext/date/lib/parse_date.re"
+#line 1459 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgydotd");
@@ -12472,7 +12476,7 @@ yy821:
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_YEARDAY;
 	}
-#line 12476 "<stdout>"
+#line 12480 "<stdout>"
 yy822:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
@@ -12554,7 +12558,7 @@ yy840:
 yy841:
 	++YYCURSOR;
 yy842:
-#line 1404 "ext/date/lib/parse_date.re"
+#line 1433 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif");
@@ -12579,7 +12583,7 @@ yy842:
 		TIMELIB_DEINIT;
 		return TIMELIB_XMLRPC_SOAP;
 	}
-#line 12583 "<stdout>"
+#line 12587 "<stdout>"
 yy843:
 	yych = *++YYCURSOR;
 	if (yych <= '2') {
@@ -12835,7 +12839,7 @@ yy847:
 		}
 	}
 yy848:
-#line 1392 "ext/date/lib/parse_date.re"
+#line 1421 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenocolon");
 		TIMELIB_INIT;
@@ -12846,7 +12850,7 @@ yy848:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NOCOLON;
 	}
-#line 12850 "<stdout>"
+#line 12854 "<stdout>"
 yy849:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
@@ -13640,7 +13644,7 @@ yy972:
 	if (yych <= '/') goto yy973;
 	if (yych <= '9') goto yy995;
 yy973:
-#line 1269 "ext/date/lib/parse_date.re"
+#line 1298 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshorter");
@@ -13653,7 +13657,7 @@ yy973:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 13657 "<stdout>"
+#line 13661 "<stdout>"
 yy974:
 	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -14565,7 +14569,7 @@ yy1065:
 	default:	goto yy1067;
 	}
 yy1067:
-#line 1161 "ext/date/lib/parse_date.re"
+#line 1190 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("gnunocolon");
 		TIMELIB_INIT;
@@ -14587,7 +14591,7 @@ yy1067:
 		TIMELIB_DEINIT;
 		return TIMELIB_GNU_NOCOLON;
 	}
-#line 14591 "<stdout>"
+#line 14595 "<stdout>"
 yy1068:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy60;
@@ -14671,7 +14675,7 @@ yy1074:
 		}
 	}
 yy1075:
-#line 1207 "ext/date/lib/parse_date.re"
+#line 1236 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("iso8601nocolon");
@@ -14690,7 +14694,7 @@ yy1075:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_NOCOLON;
 	}
-#line 14694 "<stdout>"
+#line 14698 "<stdout>"
 yy1076:
 	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -15546,7 +15550,7 @@ yy1116:
 		}
 	}
 yy1117:
-#line 1603 "ext/date/lib/parse_date.re"
+#line 1632 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -15562,7 +15566,7 @@ yy1117:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 15566 "<stdout>"
+#line 15570 "<stdout>"
 yy1118:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -15604,7 +15608,7 @@ yy1124:
 	if (yych != 'f') goto yy56;
 yy1125:
 	++YYCURSOR;
-#line 1076 "ext/date/lib/parse_date.re"
+#line 1105 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -15625,7 +15629,7 @@ yy1125:
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEK_DAY_OF_MONTH;
 	}
-#line 15629 "<stdout>"
+#line 15633 "<stdout>"
 yy1127:
 	yyaccept = 26;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -15718,7 +15722,7 @@ yy1140:
 		}
 	}
 yy1141:
-#line 1579 "ext/date/lib/parse_date.re"
+#line 1608 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -15741,7 +15745,7 @@ yy1141:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 15745 "<stdout>"
+#line 15749 "<stdout>"
 yy1142:
 	yych = *++YYCURSOR;
 	goto yy1117;
@@ -18265,7 +18269,7 @@ yy1293:
 	if (yych <= '9') goto yy1296;
 	goto yy1297;
 yy1294:
-#line 1053 "ext/date/lib/parse_date.re"
+#line 1082 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("backof | frontof");
 		TIMELIB_INIT;
@@ -18287,7 +18291,7 @@ yy1294:
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 18291 "<stdout>"
+#line 18295 "<stdout>"
 yy1295:
 	yyaccept = 28;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -18526,7 +18530,7 @@ yy1314:
 	if (yych != 'f') goto yy56;
 yy1315:
 	++YYCURSOR;
-#line 1036 "ext/date/lib/parse_date.re"
+#line 1065 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("firstdayof | lastdayof");
 		TIMELIB_INIT;
@@ -18542,7 +18546,7 @@ yy1315:
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 18546 "<stdout>"
+#line 18550 "<stdout>"
 yy1317:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -19896,13 +19900,15 @@ yy1384:
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
 yy1385:
-	++YYCURSOR;
-	if (YYLIMIT <= YYCURSOR) YYFILL(1);
+	yyaccept = 29;
+	YYMARKER = ++YYCURSOR;
+	if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
+	if (yych == '.') goto yy1388;
 	if (yych <= '/') goto yy1387;
 	if (yych <= '9') goto yy1385;
 yy1387:
-#line 1010 "ext/date/lib/parse_date.re"
+#line 1011 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
 
@@ -19927,9 +19933,57 @@ yy1387:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 19931 "<stdout>"
+#line 19937 "<stdout>"
 yy1388:
 	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych >= ':') goto yy56;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych >= ':') goto yy56;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych >= ':') goto yy56;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych >= ':') goto yy56;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych >= ':') goto yy56;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy56;
+	if (yych >= ':') goto yy56;
+	++YYCURSOR;
+#line 1037 "ext/date/lib/parse_date.re"
+	{
+		timelib_ull i, ms;
+
+		TIMELIB_INIT;
+		TIMELIB_HAVE_RELATIVE();
+		TIMELIB_UNHAVE_DATE();
+		TIMELIB_UNHAVE_TIME();
+		TIMELIB_HAVE_TZ();
+
+		i = timelib_get_unsigned_nr((char **) &ptr, 24);
+		ms = 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->f = 0.0;
+		s->time->relative.s += i;
+		s->time->relative.f = ((double) ms) / 1000000.0;
+		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 19985 "<stdout>"
+yy1396:
+	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
 			if (yych <= '(') goto yy3;
@@ -19937,7 +19991,7 @@ yy1388:
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'M') goto yy141;
-			goto yy1429;
+			goto yy1437;
 		}
 	} else {
 		if (yych <= 'm') {
@@ -19945,58 +19999,58 @@ yy1388:
 			if (yych <= '`') goto yy3;
 			goto yy141;
 		} else {
-			if (yych <= 'n') goto yy1429;
+			if (yych <= 'n') goto yy1437;
 			if (yych <= 'z') goto yy141;
 			goto yy3;
 		}
 	}
-yy1389:
+yy1397:
 	yych = *++YYCURSOR;
 	if (yych <= 'U') {
 		if (yych <= '@') {
 			if (yych == ')') goto yy139;
 			goto yy3;
 		} else {
-			if (yych == 'I') goto yy1421;
+			if (yych == 'I') goto yy1429;
 			if (yych <= 'T') goto yy141;
-			goto yy1422;
+			goto yy1430;
 		}
 	} else {
 		if (yych <= 'i') {
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'h') goto yy141;
-			goto yy1421;
+			goto yy1429;
 		} else {
-			if (yych == 'u') goto yy1422;
+			if (yych == 'u') goto yy1430;
 			if (yych <= 'z') goto yy141;
 			goto yy3;
 		}
 	}
-yy1390:
+yy1398:
 	yych = *++YYCURSOR;
 	if (yych <= 'M') {
 		if (yych <= '@') {
 			if (yych == ')') goto yy139;
 			goto yy3;
 		} else {
-			if (yych == 'D') goto yy1410;
+			if (yych == 'D') goto yy1418;
 			if (yych <= 'L') goto yy141;
-			goto yy1411;
+			goto yy1419;
 		}
 	} else {
 		if (yych <= 'd') {
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'c') goto yy141;
-			goto yy1410;
+			goto yy1418;
 		} else {
-			if (yych == 'm') goto yy1411;
+			if (yych == 'm') goto yy1419;
 			if (yych <= 'z') goto yy141;
 			goto yy3;
 		}
 	}
-yy1391:
+yy1399:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -20005,7 +20059,7 @@ yy1391:
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'D') goto yy141;
-			goto yy1406;
+			goto yy1414;
 		}
 	} else {
 		if (yych <= 'd') {
@@ -20013,12 +20067,12 @@ yy1391:
 			if (yych <= '`') goto yy3;
 			goto yy141;
 		} else {
-			if (yych <= 'e') goto yy1406;
+			if (yych <= 'e') goto yy1414;
 			if (yych <= 'z') goto yy141;
 			goto yy3;
 		}
 	}
-yy1392:
+yy1400:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -20027,7 +20081,7 @@ yy1392:
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'D') goto yy141;
-			goto yy1402;
+			goto yy1410;
 		}
 	} else {
 		if (yych <= 'd') {
@@ -20035,68 +20089,68 @@ yy1392:
 			if (yych <= '`') goto yy3;
 			goto yy141;
 		} else {
-			if (yych <= 'e') goto yy1402;
+			if (yych <= 'e') goto yy1410;
 			if (yych <= 'z') goto yy141;
 			goto yy3;
 		}
 	}
-yy1393:
+yy1401:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
 		if (yych == '.') goto yy1064;
 		goto yy56;
 	} else {
-		if (yych <= '9') goto yy1396;
+		if (yych <= '9') goto yy1404;
 		if (yych <= ':') goto yy1064;
 		goto yy56;
 	}
-yy1394:
+yy1402:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
 		if (yych == '.') goto yy1064;
 		goto yy56;
 	} else {
-		if (yych <= '4') goto yy1396;
+		if (yych <= '4') goto yy1404;
 		if (yych == ':') goto yy1064;
 		goto yy56;
 	}
-yy1395:
+yy1403:
 	yych = *++YYCURSOR;
 	if (yych == '.') goto yy1064;
 	if (yych == ':') goto yy1064;
 	goto yy56;
-yy1396:
+yy1404:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
 		if (yych == '.') goto yy1064;
 		goto yy56;
 	} else {
-		if (yych <= '5') goto yy1397;
+		if (yych <= '5') goto yy1405;
 		if (yych == ':') goto yy1064;
 		goto yy56;
 	}
-yy1397:
+yy1405:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
 	if (yych >= ':') goto yy56;
 	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') goto yy1067;
-	if (yych <= '5') goto yy1399;
-	if (yych <= '6') goto yy1400;
+	if (yych <= '5') goto yy1407;
+	if (yych <= '6') goto yy1408;
 	goto yy1067;
-yy1399:
+yy1407:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy56;
-	if (yych <= '9') goto yy1401;
+	if (yych <= '9') goto yy1409;
 	goto yy56;
-yy1400:
+yy1408:
 	yych = *++YYCURSOR;
 	if (yych != '0') goto yy56;
-yy1401:
+yy1409:
 	yych = *++YYCURSOR;
 	goto yy1075;
-yy1402:
+yy1410:
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych <= ')') {
@@ -20112,12 +20166,12 @@ yy1402:
 			if (yych <= '`') goto yy3;
 			goto yy142;
 		} else {
-			if (yych <= 'l') goto yy1403;
+			if (yych <= 'l') goto yy1411;
 			if (yych <= 'z') goto yy142;
 			goto yy3;
 		}
 	}
-yy1403:
+yy1411:
 	yych = *++YYCURSOR;
 	if (yych <= 'F') {
 		if (yych <= ')') {
@@ -20133,12 +20187,12 @@ yy1403:
 			if (yych <= '`') goto yy3;
 			goto yy143;
 		} else {
-			if (yych <= 'f') goto yy1404;
+			if (yych <= 'f') goto yy1412;
 			if (yych <= 'z') goto yy143;
 			goto yy3;
 		}
 	}
-yy1404:
+yy1412:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -20154,12 +20208,12 @@ yy1404:
 			if (yych <= '`') goto yy3;
 			goto yy144;
 		} else {
-			if (yych <= 't') goto yy1405;
+			if (yych <= 't') goto yy1413;
 			if (yych <= 'z') goto yy144;
 			goto yy3;
 		}
 	}
-yy1405:
+yy1413:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -20170,7 +20224,7 @@ yy1405:
 		if (yych == 'h') goto yy1205;
 		goto yy3;
 	}
-yy1406:
+yy1414:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -20186,12 +20240,12 @@ yy1406:
 			if (yych <= '`') goto yy166;
 			goto yy142;
 		} else {
-			if (yych <= 's') goto yy1407;
+			if (yych <= 's') goto yy1415;
 			if (yych <= 'z') goto yy142;
 			goto yy166;
 		}
 	}
-yy1407:
+yy1415:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -20207,12 +20261,12 @@ yy1407:
 			if (yych <= '`') goto yy3;
 			goto yy143;
 		} else {
-			if (yych <= 'd') goto yy1408;
+			if (yych <= 'd') goto yy1416;
 			if (yych <= 'z') goto yy143;
 			goto yy3;
 		}
 	}
-yy1408:
+yy1416:
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy139;
@@ -20222,12 +20276,12 @@ yy1408:
 			if (yych <= 'Z') goto yy144;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1409;
+			if (yych <= 'a') goto yy1417;
 			if (yych <= 'z') goto yy144;
 			goto yy3;
 		}
 	}
-yy1409:
+yy1417:
 	yych = *++YYCURSOR;
 	if (yych <= 'X') {
 		if (yych == ')') goto yy139;
@@ -20237,23 +20291,23 @@ yy1409:
 		if (yych == 'y') goto yy172;
 		goto yy3;
 	}
-yy1410:
+yy1418:
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy139;
 		if (yych <= '@') goto yy3;
-		goto yy1418;
+		goto yy1426;
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') goto yy142;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1418;
+			if (yych <= 'a') goto yy1426;
 			if (yych <= 'z') goto yy142;
 			goto yy3;
 		}
 	}
-yy1411:
+yy1419:
 	yych = *++YYCURSOR;
 	if (yych <= 'O') {
 		if (yych <= ')') {
@@ -20269,12 +20323,12 @@ yy1411:
 			if (yych <= '`') goto yy3;
 			goto yy142;
 		} else {
-			if (yych <= 'o') goto yy1412;
+			if (yych <= 'o') goto yy1420;
 			if (yych <= 'z') goto yy142;
 			goto yy3;
 		}
 	}
-yy1412:
+yy1420:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -20290,12 +20344,12 @@ yy1412:
 			if (yych <= '`') goto yy3;
 			goto yy143;
 		} else {
-			if (yych <= 'r') goto yy1413;
+			if (yych <= 'r') goto yy1421;
 			if (yych <= 'z') goto yy143;
 			goto yy3;
 		}
 	}
-yy1413:
+yy1421:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -20311,29 +20365,29 @@ yy1413:
 			if (yych <= '`') goto yy3;
 			goto yy144;
 		} else {
-			if (yych <= 'r') goto yy1414;
+			if (yych <= 'r') goto yy1422;
 			if (yych <= 'z') goto yy144;
 			goto yy3;
 		}
 	}
-yy1414:
+yy1422:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
 		if (yych == ')') goto yy139;
 		goto yy3;
 	} else {
-		if (yych <= 'O') goto yy1415;
+		if (yych <= 'O') goto yy1423;
 		if (yych != 'o') goto yy3;
 	}
-yy1415:
+yy1423:
 	yych = *++YYCURSOR;
-	if (yych == 'W') goto yy1416;
+	if (yych == 'W') goto yy1424;
 	if (yych != 'w') goto yy56;
-yy1416:
+yy1424:
 	++YYCURSOR;
-yy1417:
-#line 998 "ext/date/lib/parse_date.re"
+yy1425:
+#line 999 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("tomorrow");
 		TIMELIB_INIT;
@@ -20344,8 +20398,8 @@ yy1417:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 20348 "<stdout>"
-yy1418:
+#line 20402 "<stdout>"
+yy1426:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
 		if (yych <= ')') {
@@ -20361,22 +20415,22 @@ yy1418:
 			if (yych <= '`') goto yy3;
 			goto yy143;
 		} else {
-			if (yych <= 'y') goto yy1419;
+			if (yych <= 'y') goto yy1427;
 			if (yych <= 'z') goto yy143;
 			goto yy3;
 		}
 	}
-yy1419:
+yy1427:
 	++YYCURSOR;
 	if ((yych = *YYCURSOR) <= '@') {
 		if (yych == ')') goto yy139;
 	} else {
 		if (yych <= 'Z') goto yy144;
-		if (yych <= '`') goto yy1420;
+		if (yych <= '`') goto yy1428;
 		if (yych <= 'z') goto yy144;
 	}
-yy1420:
-#line 988 "ext/date/lib/parse_date.re"
+yy1428:
+#line 989 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("midnight | today");
 		TIMELIB_INIT;
@@ -20385,8 +20439,8 @@ yy1420:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 20389 "<stdout>"
-yy1421:
+#line 20443 "<stdout>"
+yy1429:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= '@') {
@@ -20394,8 +20448,8 @@ yy1421:
 			goto yy3;
 		} else {
 			if (yych <= 'Q') goto yy142;
-			if (yych <= 'R') goto yy1427;
-			goto yy1428;
+			if (yych <= 'R') goto yy1435;
+			goto yy1436;
 		}
 	} else {
 		if (yych <= 'q') {
@@ -20403,13 +20457,13 @@ yy1421:
 			if (yych <= '`') goto yy3;
 			goto yy142;
 		} else {
-			if (yych <= 'r') goto yy1427;
-			if (yych <= 's') goto yy1428;
+			if (yych <= 'r') goto yy1435;
+			if (yych <= 's') goto yy1436;
 			if (yych <= 'z') goto yy142;
 			goto yy3;
 		}
 	}
-yy1422:
+yy1430:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -20425,12 +20479,12 @@ yy1422:
 			if (yych <= '`') goto yy166;
 			goto yy142;
 		} else {
-			if (yych <= 'r') goto yy1423;
+			if (yych <= 'r') goto yy1431;
 			if (yych <= 'z') goto yy142;
 			goto yy166;
 		}
 	}
-yy1423:
+yy1431:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -20446,12 +20500,12 @@ yy1423:
 			if (yych <= '`') goto yy3;
 			goto yy143;
 		} else {
-			if (yych <= 's') goto yy1424;
+			if (yych <= 's') goto yy1432;
 			if (yych <= 'z') goto yy143;
 			goto yy3;
 		}
 	}
-yy1424:
+yy1432:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -20467,27 +20521,27 @@ yy1424:
 			if (yych <= '`') goto yy3;
 			goto yy144;
 		} else {
-			if (yych <= 'd') goto yy1425;
+			if (yych <= 'd') goto yy1433;
 			if (yych <= 'z') goto yy144;
 			goto yy3;
 		}
 	}
-yy1425:
+yy1433:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
 		if (yych == ')') goto yy139;
 		goto yy3;
 	} else {
-		if (yych <= 'A') goto yy1426;
+		if (yych <= 'A') goto yy1434;
 		if (yych != 'a') goto yy3;
 	}
-yy1426:
+yy1434:
 	yych = *++YYCURSOR;
 	if (yych == 'Y') goto yy172;
 	if (yych == 'y') goto yy172;
 	goto yy56;
-yy1427:
+yy1435:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -20509,7 +20563,7 @@ yy1427:
 			goto yy3;
 		}
 	}
-yy1428:
+yy1436:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '(') {
@@ -20531,7 +20585,7 @@ yy1428:
 			goto yy3;
 		}
 	}
-yy1429:
+yy1437:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -20547,12 +20601,12 @@ yy1429:
 			if (yych <= '`') goto yy3;
 			goto yy142;
 		} else {
-			if (yych <= 't') goto yy1430;
+			if (yych <= 't') goto yy1438;
 			if (yych <= 'z') goto yy142;
 			goto yy3;
 		}
 	}
-yy1430:
+yy1438:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -20574,7 +20628,7 @@ yy1430:
 			goto yy3;
 		}
 	}
-yy1431:
+yy1439:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -20589,7 +20643,7 @@ yy1431:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1429;
+			if (yych <= 'N') goto yy1437;
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -20598,13 +20652,13 @@ yy1431:
 				if (yych <= '`') goto yy3;
 				goto yy146;
 			} else {
-				if (yych <= 'n') goto yy1461;
+				if (yych <= 'n') goto yy1469;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1432:
+yy1440:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'T') {
@@ -20621,14 +20675,14 @@ yy1432:
 				if (yych <= '/') goto yy147;
 				goto yy3;
 			} else {
-				if (yych == 'I') goto yy1421;
+				if (yych == 'I') goto yy1429;
 				goto yy141;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'U') goto yy1422;
+				if (yych <= 'U') goto yy1430;
 				goto yy141;
 			} else {
 				if (yych == '_') goto yy147;
@@ -20636,16 +20690,16 @@ yy1432:
 			}
 		} else {
 			if (yych <= 't') {
-				if (yych == 'i') goto yy1453;
+				if (yych == 'i') goto yy1461;
 				goto yy146;
 			} else {
-				if (yych <= 'u') goto yy1454;
+				if (yych <= 'u') goto yy1462;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1433:
+yy1441:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
@@ -20662,14 +20716,14 @@ yy1433:
 				if (yych <= '/') goto yy147;
 				goto yy3;
 			} else {
-				if (yych == 'D') goto yy1410;
+				if (yych == 'D') goto yy1418;
 				goto yy141;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'M') goto yy1411;
+				if (yych <= 'M') goto yy1419;
 				goto yy141;
 			} else {
 				if (yych == '_') goto yy147;
@@ -20677,16 +20731,16 @@ yy1433:
 			}
 		} else {
 			if (yych <= 'l') {
-				if (yych == 'd') goto yy1444;
+				if (yych == 'd') goto yy1452;
 				goto yy146;
 			} else {
-				if (yych <= 'm') goto yy1445;
+				if (yych <= 'm') goto yy1453;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1434:
+yy1442:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -20701,7 +20755,7 @@ yy1434:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy1406;
+			if (yych <= 'E') goto yy1414;
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -20710,13 +20764,13 @@ yy1434:
 				if (yych <= '`') goto yy3;
 				goto yy146;
 			} else {
-				if (yych <= 'e') goto yy1440;
+				if (yych <= 'e') goto yy1448;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1435:
+yy1443:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -20731,7 +20785,7 @@ yy1435:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy1402;
+			if (yych <= 'E') goto yy1410;
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -20740,13 +20794,13 @@ yy1435:
 				if (yych <= '`') goto yy3;
 				goto yy146;
 			} else {
-				if (yych <= 'e') goto yy1436;
+				if (yych <= 'e') goto yy1444;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1436:
+yy1444:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'K') {
@@ -20761,7 +20815,7 @@ yy1436:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'L') goto yy1403;
+			if (yych <= 'L') goto yy1411;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -20770,13 +20824,13 @@ yy1436:
 				if (yych <= '`') goto yy3;
 				goto yy150;
 			} else {
-				if (yych <= 'l') goto yy1437;
+				if (yych <= 'l') goto yy1445;
 				if (yych <= 'z') goto yy150;
 				goto yy3;
 			}
 		}
 	}
-yy1437:
+yy1445:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'E') {
@@ -20791,7 +20845,7 @@ yy1437:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'F') goto yy1404;
+			if (yych <= 'F') goto yy1412;
 			if (yych <= 'Z') goto yy143;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -20800,13 +20854,13 @@ yy1437:
 				if (yych <= '`') goto yy3;
 				goto yy151;
 			} else {
-				if (yych <= 'f') goto yy1438;
+				if (yych <= 'f') goto yy1446;
 				if (yych <= 'z') goto yy151;
 				goto yy3;
 			}
 		}
 	}
-yy1438:
+yy1446:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -20821,7 +20875,7 @@ yy1438:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1405;
+			if (yych <= 'T') goto yy1413;
 			if (yych <= 'Z') goto yy144;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -20830,13 +20884,13 @@ yy1438:
 				if (yych <= '`') goto yy3;
 				goto yy152;
 			} else {
-				if (yych <= 't') goto yy1439;
+				if (yych <= 't') goto yy1447;
 				if (yych <= 'z') goto yy152;
 				goto yy3;
 			}
 		}
 	}
-yy1439:
+yy1447:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -20859,7 +20913,7 @@ yy1439:
 			goto yy3;
 		}
 	}
-yy1440:
+yy1448:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
@@ -20874,7 +20928,7 @@ yy1440:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy1407;
+			if (yych <= 'S') goto yy1415;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy166;
 			goto yy147;
@@ -20883,13 +20937,13 @@ yy1440:
 				if (yych <= '`') goto yy166;
 				goto yy150;
 			} else {
-				if (yych <= 's') goto yy1441;
+				if (yych <= 's') goto yy1449;
 				if (yych <= 'z') goto yy150;
 				goto yy166;
 			}
 		}
 	}
-yy1441:
+yy1449:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -20904,7 +20958,7 @@ yy1441:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1408;
+			if (yych <= 'D') goto yy1416;
 			if (yych <= 'Z') goto yy143;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -20913,13 +20967,13 @@ yy1441:
 				if (yych <= '`') goto yy3;
 				goto yy151;
 			} else {
-				if (yych <= 'd') goto yy1442;
+				if (yych <= 'd') goto yy1450;
 				if (yych <= 'z') goto yy151;
 				goto yy3;
 			}
 		}
 	}
-yy1442:
+yy1450:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -20933,18 +20987,18 @@ yy1442:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1409;
+			if (yych <= 'A') goto yy1417;
 			if (yych <= 'Z') goto yy144;
 			if (yych <= '^') goto yy3;
 			goto yy147;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1443;
+			if (yych <= 'a') goto yy1451;
 			if (yych <= 'z') goto yy152;
 			goto yy3;
 		}
 	}
-yy1443:
+yy1451:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -20967,7 +21021,7 @@ yy1443:
 			goto yy3;
 		}
 	}
-yy1444:
+yy1452:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -20981,18 +21035,18 @@ yy1444:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1418;
+			if (yych <= 'A') goto yy1426;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy3;
 			goto yy147;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1451;
+			if (yych <= 'a') goto yy1459;
 			if (yych <= 'z') goto yy150;
 			goto yy3;
 		}
 	}
-yy1445:
+yy1453:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
@@ -21007,7 +21061,7 @@ yy1445:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'O') goto yy1412;
+			if (yych <= 'O') goto yy1420;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -21016,13 +21070,13 @@ yy1445:
 				if (yych <= '`') goto yy3;
 				goto yy150;
 			} else {
-				if (yych <= 'o') goto yy1446;
+				if (yych <= 'o') goto yy1454;
 				if (yych <= 'z') goto yy150;
 				goto yy3;
 			}
 		}
 	}
-yy1446:
+yy1454:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -21037,7 +21091,7 @@ yy1446:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy1413;
+			if (yych <= 'R') goto yy1421;
 			if (yych <= 'Z') goto yy143;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -21046,13 +21100,13 @@ yy1446:
 				if (yych <= '`') goto yy3;
 				goto yy151;
 			} else {
-				if (yych <= 'r') goto yy1447;
+				if (yych <= 'r') goto yy1455;
 				if (yych <= 'z') goto yy151;
 				goto yy3;
 			}
 		}
 	}
-yy1447:
+yy1455:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -21067,7 +21121,7 @@ yy1447:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy1414;
+			if (yych <= 'R') goto yy1422;
 			if (yych <= 'Z') goto yy144;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -21076,13 +21130,13 @@ yy1447:
 				if (yych <= '`') goto yy3;
 				goto yy152;
 			} else {
-				if (yych <= 'r') goto yy1448;
+				if (yych <= 'r') goto yy1456;
 				if (yych <= 'z') goto yy152;
 				goto yy3;
 			}
 		}
 	}
-yy1448:
+yy1456:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'N') {
@@ -21096,33 +21150,33 @@ yy1448:
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'O') goto yy1415;
+			if (yych <= 'O') goto yy1423;
 			if (yych == '_') goto yy147;
 			goto yy3;
 		} else {
-			if (yych == 'o') goto yy1449;
+			if (yych == 'o') goto yy1457;
 			if (yych <= 'z') goto yy153;
 			goto yy3;
 		}
 	}
-yy1449:
+yy1457:
 	yych = *++YYCURSOR;
-	if (yych == 'W') goto yy1416;
+	if (yych == 'W') goto yy1424;
 	if (yych != 'w') goto yy154;
-	yyaccept = 29;
+	yyaccept = 30;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 16) {
 		goto yy153;
 	}
 	if (yych <= '.') {
 		if (yych == '-') goto yy147;
-		goto yy1417;
+		goto yy1425;
 	} else {
 		if (yych <= '/') goto yy147;
 		if (yych == '_') goto yy147;
-		goto yy1417;
+		goto yy1425;
 	}
-yy1451:
+yy1459:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -21137,7 +21191,7 @@ yy1451:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'Y') goto yy1419;
+			if (yych <= 'Y') goto yy1427;
 			if (yych <= 'Z') goto yy143;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -21146,36 +21200,36 @@ yy1451:
 				if (yych <= '`') goto yy3;
 				goto yy151;
 			} else {
-				if (yych <= 'y') goto yy1452;
+				if (yych <= 'y') goto yy1460;
 				if (yych <= 'z') goto yy151;
 				goto yy3;
 			}
 		}
 	}
-yy1452:
-	yyaccept = 30;
+yy1460:
+	yyaccept = 31;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
 			if (yych == ')') goto yy139;
-			goto yy1420;
+			goto yy1428;
 		} else {
-			if (yych == '.') goto yy1420;
+			if (yych == '.') goto yy1428;
 			goto yy147;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy1420;
+			if (yych <= '@') goto yy1428;
 			if (yych <= 'Z') goto yy144;
-			goto yy1420;
+			goto yy1428;
 		} else {
 			if (yych <= '_') goto yy147;
-			if (yych <= '`') goto yy1420;
+			if (yych <= '`') goto yy1428;
 			if (yych <= 'z') goto yy152;
-			goto yy1420;
+			goto yy1428;
 		}
 	}
-yy1453:
+yy1461:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
@@ -21190,13 +21244,13 @@ yy1453:
 			} else {
 				if (yych <= '@') goto yy3;
 				if (yych <= 'Q') goto yy142;
-				goto yy1427;
+				goto yy1435;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'S') goto yy1428;
+				if (yych <= 'S') goto yy1436;
 				goto yy142;
 			} else {
 				if (yych == '_') goto yy147;
@@ -21205,15 +21259,15 @@ yy1453:
 		} else {
 			if (yych <= 'r') {
 				if (yych <= 'q') goto yy150;
-				goto yy1459;
+				goto yy1467;
 			} else {
-				if (yych <= 's') goto yy1460;
+				if (yych <= 's') goto yy1468;
 				if (yych <= 'z') goto yy150;
 				goto yy3;
 			}
 		}
 	}
-yy1454:
+yy1462:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -21228,7 +21282,7 @@ yy1454:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy1423;
+			if (yych <= 'R') goto yy1431;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy166;
 			goto yy147;
@@ -21237,13 +21291,13 @@ yy1454:
 				if (yych <= '`') goto yy166;
 				goto yy150;
 			} else {
-				if (yych <= 'r') goto yy1455;
+				if (yych <= 'r') goto yy1463;
 				if (yych <= 'z') goto yy150;
 				goto yy166;
 			}
 		}
 	}
-yy1455:
+yy1463:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
@@ -21258,7 +21312,7 @@ yy1455:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy1424;
+			if (yych <= 'S') goto yy1432;
 			if (yych <= 'Z') goto yy143;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -21267,13 +21321,13 @@ yy1455:
 				if (yych <= '`') goto yy3;
 				goto yy151;
 			} else {
-				if (yych <= 's') goto yy1456;
+				if (yych <= 's') goto yy1464;
 				if (yych <= 'z') goto yy151;
 				goto yy3;
 			}
 		}
 	}
-yy1456:
+yy1464:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -21288,7 +21342,7 @@ yy1456:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1425;
+			if (yych <= 'D') goto yy1433;
 			if (yych <= 'Z') goto yy144;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -21297,13 +21351,13 @@ yy1456:
 				if (yych <= '`') goto yy3;
 				goto yy152;
 			} else {
-				if (yych <= 'd') goto yy1457;
+				if (yych <= 'd') goto yy1465;
 				if (yych <= 'z') goto yy152;
 				goto yy3;
 			}
 		}
 	}
-yy1457:
+yy1465:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -21317,22 +21371,22 @@ yy1457:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1426;
+			if (yych <= 'A') goto yy1434;
 			if (yych <= '^') goto yy3;
 			goto yy147;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1458;
+			if (yych <= 'a') goto yy1466;
 			if (yych <= 'z') goto yy153;
 			goto yy3;
 		}
 	}
-yy1458:
+yy1466:
 	yych = *++YYCURSOR;
 	if (yych == 'Y') goto yy172;
 	if (yych == 'y') goto yy185;
 	goto yy154;
-yy1459:
+yy1467:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -21362,7 +21416,7 @@ yy1459:
 			}
 		}
 	}
-yy1460:
+yy1468:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
@@ -21391,7 +21445,7 @@ yy1460:
 			}
 		}
 	}
-yy1461:
+yy1469:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -21406,7 +21460,7 @@ yy1461:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1430;
+			if (yych <= 'T') goto yy1438;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -21415,13 +21469,13 @@ yy1461:
 				if (yych <= '`') goto yy3;
 				goto yy150;
 			} else {
-				if (yych <= 't') goto yy1462;
+				if (yych <= 't') goto yy1470;
 				if (yych <= 'z') goto yy150;
 				goto yy3;
 			}
 		}
 	}
-yy1462:
+yy1470:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -21451,30 +21505,30 @@ yy1462:
 			}
 		}
 	}
-yy1463:
+yy1471:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
 		if (yych <= '@') {
 			if (yych == ')') goto yy139;
 			goto yy3;
 		} else {
-			if (yych == 'R') goto yy1475;
+			if (yych == 'R') goto yy1483;
 			if (yych <= 'X') goto yy141;
-			goto yy1476;
+			goto yy1484;
 		}
 	} else {
 		if (yych <= 'r') {
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'q') goto yy141;
-			goto yy1475;
+			goto yy1483;
 		} else {
-			if (yych == 'y') goto yy1476;
+			if (yych == 'y') goto yy1484;
 			if (yych <= 'z') goto yy141;
 			goto yy3;
 		}
 	}
-yy1464:
+yy1472:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -21483,7 +21537,7 @@ yy1464:
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'C') goto yy141;
-			goto yy1469;
+			goto yy1477;
 		}
 	} else {
 		if (yych <= 'c') {
@@ -21491,12 +21545,12 @@ yy1464:
 			if (yych <= '`') goto yy3;
 			goto yy141;
 		} else {
-			if (yych <= 'd') goto yy1469;
+			if (yych <= 'd') goto yy1477;
 			if (yych <= 'z') goto yy141;
 			goto yy3;
 		}
 	}
-yy1465:
+yy1473:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -21512,12 +21566,12 @@ yy1465:
 			if (yych <= '`') goto yy3;
 			goto yy141;
 		} else {
-			if (yych <= 'n') goto yy1466;
+			if (yych <= 'n') goto yy1474;
 			if (yych <= 'z') goto yy141;
 			goto yy3;
 		}
 	}
-yy1466:
+yy1474:
 	yych = *++YYCURSOR;
 	if (yych <= 'D') {
 		if (yych <= ')') {
@@ -21533,12 +21587,12 @@ yy1466:
 			if (yych <= '`') goto yy166;
 			goto yy142;
 		} else {
-			if (yych <= 'd') goto yy1467;
+			if (yych <= 'd') goto yy1475;
 			if (yych <= 'z') goto yy142;
 			goto yy166;
 		}
 	}
-yy1467:
+yy1475:
 	yych = *++YYCURSOR;
 	if (yych <= 'A') {
 		if (yych == ')') goto yy139;
@@ -21548,12 +21602,12 @@ yy1467:
 			if (yych <= 'Z') goto yy143;
 			goto yy3;
 		} else {
-			if (yych <= 'a') goto yy1468;
+			if (yych <= 'a') goto yy1476;
 			if (yych <= 'z') goto yy143;
 			goto yy3;
 		}
 	}
-yy1468:
+yy1476:
 	yych = *++YYCURSOR;
 	if (yych <= 'Y') {
 		if (yych <= ')') {
@@ -21575,7 +21629,7 @@ yy1468:
 			goto yy3;
 		}
 	}
-yy1469:
+yy1477:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -21591,12 +21645,12 @@ yy1469:
 			if (yych <= '`') goto yy3;
 			goto yy142;
 		} else {
-			if (yych <= 'n') goto yy1470;
+			if (yych <= 'n') goto yy1478;
 			if (yych <= 'z') goto yy142;
 			goto yy3;
 		}
 	}
-yy1470:
+yy1478:
 	yych = *++YYCURSOR;
 	if (yych <= 'I') {
 		if (yych <= ')') {
@@ -21612,12 +21666,12 @@ yy1470:
 			if (yych <= '`') goto yy3;
 			goto yy143;
 		} else {
-			if (yych <= 'i') goto yy1471;
+			if (yych <= 'i') goto yy1479;
 			if (yych <= 'z') goto yy143;
 			goto yy3;
 		}
 	}
-yy1471:
+yy1479:
 	yych = *++YYCURSOR;
 	if (yych <= 'G') {
 		if (yych <= ')') {
@@ -21633,29 +21687,29 @@ yy1471:
 			if (yych <= '`') goto yy3;
 			goto yy144;
 		} else {
-			if (yych <= 'g') goto yy1472;
+			if (yych <= 'g') goto yy1480;
 			if (yych <= 'z') goto yy144;
 			goto yy3;
 		}
 	}
-yy1472:
+yy1480:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
 		if (yych == ')') goto yy139;
 		goto yy3;
 	} else {
-		if (yych <= 'H') goto yy1473;
+		if (yych <= 'H') goto yy1481;
 		if (yych != 'h') goto yy3;
 	}
-yy1473:
+yy1481:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1474;
+	if (yych == 'T') goto yy1482;
 	if (yych != 't') goto yy56;
-yy1474:
+yy1482:
 	yych = *++YYCURSOR;
-	goto yy1420;
-yy1475:
+	goto yy1428;
+yy1483:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -21683,7 +21737,7 @@ yy1475:
 				if (yych <= '9') goto yy195;
 				goto yy193;
 			} else {
-				if (yych == 'C') goto yy1477;
+				if (yych == 'C') goto yy1485;
 				goto yy142;
 			}
 		} else {
@@ -21691,13 +21745,13 @@ yy1475:
 				if (yych <= '`') goto yy193;
 				goto yy142;
 			} else {
-				if (yych <= 'c') goto yy1477;
+				if (yych <= 'c') goto yy1485;
 				if (yych <= 'z') goto yy142;
 				goto yy193;
 			}
 		}
 	}
-yy1476:
+yy1484:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '-') {
@@ -21722,7 +21776,7 @@ yy1476:
 			goto yy193;
 		}
 	}
-yy1477:
+yy1485:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -21744,7 +21798,7 @@ yy1477:
 			goto yy3;
 		}
 	}
-yy1478:
+yy1486:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -21761,14 +21815,14 @@ yy1478:
 				if (yych <= '/') goto yy147;
 				goto yy3;
 			} else {
-				if (yych == 'R') goto yy1475;
+				if (yych == 'R') goto yy1483;
 				goto yy141;
 			}
 		}
 	} else {
 		if (yych <= '`') {
 			if (yych <= 'Z') {
-				if (yych <= 'Y') goto yy1476;
+				if (yych <= 'Y') goto yy1484;
 				goto yy141;
 			} else {
 				if (yych == '_') goto yy147;
@@ -21776,16 +21830,16 @@ yy1478:
 			}
 		} else {
 			if (yych <= 'x') {
-				if (yych == 'r') goto yy1490;
+				if (yych == 'r') goto yy1498;
 				goto yy146;
 			} else {
-				if (yych <= 'y') goto yy1491;
+				if (yych <= 'y') goto yy1499;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1479:
+yy1487:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -21800,7 +21854,7 @@ yy1479:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1469;
+			if (yych <= 'D') goto yy1477;
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -21809,13 +21863,13 @@ yy1479:
 				if (yych <= '`') goto yy3;
 				goto yy146;
 			} else {
-				if (yych <= 'd') goto yy1484;
+				if (yych <= 'd') goto yy1492;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1480:
+yy1488:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -21830,7 +21884,7 @@ yy1480:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1466;
+			if (yych <= 'N') goto yy1474;
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -21839,13 +21893,13 @@ yy1480:
 				if (yych <= '`') goto yy3;
 				goto yy146;
 			} else {
-				if (yych <= 'n') goto yy1481;
+				if (yych <= 'n') goto yy1489;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1481:
+yy1489:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -21860,7 +21914,7 @@ yy1481:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'D') goto yy1467;
+			if (yych <= 'D') goto yy1475;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy166;
 			goto yy147;
@@ -21869,13 +21923,13 @@ yy1481:
 				if (yych <= '`') goto yy166;
 				goto yy150;
 			} else {
-				if (yych <= 'd') goto yy1482;
+				if (yych <= 'd') goto yy1490;
 				if (yych <= 'z') goto yy150;
 				goto yy166;
 			}
 		}
 	}
-yy1482:
+yy1490:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '@') {
@@ -21889,18 +21943,18 @@ yy1482:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'A') goto yy1468;
+			if (yych <= 'A') goto yy1476;
 			if (yych <= 'Z') goto yy143;
 			if (yych <= '^') goto yy3;
 			goto yy147;
 		} else {
 			if (yych <= '`') goto yy3;
-			if (yych <= 'a') goto yy1483;
+			if (yych <= 'a') goto yy1491;
 			if (yych <= 'z') goto yy151;
 			goto yy3;
 		}
 	}
-yy1483:
+yy1491:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'X') {
@@ -21930,7 +21984,7 @@ yy1483:
 			}
 		}
 	}
-yy1484:
+yy1492:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -21945,7 +21999,7 @@ yy1484:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1470;
+			if (yych <= 'N') goto yy1478;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -21954,13 +22008,13 @@ yy1484:
 				if (yych <= '`') goto yy3;
 				goto yy150;
 			} else {
-				if (yych <= 'n') goto yy1485;
+				if (yych <= 'n') goto yy1493;
 				if (yych <= 'z') goto yy150;
 				goto yy3;
 			}
 		}
 	}
-yy1485:
+yy1493:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'H') {
@@ -21975,7 +22029,7 @@ yy1485:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'I') goto yy1471;
+			if (yych <= 'I') goto yy1479;
 			if (yych <= 'Z') goto yy143;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -21984,13 +22038,13 @@ yy1485:
 				if (yych <= '`') goto yy3;
 				goto yy151;
 			} else {
-				if (yych <= 'i') goto yy1486;
+				if (yych <= 'i') goto yy1494;
 				if (yych <= 'z') goto yy151;
 				goto yy3;
 			}
 		}
 	}
-yy1486:
+yy1494:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'F') {
@@ -22005,7 +22059,7 @@ yy1486:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'G') goto yy1472;
+			if (yych <= 'G') goto yy1480;
 			if (yych <= 'Z') goto yy144;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -22014,13 +22068,13 @@ yy1486:
 				if (yych <= '`') goto yy3;
 				goto yy152;
 			} else {
-				if (yych <= 'g') goto yy1487;
+				if (yych <= 'g') goto yy1495;
 				if (yych <= 'z') goto yy152;
 				goto yy3;
 			}
 		}
 	}
-yy1487:
+yy1495:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -22034,33 +22088,33 @@ yy1487:
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'H') goto yy1473;
+			if (yych <= 'H') goto yy1481;
 			if (yych == '_') goto yy147;
 			goto yy3;
 		} else {
-			if (yych == 'h') goto yy1488;
+			if (yych == 'h') goto yy1496;
 			if (yych <= 'z') goto yy153;
 			goto yy3;
 		}
 	}
-yy1488:
+yy1496:
 	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy1474;
+	if (yych == 'T') goto yy1482;
 	if (yych != 't') goto yy154;
-	yyaccept = 30;
+	yyaccept = 31;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 16) {
 		goto yy153;
 	}
 	if (yych <= '.') {
 		if (yych == '-') goto yy147;
-		goto yy1420;
+		goto yy1428;
 	} else {
 		if (yych <= '/') goto yy147;
 		if (yych == '_') goto yy147;
-		goto yy1420;
+		goto yy1428;
 	}
-yy1490:
+yy1498:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -22088,7 +22142,7 @@ yy1490:
 				if (yych <= '@') goto yy193;
 				goto yy142;
 			} else {
-				if (yych <= 'C') goto yy1477;
+				if (yych <= 'C') goto yy1485;
 				if (yych <= 'Z') goto yy142;
 				goto yy193;
 			}
@@ -22098,13 +22152,13 @@ yy1490:
 				if (yych <= '`') goto yy193;
 				goto yy150;
 			} else {
-				if (yych <= 'c') goto yy1492;
+				if (yych <= 'c') goto yy1500;
 				if (yych <= 'z') goto yy150;
 				goto yy193;
 			}
 		}
 	}
-yy1491:
+yy1499:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '.') {
@@ -22139,7 +22193,7 @@ yy1491:
 			}
 		}
 	}
-yy1492:
+yy1500:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -22169,7 +22223,7 @@ yy1492:
 			}
 		}
 	}
-yy1493:
+yy1501:
 	yych = *++YYCURSOR;
 	if (yych <= 'W') {
 		if (yych <= 'N') {
@@ -22177,29 +22231,29 @@ yy1493:
 			if (yych <= '@') goto yy3;
 			goto yy141;
 		} else {
-			if (yych <= 'O') goto yy1501;
+			if (yych <= 'O') goto yy1509;
 			if (yych <= 'U') goto yy141;
-			if (yych <= 'V') goto yy1502;
-			goto yy1499;
+			if (yych <= 'V') goto yy1510;
+			goto yy1507;
 		}
 	} else {
 		if (yych <= 'o') {
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '`') goto yy3;
 			if (yych <= 'n') goto yy141;
-			goto yy1501;
+			goto yy1509;
 		} else {
 			if (yych <= 'v') {
 				if (yych <= 'u') goto yy141;
-				goto yy1502;
+				goto yy1510;
 			} else {
-				if (yych <= 'w') goto yy1499;
+				if (yych <= 'w') goto yy1507;
 				if (yych <= 'z') goto yy141;
 				goto yy3;
 			}
 		}
 	}
-yy1494:
+yy1502:
 	yych = *++YYCURSOR;
 	if (yych <= 'X') {
 		if (yych <= ')') {
@@ -22208,7 +22262,7 @@ yy1494:
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'W') goto yy141;
-			goto yy1498;
+			goto yy1506;
 		}
 	} else {
 		if (yych <= 'w') {
@@ -22216,12 +22270,12 @@ yy1494:
 			if (yych <= '`') goto yy3;
 			goto yy141;
 		} else {
-			if (yych <= 'x') goto yy1498;
+			if (yych <= 'x') goto yy1506;
 			if (yych <= 'z') goto yy141;
 			goto yy3;
 		}
 	}
-yy1495:
+yy1503:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -22237,12 +22291,12 @@ yy1495:
 			if (yych <= '`') goto yy3;
 			goto yy141;
 		} else {
-			if (yych <= 'n') goto yy1496;
+			if (yych <= 'n') goto yy1504;
 			if (yych <= 'z') goto yy141;
 			goto yy3;
 		}
 	}
-yy1496:
+yy1504:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -22258,12 +22312,12 @@ yy1496:
 			if (yych <= '`') goto yy3;
 			goto yy142;
 		} else {
-			if (yych <= 't') goto yy1497;
+			if (yych <= 't') goto yy1505;
 			if (yych <= 'z') goto yy142;
 			goto yy3;
 		}
 	}
-yy1497:
+yy1505:
 	yych = *++YYCURSOR;
 	if (yych <= 'H') {
 		if (yych <= ')') {
@@ -22285,7 +22339,7 @@ yy1497:
 			goto yy3;
 		}
 	}
-yy1498:
+yy1506:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -22294,7 +22348,7 @@ yy1498:
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'S') goto yy142;
-			goto yy1428;
+			goto yy1436;
 		}
 	} else {
 		if (yych <= 's') {
@@ -22302,22 +22356,22 @@ yy1498:
 			if (yych <= '`') goto yy3;
 			goto yy142;
 		} else {
-			if (yych <= 't') goto yy1428;
+			if (yych <= 't') goto yy1436;
 			if (yych <= 'z') goto yy142;
 			goto yy3;
 		}
 	}
-yy1499:
+yy1507:
 	++YYCURSOR;
 	if ((yych = *YYCURSOR) <= '@') {
 		if (yych == ')') goto yy139;
 	} else {
 		if (yych <= 'Z') goto yy142;
-		if (yych <= '`') goto yy1500;
+		if (yych <= '`') goto yy1508;
 		if (yych <= 'z') goto yy142;
 	}
-yy1500:
-#line 967 "ext/date/lib/parse_date.re"
+yy1508:
+#line 968 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("now");
 		TIMELIB_INIT;
@@ -22325,8 +22379,8 @@ yy1500:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 22329 "<stdout>"
-yy1501:
+#line 22383 "<stdout>"
+yy1509:
 	yych = *++YYCURSOR;
 	if (yych <= 'N') {
 		if (yych <= ')') {
@@ -22335,7 +22389,7 @@ yy1501:
 		} else {
 			if (yych <= '@') goto yy3;
 			if (yych <= 'M') goto yy142;
-			goto yy1507;
+			goto yy1515;
 		}
 	} else {
 		if (yych <= 'm') {
@@ -22343,12 +22397,12 @@ yy1501:
 			if (yych <= '`') goto yy3;
 			goto yy142;
 		} else {
-			if (yych <= 'n') goto yy1507;
+			if (yych <= 'n') goto yy1515;
 			if (yych <= 'z') goto yy142;
 			goto yy3;
 		}
 	}
-yy1502:
+yy1510:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
@@ -22383,13 +22437,13 @@ yy1502:
 				if (yych <= '`') goto yy193;
 				goto yy142;
 			} else {
-				if (yych <= 'e') goto yy1503;
+				if (yych <= 'e') goto yy1511;
 				if (yych <= 'z') goto yy142;
 				goto yy193;
 			}
 		}
 	}
-yy1503:
+yy1511:
 	yych = *++YYCURSOR;
 	if (yych <= 'M') {
 		if (yych <= ')') {
@@ -22405,12 +22459,12 @@ yy1503:
 			if (yych <= '`') goto yy3;
 			goto yy143;
 		} else {
-			if (yych <= 'm') goto yy1504;
+			if (yych <= 'm') goto yy1512;
 			if (yych <= 'z') goto yy143;
 			goto yy3;
 		}
 	}
-yy1504:
+yy1512:
 	yych = *++YYCURSOR;
 	if (yych <= 'B') {
 		if (yych <= ')') {
@@ -22426,37 +22480,37 @@ yy1504:
 			if (yych <= '`') goto yy3;
 			goto yy144;
 		} else {
-			if (yych <= 'b') goto yy1505;
+			if (yych <= 'b') goto yy1513;
 			if (yych <= 'z') goto yy144;
 			goto yy3;
 		}
 	}
-yy1505:
+yy1513:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
 		if (yych == ')') goto yy139;
 		goto yy3;
 	} else {
-		if (yych <= 'E') goto yy1506;
+		if (yych <= 'E') goto yy1514;
 		if (yych != 'e') goto yy3;
 	}
-yy1506:
+yy1514:
 	yych = *++YYCURSOR;
 	if (yych == 'R') goto yy205;
 	if (yych == 'r') goto yy205;
 	goto yy56;
-yy1507:
+yy1515:
 	++YYCURSOR;
 	if ((yych = *YYCURSOR) <= '@') {
 		if (yych == ')') goto yy139;
 	} else {
 		if (yych <= 'Z') goto yy143;
-		if (yych <= '`') goto yy1508;
+		if (yych <= '`') goto yy1516;
 		if (yych <= 'z') goto yy143;
 	}
-yy1508:
-#line 976 "ext/date/lib/parse_date.re"
+yy1516:
+#line 977 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("noon");
 		TIMELIB_INIT;
@@ -22467,8 +22521,8 @@ yy1508:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 22471 "<stdout>"
-yy1509:
+#line 22525 "<stdout>"
+yy1517:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'V') {
@@ -22486,15 +22540,15 @@ yy1509:
 				if (yych <= '@') goto yy3;
 				goto yy141;
 			} else {
-				if (yych <= 'O') goto yy1501;
+				if (yych <= 'O') goto yy1509;
 				if (yych <= 'U') goto yy141;
-				goto yy1502;
+				goto yy1510;
 			}
 		}
 	} else {
 		if (yych <= 'n') {
 			if (yych <= '^') {
-				if (yych <= 'W') goto yy1499;
+				if (yych <= 'W') goto yy1507;
 				if (yych <= 'Z') goto yy141;
 				goto yy3;
 			} else {
@@ -22504,17 +22558,17 @@ yy1509:
 			}
 		} else {
 			if (yych <= 'v') {
-				if (yych <= 'o') goto yy1516;
+				if (yych <= 'o') goto yy1524;
 				if (yych <= 'u') goto yy146;
-				goto yy1517;
+				goto yy1525;
 			} else {
-				if (yych <= 'w') goto yy1515;
+				if (yych <= 'w') goto yy1523;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1510:
+yy1518:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'W') {
@@ -22529,7 +22583,7 @@ yy1510:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'X') goto yy1498;
+			if (yych <= 'X') goto yy1506;
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -22538,13 +22592,13 @@ yy1510:
 				if (yych <= '`') goto yy3;
 				goto yy146;
 			} else {
-				if (yych <= 'x') goto yy1514;
+				if (yych <= 'x') goto yy1522;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1511:
+yy1519:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -22559,7 +22613,7 @@ yy1511:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1496;
+			if (yych <= 'N') goto yy1504;
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -22568,13 +22622,13 @@ yy1511:
 				if (yych <= '`') goto yy3;
 				goto yy146;
 			} else {
-				if (yych <= 'n') goto yy1512;
+				if (yych <= 'n') goto yy1520;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1512:
+yy1520:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -22589,7 +22643,7 @@ yy1512:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1497;
+			if (yych <= 'T') goto yy1505;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -22598,13 +22652,13 @@ yy1512:
 				if (yych <= '`') goto yy3;
 				goto yy150;
 			} else {
-				if (yych <= 't') goto yy1513;
+				if (yych <= 't') goto yy1521;
 				if (yych <= 'z') goto yy150;
 				goto yy3;
 			}
 		}
 	}
-yy1513:
+yy1521:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'G') {
@@ -22634,7 +22688,7 @@ yy1513:
 			}
 		}
 	}
-yy1514:
+yy1522:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -22649,7 +22703,7 @@ yy1514:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1428;
+			if (yych <= 'T') goto yy1436;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -22658,36 +22712,36 @@ yy1514:
 				if (yych <= '`') goto yy3;
 				goto yy150;
 			} else {
-				if (yych <= 't') goto yy1460;
+				if (yych <= 't') goto yy1468;
 				if (yych <= 'z') goto yy150;
 				goto yy3;
 			}
 		}
 	}
-yy1515:
-	yyaccept = 31;
+yy1523:
+	yyaccept = 32;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
 			if (yych == ')') goto yy139;
-			goto yy1500;
+			goto yy1508;
 		} else {
-			if (yych == '.') goto yy1500;
+			if (yych == '.') goto yy1508;
 			goto yy147;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy1500;
+			if (yych <= '@') goto yy1508;
 			if (yych <= 'Z') goto yy142;
-			goto yy1500;
+			goto yy1508;
 		} else {
 			if (yych <= '_') goto yy147;
-			if (yych <= '`') goto yy1500;
+			if (yych <= '`') goto yy1508;
 			if (yych <= 'z') goto yy150;
-			goto yy1500;
+			goto yy1508;
 		}
 	}
-yy1516:
+yy1524:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'M') {
@@ -22702,7 +22756,7 @@ yy1516:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'N') goto yy1507;
+			if (yych <= 'N') goto yy1515;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -22711,13 +22765,13 @@ yy1516:
 				if (yych <= '`') goto yy3;
 				goto yy150;
 			} else {
-				if (yych <= 'n') goto yy1522;
+				if (yych <= 'n') goto yy1530;
 				if (yych <= 'z') goto yy150;
 				goto yy3;
 			}
 		}
 	}
-yy1517:
+yy1525:
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '9') {
@@ -22745,7 +22799,7 @@ yy1517:
 				if (yych <= '@') goto yy193;
 				goto yy142;
 			} else {
-				if (yych <= 'E') goto yy1503;
+				if (yych <= 'E') goto yy1511;
 				if (yych <= 'Z') goto yy142;
 				goto yy193;
 			}
@@ -22755,13 +22809,13 @@ yy1517:
 				if (yych <= '`') goto yy193;
 				goto yy150;
 			} else {
-				if (yych <= 'e') goto yy1518;
+				if (yych <= 'e') goto yy1526;
 				if (yych <= 'z') goto yy150;
 				goto yy193;
 			}
 		}
 	}
-yy1518:
+yy1526:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'L') {
@@ -22776,7 +22830,7 @@ yy1518:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'M') goto yy1504;
+			if (yych <= 'M') goto yy1512;
 			if (yych <= 'Z') goto yy143;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -22785,13 +22839,13 @@ yy1518:
 				if (yych <= '`') goto yy3;
 				goto yy151;
 			} else {
-				if (yych <= 'm') goto yy1519;
+				if (yych <= 'm') goto yy1527;
 				if (yych <= 'z') goto yy151;
 				goto yy3;
 			}
 		}
 	}
-yy1519:
+yy1527:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'A') {
@@ -22806,7 +22860,7 @@ yy1519:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'B') goto yy1505;
+			if (yych <= 'B') goto yy1513;
 			if (yych <= 'Z') goto yy144;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -22815,13 +22869,13 @@ yy1519:
 				if (yych <= '`') goto yy3;
 				goto yy152;
 			} else {
-				if (yych <= 'b') goto yy1520;
+				if (yych <= 'b') goto yy1528;
 				if (yych <= 'z') goto yy152;
 				goto yy3;
 			}
 		}
 	}
-yy1520:
+yy1528:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -22835,44 +22889,44 @@ yy1520:
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'E') goto yy1506;
+			if (yych <= 'E') goto yy1514;
 			if (yych == '_') goto yy147;
 			goto yy3;
 		} else {
-			if (yych == 'e') goto yy1521;
+			if (yych == 'e') goto yy1529;
 			if (yych <= 'z') goto yy153;
 			goto yy3;
 		}
 	}
-yy1521:
+yy1529:
 	yych = *++YYCURSOR;
 	if (yych == 'R') goto yy205;
 	if (yych == 'r') goto yy376;
 	goto yy154;
-yy1522:
-	yyaccept = 32;
+yy1530:
+	yyaccept = 33;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= '/') {
 		if (yych <= ',') {
 			if (yych == ')') goto yy139;
-			goto yy1508;
+			goto yy1516;
 		} else {
-			if (yych == '.') goto yy1508;
+			if (yych == '.') goto yy1516;
 			goto yy147;
 		}
 	} else {
 		if (yych <= '^') {
-			if (yych <= '@') goto yy1508;
+			if (yych <= '@') goto yy1516;
 			if (yych <= 'Z') goto yy143;
-			goto yy1508;
+			goto yy1516;
 		} else {
 			if (yych <= '_') goto yy147;
-			if (yych <= '`') goto yy1508;
+			if (yych <= '`') goto yy1516;
 			if (yych <= 'z') goto yy151;
-			goto yy1508;
+			goto yy1516;
 		}
 	}
-yy1523:
+yy1531:
 	yych = *++YYCURSOR;
 	if (yych <= 'S') {
 		if (yych <= ')') {
@@ -22888,12 +22942,12 @@ yy1523:
 			if (yych <= '`') goto yy3;
 			goto yy141;
 		} else {
-			if (yych <= 's') goto yy1524;
+			if (yych <= 's') goto yy1532;
 			if (yych <= 'z') goto yy141;
 			goto yy3;
 		}
 	}
-yy1524:
+yy1532:
 	yych = *++YYCURSOR;
 	if (yych <= 'T') {
 		if (yych <= ')') {
@@ -22909,12 +22963,12 @@ yy1524:
 			if (yych <= '`') goto yy3;
 			goto yy142;
 		} else {
-			if (yych <= 't') goto yy1525;
+			if (yych <= 't') goto yy1533;
 			if (yych <= 'z') goto yy142;
 			goto yy3;
 		}
 	}
-yy1525:
+yy1533:
 	yych = *++YYCURSOR;
 	if (yych <= 'E') {
 		if (yych <= ')') {
@@ -22930,12 +22984,12 @@ yy1525:
 			if (yych <= '`') goto yy3;
 			goto yy143;
 		} else {
-			if (yych <= 'e') goto yy1526;
+			if (yych <= 'e') goto yy1534;
 			if (yych <= 'z') goto yy143;
 			goto yy3;
 		}
 	}
-yy1526:
+yy1534:
 	yych = *++YYCURSOR;
 	if (yych <= 'R') {
 		if (yych <= ')') {
@@ -22951,33 +23005,33 @@ yy1526:
 			if (yych <= '`') goto yy3;
 			goto yy144;
 		} else {
-			if (yych <= 'r') goto yy1527;
+			if (yych <= 'r') goto yy1535;
 			if (yych <= 'z') goto yy144;
 			goto yy3;
 		}
 	}
-yy1527:
+yy1535:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
 		if (yych == ')') goto yy139;
 		goto yy3;
 	} else {
-		if (yych <= 'D') goto yy1528;
+		if (yych <= 'D') goto yy1536;
 		if (yych != 'd') goto yy3;
 	}
-yy1528:
+yy1536:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1529;
+	if (yych == 'A') goto yy1537;
 	if (yych != 'a') goto yy56;
-yy1529:
+yy1537:
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1530;
+	if (yych == 'Y') goto yy1538;
 	if (yych != 'y') goto yy56;
-yy1530:
+yy1538:
 	++YYCURSOR;
-yy1531:
-#line 955 "ext/date/lib/parse_date.re"
+yy1539:
+#line 956 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("yesterday");
 		TIMELIB_INIT;
@@ -22988,8 +23042,8 @@ yy1531:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 22992 "<stdout>"
-yy1532:
+#line 23046 "<stdout>"
+yy1540:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'R') {
@@ -23004,7 +23058,7 @@ yy1532:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'S') goto yy1524;
+			if (yych <= 'S') goto yy1532;
 			if (yych <= 'Z') goto yy141;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -23013,13 +23067,13 @@ yy1532:
 				if (yych <= '`') goto yy3;
 				goto yy146;
 			} else {
-				if (yych <= 's') goto yy1533;
+				if (yych <= 's') goto yy1541;
 				if (yych <= 'z') goto yy146;
 				goto yy3;
 			}
 		}
 	}
-yy1533:
+yy1541:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'S') {
@@ -23034,7 +23088,7 @@ yy1533:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'T') goto yy1525;
+			if (yych <= 'T') goto yy1533;
 			if (yych <= 'Z') goto yy142;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -23043,13 +23097,13 @@ yy1533:
 				if (yych <= '`') goto yy3;
 				goto yy150;
 			} else {
-				if (yych <= 't') goto yy1534;
+				if (yych <= 't') goto yy1542;
 				if (yych <= 'z') goto yy150;
 				goto yy3;
 			}
 		}
 	}
-yy1534:
+yy1542:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'D') {
@@ -23064,7 +23118,7 @@ yy1534:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'E') goto yy1526;
+			if (yych <= 'E') goto yy1534;
 			if (yych <= 'Z') goto yy143;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -23073,13 +23127,13 @@ yy1534:
 				if (yych <= '`') goto yy3;
 				goto yy151;
 			} else {
-				if (yych <= 'e') goto yy1535;
+				if (yych <= 'e') goto yy1543;
 				if (yych <= 'z') goto yy151;
 				goto yy3;
 			}
 		}
 	}
-yy1535:
+yy1543:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'Q') {
@@ -23094,7 +23148,7 @@ yy1535:
 		}
 	} else {
 		if (yych <= '_') {
-			if (yych <= 'R') goto yy1527;
+			if (yych <= 'R') goto yy1535;
 			if (yych <= 'Z') goto yy144;
 			if (yych <= '^') goto yy3;
 			goto yy147;
@@ -23103,13 +23157,13 @@ yy1535:
 				if (yych <= '`') goto yy3;
 				goto yy152;
 			} else {
-				if (yych <= 'r') goto yy1536;
+				if (yych <= 'r') goto yy1544;
 				if (yych <= 'z') goto yy152;
 				goto yy3;
 			}
 		}
 	}
-yy1536:
+yy1544:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'C') {
@@ -23123,37 +23177,37 @@ yy1536:
 		}
 	} else {
 		if (yych <= '`') {
-			if (yych <= 'D') goto yy1528;
+			if (yych <= 'D') goto yy1536;
 			if (yych == '_') goto yy147;
 			goto yy3;
 		} else {
-			if (yych == 'd') goto yy1537;
+			if (yych == 'd') goto yy1545;
 			if (yych <= 'z') goto yy153;
 			goto yy3;
 		}
 	}
-yy1537:
+yy1545:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy1529;
+	if (yych == 'A') goto yy1537;
 	if (yych != 'a') goto yy154;
 	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy1530;
+	if (yych == 'Y') goto yy1538;
 	if (yych != 'y') goto yy154;
-	yyaccept = 33;
+	yyaccept = 34;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yybm[0+yych] & 16) {
 		goto yy153;
 	}
 	if (yych <= '.') {
 		if (yych == '-') goto yy147;
-		goto yy1531;
+		goto yy1539;
 	} else {
 		if (yych <= '/') goto yy147;
 		if (yych == '_') goto yy147;
-		goto yy1531;
+		goto yy1539;
 	}
 }
-#line 1729 "ext/date/lib/parse_date.re"
+#line 1758 "ext/date/lib/parse_date.re"
 
 }
 
@@ -23460,7 +23514,6 @@ timelib_time *timelib_parse_from_format(char *format, char *string, size_t len,
 				s->time->m = 1;
 				s->time->d = 1;
 				s->time->h = s->time->i = s->time->s = 0;
-				s->time->f = 0.0;
 				s->time->relative.s += tmp;
 				s->time->is_localtime = 1;
 				s->time->zone_type = TIMELIB_ZONETYPE_OFFSET;
@@ -23618,13 +23671,20 @@ void timelib_fill_holes(timelib_time *parsed, timelib_time *now, int options)
 		parsed->s = 0;
 		parsed->f = 0;
 	}
+	if (
+		parsed->y != TIMELIB_UNSET || parsed->m != TIMELIB_UNSET || parsed->d != TIMELIB_UNSET ||
+		parsed->h != TIMELIB_UNSET || parsed->i != TIMELIB_UNSET || parsed->s != TIMELIB_UNSET
+	) {
+		if (parsed->f == TIMELIB_UNSET) parsed->f = 0;
+	} else {
+		if (parsed->f == TIMELIB_UNSET) parsed->f = now->f != TIMELIB_UNSET ? now->f : 0;
+	}
 	if (parsed->y == TIMELIB_UNSET) parsed->y = now->y != TIMELIB_UNSET ? now->y : 0;
-	if (parsed->d == TIMELIB_UNSET) parsed->d = now->d != TIMELIB_UNSET ? now->d : 0;
 	if (parsed->m == TIMELIB_UNSET) parsed->m = now->m != TIMELIB_UNSET ? now->m : 0;
+	if (parsed->d == TIMELIB_UNSET) parsed->d = now->d != TIMELIB_UNSET ? now->d : 0;
 	if (parsed->h == TIMELIB_UNSET) parsed->h = now->h != TIMELIB_UNSET ? now->h : 0;
 	if (parsed->i == TIMELIB_UNSET) parsed->i = now->i != TIMELIB_UNSET ? now->i : 0;
 	if (parsed->s == TIMELIB_UNSET) parsed->s = now->s != TIMELIB_UNSET ? now->s : 0;
-	if (parsed->f == TIMELIB_UNSET) parsed->f = now->f != TIMELIB_UNSET ? now->f : 0;
 	if (parsed->z == TIMELIB_UNSET) parsed->z = now->z != TIMELIB_UNSET ? now->z : 0;
 	if (parsed->dst == TIMELIB_UNSET) parsed->dst = now->dst != TIMELIB_UNSET ? now->dst : 0;