derick Thu Jun 16 09:30:27 2005 EDT
Modified files:
/php-src/ext/date/lib parse_date.c
/php-src/ext/date/lib/resource parse_date.re
Log:
- Fixed a regression with "last saturday"
http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.7
php-src/ext/date/lib/parse_date.c:1.8
--- php-src/ext/date/lib/parse_date.c:1.7 Wed Jun 15 07:01:04 2005
+++ php-src/ext/date/lib/parse_date.c Thu Jun 16 09:30:25 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.8.dev on Wed Jun 15 12:56:03 2005 */
+/* Generated by re2c 0.9.8.dev on Thu Jun 16 15:24:58 2005 */
#line 1 "parse_date.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: parse_date.c,v 1.7 2005/06/15 11:01:04 derick Exp $ */
+/* $Id: parse_date.c,v 1.8 2005/06/16 13:30:25 derick Exp $ */
#include <stdlib.h>
#include <stdio.h>
@@ -528,11 +528,11 @@
return 0;
}
-static long timelib_lookup_relative_text(char **ptr)
+static timelib_sll timelib_lookup_relative_text(char **ptr)
{
char *word;
char *begin = *ptr, *end;
- long value = 0;
+ timelib_sll value = 0;
const timelib_lookup_table *tp;
while ((**ptr >= 'A' && **ptr <= 'Z') || (**ptr >= 'a' && **ptr <=
'z')) {
@@ -552,7 +552,7 @@
return value;
}
-static long timelib_get_relative_text(char **ptr)
+static timelib_sll timelib_get_relative_text(char **ptr)
{
while (**ptr == ' ' || **ptr == '-' || **ptr == '/') {
++*ptr;
@@ -623,7 +623,7 @@
return value;
}
-static void timelib_set_relative(char **ptr, timelib_ull amount, Scanner *s)
+static void timelib_set_relative(char **ptr, timelib_sll amount, Scanner *s)
{
const timelib_relunit* relunit;
@@ -3128,7 +3128,7 @@
#line 1226 "parse_date.re"
{
- long i;
+ timelib_sll i;
TIMELIB_INIT;
TIMELIB_HAVE_RELATIVE();
http://cvs.php.net/diff.php/php-src/ext/date/lib/resource/parse_date.re?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/date/lib/resource/parse_date.re
diff -u php-src/ext/date/lib/resource/parse_date.re:1.6
php-src/ext/date/lib/resource/parse_date.re:1.7
--- php-src/ext/date/lib/resource/parse_date.re:1.6 Wed Jun 15 07:01:07 2005
+++ php-src/ext/date/lib/resource/parse_date.re Thu Jun 16 09:30:26 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: parse_date.re,v 1.6 2005/06/15 11:01:07 derick Exp $ */
+/* $Id: parse_date.re,v 1.7 2005/06/16 13:30:26 derick Exp $ */
#include <stdlib.h>
#include <stdio.h>
@@ -526,11 +526,11 @@
return 0;
}
-static long timelib_lookup_relative_text(char **ptr)
+static timelib_sll timelib_lookup_relative_text(char **ptr)
{
char *word;
char *begin = *ptr, *end;
- long value = 0;
+ timelib_sll value = 0;
const timelib_lookup_table *tp;
while ((**ptr >= 'A' && **ptr <= 'Z') || (**ptr >= 'a' && **ptr <=
'z')) {
@@ -550,7 +550,7 @@
return value;
}
-static long timelib_get_relative_text(char **ptr)
+static timelib_sll timelib_get_relative_text(char **ptr)
{
while (**ptr == ' ' || **ptr == '-' || **ptr == '/') {
++*ptr;
@@ -621,7 +621,7 @@
return value;
}
-static void timelib_set_relative(char **ptr, timelib_ull amount, Scanner *s)
+static void timelib_set_relative(char **ptr, timelib_sll amount, Scanner *s)
{
const timelib_relunit* relunit;
@@ -1224,7 +1224,7 @@
relativetext
{
- long i;
+ timelib_sll i;
TIMELIB_INIT;
TIMELIB_HAVE_RELATIVE();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
