diff options
author | Ondřej Surý <ondrej@sury.org> | 2010-03-09 11:57:54 +0100 |
---|---|---|
committer | Ondřej Surý <ondrej@sury.org> | 2010-03-09 11:57:54 +0100 |
commit | 855a09f4eded707941180c9d90acd17c25e29447 (patch) | |
tree | a40947efaa9876f31b6ee3956c3f3775768143bb /ext/date/lib/parse_date.re | |
parent | c852c28a88fccf6e34a2cb091fdfa72bce2b59c7 (diff) | |
download | php-855a09f4eded707941180c9d90acd17c25e29447.tar.gz |
Imported Upstream version 5.3.2upstream/5.3.2
Diffstat (limited to 'ext/date/lib/parse_date.re')
-rw-r--r-- | ext/date/lib/parse_date.re | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re index 53966d898..dd3ac7b48 100644 --- a/ext/date/lib/parse_date.re +++ b/ext/date/lib/parse_date.re @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.re 286515 2009-07-29 15:34:59Z derick $ */ +/* $Id: parse_date.re 294880 2010-02-11 11:11:47Z pajoye $ */ #include "timelib.h" @@ -236,6 +236,7 @@ static timelib_lookup_table const timelib_reltext_lookup[] = { { "sixth", 0, 6 }, { "seventh", 0, 7 }, { "eight", 0, 8 }, + { "eighth", 0, 8 }, { "ninth", 0, 9 }, { "tenth", 0, 10 }, { "eleventh", 0, 11 }, @@ -951,7 +952,7 @@ dateshortwithtimelongtz = datenoyear iso8601normtz; /* * Relative regexps */ -reltextnumber = 'first'|'second'|'third'|'fourth'|'fifth'|'sixth'|'seventh'|'eight'|'ninth'|'tenth'|'eleventh'|'twelfth'; +reltextnumber = 'first'|'second'|'third'|'fourth'|'fifth'|'sixth'|'seventh'|'eight'|'eighth'|'ninth'|'tenth'|'eleventh'|'twelfth'; reltexttext = 'next'|'last'|'previous'|'this'; reltextunit = (('sec'|'second'|'min'|'minute'|'hour'|'day'|'fortnight'|'forthnight'|'month'|'year') 's'?) | 'weeks' | daytext; @@ -1943,7 +1944,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim add_pbf_error(s, "A two digit second could not be found", string, begin); } break; - case 'u': /* six digit millisecond */ + case 'u': /* up to six digit millisecond */ { double f; char *tptr; |