X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fdtimep.lex;h=4f07aacfe65acd558a237e673933218f597c1a63;hp=42b35723e5bf6cd88377aca3f2406f32d4472813;hb=f78e7c6e6e616cc4ff2bee8a726365fafef2d8ce;hpb=d254c5e2ad008f26d5fda43c3f24f0a711c7e851

diff --git a/sbr/dtimep.lex b/sbr/dtimep.lex
index 42b3572..4f07aac 100644
--- a/sbr/dtimep.lex
+++ b/sbr/dtimep.lex
@@ -56,66 +56,18 @@
 */
 int europeandate = 0;
 
-/*
-** Table to convert month names to numeric month.  We use the
-** fact that the low order 5 bits of the sum of the 2nd & 3rd
-** characters of the name is a hash with no collisions for the 12
-** valid month names.  (The mask to 5 bits maps any combination of
-** upper and lower case into the same hash value).
-*/
-static int month_map[] = {
-	0,
-	6,	/* 1 - Jul */
-	3,	/* 2 - Apr */
-	5,	/* 3 - Jun */
-	0,
-	10,	/* 5 - Nov */
-	0,
-	1,	/* 7 - Feb */
-	11,	/* 8 - Dec */
-	0,
-	0,
-	0,
-	0,
-	0,
-	0,
-	0,	/*15 - Jan */
-	0,
-	0,
-	0,
-	2,	/*19 - Mar */
-	0,
-	8,	/*21 - Sep */
-	0,
-	9,	/*23 - Oct */
-	0,
-	0,
-	4,	/*26 - May */
-	0,
-	7	/*28 - Aug */
-};
+static int
+name2num(char *name, char *names[])
+{
+	int i;
 
-/*
-** Lookup table for day-of-week using the same hash trick as for above
-** name-of-month table, but using the first and second character, not
-** second and third.
-**
-** Compute index into table using: (day_name[0] & 7) + (day_name[1] & 4)
-*/
-static int day_map[] = {
-	0,
-	0,
-	0,
-	6,	/* 3 - Sat */
-	4,	/* 4 - Thu */
-	0,
-	5,	/* 6 - Fri */
-	0,	/* 7 - Sun */
-	2,	/* 8 - Tue */
-	1	/* 9 - Mon */,
-	0,
-	3	/*11 - Wed */
-};
+	for (i=0; names[i]; i++) {
+		if (strncasecmp(name, names[i], strlen(names[i]))==0) {
+			return i;
+		}
+	}
+	return 0;
+}
 
 /*
 ** The SET* macros will parse for the appropriate field, and leave the
@@ -129,10 +81,9 @@ static int day_map[] = {
 */
 
 #define INIT() { cp = yytext;}
-#define SETWDAY()  { tw.tw_wday= day_map[(cp[0] & 7) + (cp[1] & 4)]; \
+#define SETWDAY()  { tw.tw_wday = name2num(cp, tw_dotw); \
 	tw.tw_flags &= ~TW_SDAY; tw.tw_flags |= TW_SEXP; SKIPA(); }
-#define SETMON()  { cp++; tw.tw_mon = month_map[(cp[0] + cp[1]) & 0x1f]; \
-	SKIPA(); }
+#define SETMON()  { tw.tw_mon = name2num(cp, tw_moty); SKIPA(); }
 #define SETMON_NUM()  { tw.tw_mon = atoi(cp)-1; SKIPD(); }
 #define SETYEAR()  { tw.tw_year = atoi(cp); SKIPD(); }
 #define SETDAY()  { tw.tw_mday = atoi(cp); tw.tw_flags |= TW_YES; SKIPD(); }
@@ -141,6 +92,8 @@ static int day_map[] = {
 	tw.tw_sec = atoi(++cp); SKIPD(); } }
 #define SETZONE(x)  { tw.tw_zone = ((x)/100)*60+(x)%100; \
 	tw.tw_flags |= TW_SZEXP; SKIPD(); }
+#define SETZONEC(h, m)  { tw.tw_zone = (h)*60+(m); \
+	tw.tw_flags |= TW_SZEXP; SKIPD(); }
 #define SETDST()  { tw.tw_flags |= TW_DST; }
 #define SKIPD()  { while ( isdigit(*cp++) ) ; --cp; }
 #define SKIPTOD()  { while ( !isdigit(*cp++) ) ; --cp; }
@@ -158,7 +111,7 @@ static int day_map[] = {
 static void
 zonehack (struct tws *tw)
 {
-	register struct tm *tm;
+	struct tm *tm;
 
 	if (dmktime (tw) == (time_t) -1)
 		return;
@@ -222,7 +175,7 @@ nl	[ \t\n()]
 	*/
 	YY_BUFFER_STATE lexhandle;
 
-	register unsigned char *cp;
+	unsigned char *cp;
 	static struct tws tw;
 
 	memset(&tw,0,sizeof(struct tws));
@@ -305,7 +258,29 @@ nl	[ \t\n()]
 	SKIPTOD();
 	SETYEAR();
 }
-{D}("-"|"/"){D}("-"|"/"){YEAR}{W}{TIME}  {
+{d}{4}"-"{d}{2}"-"{d}{2}(" "|"T"){TIME}  {
+	INIT();
+	SETYEAR();
+	SKIPTOD();
+	SETMON_NUM();
+	SKIPTOD();
+	SETDAY();
+	SKIPTOD();
+	SETTIME();
+}
+{d}{4}"-"{d}{2}"-"{d}{2}  {
+	INIT();
+	SETYEAR();
+	SKIPTOD();
+	SETMON_NUM();
+	SKIPTOD();
+	SETDAY();
+}
+{d}{2}"-"{d}{2}"-"{d}{2}  {
+	fprintf(stderr, "the highly ambiguous date format XX-XX-XX..."
+			" is no longer supported\n");
+}
+{D}"/"{D}"/"{YEAR}{W}{TIME}  {
 	INIT();
 	if(europeandate) {
 		/* DD/MM/YY */
@@ -323,7 +298,7 @@ nl	[ \t\n()]
 	SKIPTOD();
 	SETTIME();
 }
-{D}("-"|"/"){D}("-"|"/"){YEAR}  {
+{D}"/"{D}"/"{YEAR}  {
 	INIT();
 	if(europeandate) {
 		/* DD/MM/YY */
@@ -362,6 +337,25 @@ nl	[ \t\n()]
 	yyterminate();
 
 }
+"+"{d}{d}":"{d}{d}  {
+	INIT();
+	SKIPTOD();
+	SETZONEC(atoi(cp), atoi(cp+3));
+#ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
+	zonehack (&tw);
+#endif /* ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST */
+	yyterminate();
+}
+"-"{d}{d}":"{d}{d}  {
+	INIT();
+	SKIPTOD();
+	SETZONEC(-atoi(cp), -atoi(cp+3));
+#ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
+	zonehack (&tw);
+#endif /* ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST */
+	yyterminate();
+
+}
 {nl}("ut"|"UT")		INIT(); SETZONE(0); yyterminate();
 {nl}("gmt"|"GMT")	INIT(); SETZONE(0); yyterminate();
 {nl}("est"|"EST")	INIT(); SETZONE(-500); yyterminate();