From 28b41c811d779df2a9b8a2e1ccce0e827243a8fa Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Sat, 13 Nov 2010 15:01:48 +0000 Subject: [PATCH] - MFH: Added support for the ( and ) delimiters/separators to DateTime::createFromFormat(). - Regenerated the parsers for HEAD and PHP_5_3. --- NEWS | 2 ++ ext/date/lib/parse_date.c | 6 ++++-- ext/date/lib/parse_date.re | 4 +++- ext/date/lib/parse_iso_intervals.c | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index a16929ba1b..200a7bcb9c 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,8 @@ (Andrey) - Improved support for is_link and related functions on Windows. (Pierre) +- Added support for the ( and ) delimiters/separators to + DateTime::createFromFormat(). (Derick) - Added custom process title for FPM. (fat) - Added '-t/--test' to php-fpm to check and validate FPM conf file. (fat) - Added statistics about listening socket queue length for FPM. diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index f4b2af2d20..b89e05a2db 100644 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Mon Aug 30 17:37:00 2010 */ +/* Generated by re2c 0.13.5 on Sat Nov 13 14:58:02 2010 */ #line 1 "ext/date/lib/parse_date.re" /* +----------------------------------------------------------------------+ @@ -24990,7 +24990,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim break; case '#': /* separation symbol */ - if (*ptr == ';' || *ptr == ':' || *ptr == '/' || *ptr == '.' || *ptr == ',' || *ptr == '-') { + if (*ptr == ';' || *ptr == ':' || *ptr == '/' || *ptr == '.' || *ptr == ',' || *ptr == '-' || *ptr == '(' || *ptr == ')') { ++ptr; } else { add_pbf_error(s, "The separation symbol ([;:/.,-]) could not be found", string, begin); @@ -25003,6 +25003,8 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim case '.': case ',': case '-': + case '(': + case ')': if (*ptr == *fptr) { ++ptr; } else { diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re index 6711369363..0a711d1f27 100644 --- a/ext/date/lib/parse_date.re +++ b/ext/date/lib/parse_date.re @@ -1997,7 +1997,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim break; case '#': /* separation symbol */ - if (*ptr == ';' || *ptr == ':' || *ptr == '/' || *ptr == '.' || *ptr == ',' || *ptr == '-') { + if (*ptr == ';' || *ptr == ':' || *ptr == '/' || *ptr == '.' || *ptr == ',' || *ptr == '-' || *ptr == '(' || *ptr == ')') { ++ptr; } else { add_pbf_error(s, "The separation symbol ([;:/.,-]) could not be found", string, begin); @@ -2010,6 +2010,8 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim case '.': case ',': case '-': + case '(': + case ')': if (*ptr == *fptr) { ++ptr; } else { diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c index a08dcc4b56..f1c6fa7654 100644 --- a/ext/date/lib/parse_iso_intervals.c +++ b/ext/date/lib/parse_iso_intervals.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Fri Mar 26 12:12:03 2010 */ +/* Generated by re2c 0.13.5 on Sat Nov 13 14:57:59 2010 */ #line 1 "ext/date/lib/parse_iso_intervals.re" /* +----------------------------------------------------------------------+ -- 2.40.0