- Fixed a regression with "last saturday"

Author: Derick Rethans

ext/date/lib/parse_date.c

@@ -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"
 /*
    +----------------------------------------------------------------------+
@@ -528,11 +528,11 @@ static long timelib_parse_tz_cor(char **ptr)
 	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 @@ static long timelib_lookup_relative_text(char **ptr)
 	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 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
 	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 @@ static int scan(Scanner *s)
 
 #line 1226 "parse_date.re"
 {
-		long i;
+		timelib_sll i;
 
 		TIMELIB_INIT;
 		TIMELIB_HAVE_RELATIVE();

ext/date/lib/parse_date.re

@@ -526,11 +526,11 @@ static long timelib_parse_tz_cor(char **ptr)
 	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 @@ static long timelib_lookup_relative_text(char **ptr)
 	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 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
 	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 = (reltextnumber space reltextunit)+;
 
 	relativetext
 	{
-		long i;
+		timelib_sll i;
 
 		TIMELIB_INIT;
 		TIMELIB_HAVE_RELATIVE();

ext/date/lib/resource/parse_date.re

@@ -526,11 +526,11 @@ static long timelib_parse_tz_cor(char **ptr)
 	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 @@ static long timelib_lookup_relative_text(char **ptr)
 	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 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
 	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 = (reltextnumber space reltextunit)+;
 
 	relativetext
 	{
-		long i;
+		timelib_sll i;
 
 		TIMELIB_INIT;
 		TIMELIB_HAVE_RELATIVE();