i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added alternate identifier strings (mostly abbreviations).

Browse Source 
Mixed up comma/colon/semicolon in some stupid ways...
Fixed a bug that prevented weekday/month names to be matched correctly.
Temporarily enabled some debug output.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4369 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-08-24 11:48:16 +00:00
parent c6a70c8d1b
commit 770108b448
1 changed files with 58 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/libroot/os/parsedate.cpp
+58 -56
View File
@@ -130,8 +130,8 @@ enum field_type {
TYPE_DASH = 12, TYPE_DASH = 12,
TYPE_DOT = 13, TYPE_DOT = 13,
TYPE_COLON = 14, TYPE_COMMA = 14,
TYPE_SEMICOLON = 15, TYPE_COLON = 15,
TYPE_PLUS_MINUS = 16 | TYPE_MODIFIER | TYPE_RELATIVE, TYPE_PLUS_MINUS = 16 | TYPE_MODIFIER | TYPE_RELATIVE,
TYPE_NEXT_LAST_THIS = 17 | TYPE_MODIFIER | TYPE_RELATIVE, TYPE_NEXT_LAST_THIS = 17 | TYPE_MODIFIER | TYPE_RELATIVE,
@@ -155,62 +155,59 @@ enum value_modifier {
struct known_identifier { struct known_identifier {
const char *string; const char *string;
const char *alternate_string;
int32 type; int32 type;
int32 value; int32 value;
}; };
static const known_identifier kIdentifiers[] = { static const known_identifier kIdentifiers[] = {
{"today", TYPE_RELATIVE | TYPE_NOT_MODIFIABLE | TYPE_DAY_UNIT, 0}, {"today", NULL, TYPE_RELATIVE | TYPE_NOT_MODIFIABLE | TYPE_DAY_UNIT, 0},
{"tomorrow", TYPE_RELATIVE | TYPE_NOT_MODIFIABLE | TYPE_DAY_UNIT, 1}, {"tomorrow", NULL, TYPE_RELATIVE | TYPE_NOT_MODIFIABLE | TYPE_DAY_UNIT, 1},
{"yesterday", TYPE_RELATIVE | TYPE_NOT_MODIFIABLE | TYPE_DAY_UNIT, -1}, {"yesterday", NULL, TYPE_RELATIVE | TYPE_NOT_MODIFIABLE | TYPE_DAY_UNIT, -1},
{"now", TYPE_RELATIVE | TYPE_NOT_MODIFIABLE | TYPE_NOW, 0}, {"now", NULL, TYPE_RELATIVE | TYPE_NOT_MODIFIABLE | TYPE_NOW, 0},
{"this", TYPE_NEXT_LAST_THIS, 0}, {"this", NULL, TYPE_NEXT_LAST_THIS, 0},
{"next", TYPE_NEXT_LAST_THIS, 1}, {"next", NULL, TYPE_NEXT_LAST_THIS, 1},
{"last", TYPE_NEXT_LAST_THIS, -1}, {"last", NULL, TYPE_NEXT_LAST_THIS, -1},
{"year", TYPE_UNIT | TYPE_RELATIVE | TYPE_YEAR_UNIT, 1}, {"years", "year", TYPE_UNIT | TYPE_RELATIVE | TYPE_YEAR_UNIT, 1},
{"month", TYPE_UNIT | TYPE_RELATIVE | TYPE_MONTH_UNIT, 1}, {"months", "month",TYPE_UNIT | TYPE_RELATIVE | TYPE_MONTH_UNIT, 1},
{"day", TYPE_UNIT | TYPE_RELATIVE | TYPE_DAY_UNIT, 1}, {"days", "day", TYPE_UNIT | TYPE_RELATIVE | TYPE_DAY_UNIT, 1},
{"days", TYPE_UNIT | TYPE_RELATIVE | TYPE_DAY_UNIT, 1}, {"hour", NULL, TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 1 * 60 * 60},
{"hour", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 1 * 60 * 60}, {"hours", "hrs", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 1 * 60 * 60},
{"hrs", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 1 * 60 * 60}, {"second", "sec", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 1},
{"hours", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 1 * 60 * 60}, {"seconds", "secs", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 1},
{"sec", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 1}, {"minute", "min", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 60},
{"second", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 1}, {"minutes", "mins", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 60},
{"seconds", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 1},
{"min", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 60},
{"minute", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 60},
{"minutes", TYPE_UNIT | TYPE_RELATIVE | TYPE_SECOND_UNIT, 60},
{"am", TYPE_MERIDIAN | TYPE_NOT_MODIFIABLE, 0}, {"am", NULL, TYPE_MERIDIAN | TYPE_NOT_MODIFIABLE, 0},
{"pm", TYPE_MERIDIAN | TYPE_NOT_MODIFIABLE, 12 * 60 * 60}, // 12 hours {"pm", NULL, TYPE_MERIDIAN | TYPE_NOT_MODIFIABLE, 12 * 60 * 60}, // 12 hours
{"sunday", TYPE_WEEKDAY, 0}, {"sunday", "sun", TYPE_WEEKDAY, 0},
{"monday", TYPE_WEEKDAY, 1}, {"monday", "mon", TYPE_WEEKDAY, 1},
{"tuesday", TYPE_WEEKDAY, 2}, {"tuesday", "tue", TYPE_WEEKDAY, 2},
{"wednesday", TYPE_WEEKDAY, 3}, {"wednesday", "wed", TYPE_WEEKDAY, 3},
{"thursday", TYPE_WEEKDAY, 4}, {"thursday", "thu", TYPE_WEEKDAY, 4},
{"friday", TYPE_WEEKDAY, 5}, {"friday", "fri", TYPE_WEEKDAY, 5},
{"saturday", TYPE_WEEKDAY, 6}, {"saturday", "sat", TYPE_WEEKDAY, 6},
{"january", TYPE_MONTH, 1}, {"january", "jan", TYPE_MONTH, 1},
{"february", TYPE_MONTH, 2}, {"february", "feb", TYPE_MONTH, 2},
{"march", TYPE_MONTH, 3}, {"march", "mar", TYPE_MONTH, 3},
{"april", TYPE_MONTH, 4}, {"april", "apr", TYPE_MONTH, 4},
{"may", TYPE_MONTH, 5}, {"may", "may", TYPE_MONTH, 5},
{"june", TYPE_MONTH, 6}, {"june", "jun", TYPE_MONTH, 6},
{"july", TYPE_MONTH, 7}, {"july", "jul", TYPE_MONTH, 7},
{"august", TYPE_MONTH, 8}, {"august", "aug", TYPE_MONTH, 8},
{"september", TYPE_MONTH, 9}, {"september", "sep", TYPE_MONTH, 9},
{"october", TYPE_MONTH, 10}, {"october", "oct", TYPE_MONTH, 10},
{"november", TYPE_MONTH, 11}, {"november", "nov", TYPE_MONTH, 11},
{"december", TYPE_MONTH, 12}, {"december", "dec", TYPE_MONTH, 12},
{"GMT", TYPE_TIME_ZONE, 0}, {"GMT", NULL, TYPE_TIME_ZONE, 0},
// ToDo: add more time zones // ToDo: add more time zones
{NULL, TYPE_UNKNOWN, 0}, {NULL}
}; };
#define MAX_ELEMENTS 32 #define MAX_ELEMENTS 32
@@ -251,7 +248,7 @@ preparseDate(const char *dateString, parsed_element *elements)
memset(&elements[index], 0, sizeof(parsed_element)); memset(&elements[index], 0, sizeof(parsed_element));
if (c == ',') { if (c == ',') {
elements[index].type = TYPE_COLON; elements[index].type = TYPE_COMMA;
elements[index].value_type = VALUE_CHAR; elements[index].value_type = VALUE_CHAR;
} else if (c == '.') { } else if (c == '.') {
elements[index].type = TYPE_DOT; elements[index].type = TYPE_DOT;
@@ -261,7 +258,7 @@ preparseDate(const char *dateString, parsed_element *elements)
elements[index].type = TYPE_DASH; elements[index].type = TYPE_DASH;
elements[index].value_type = VALUE_CHAR; elements[index].value_type = VALUE_CHAR;
} else if (c == ':') { } else if (c == ':') {
elements[index].type = TYPE_SEMICOLON; elements[index].type = TYPE_COLON;
elements[index].value_type = VALUE_CHAR; elements[index].value_type = VALUE_CHAR;
} else if (c == '+') { } else if (c == '+') {
elements[index].type = TYPE_RELATIVE; elements[index].type = TYPE_RELATIVE;
@@ -304,6 +301,11 @@ preparseDate(const char *dateString, parsed_element *elements)
if (!strncasecmp(identifier->string, string, length) if (!strncasecmp(identifier->string, string, length)
&& !identifier->string[length]) && !identifier->string[length])
break; break;
if (identifier->alternate_string != NULL
&& !strncasecmp(identifier->alternate_string, string, length)
&& !identifier->alternate_string[length])
break;
} }
if (identifier->string == NULL) { if (identifier->string == NULL) {
// unknown string, we don't have to parse any further // unknown string, we don't have to parse any further
@@ -537,7 +539,7 @@ parsedate_etc(const char *dateString, time_t now, int *_flags)
return B_ERROR; return B_ERROR;
} }
/*for (int32 index = 0; elements[index].type != TYPE_END; index++) { for (int32 index = 0; elements[index].type != TYPE_END; index++) {
parsed_element e = elements[index]; parsed_element e = elements[index];
char type[32]; char type[32];
sprintf(type, "0x%lx", e.type); sprintf(type, "0x%lx", e.type);
@@ -550,7 +552,7 @@ parsedate_etc(const char *dateString, time_t now, int *_flags)
index, e.type & TYPE_MASK, type, e.value, index, e.type & TYPE_MASK, type, e.value,
e.value_type == VALUE_NUMERICAL ? "numerical" : e.value_type == VALUE_NUMERICAL ? "numerical" :
(e.value_type == VALUE_STRING ? "string" : "char")); (e.value_type == VALUE_STRING ? "string" : "char"));
}*/ }
bool optional[MAX_ELEMENTS]; bool optional[MAX_ELEMENTS];
@@ -585,12 +587,12 @@ parsedate_etc(const char *dateString, time_t now, int *_flags)
if (format[0] != '/' && format[0] != '-') if (format[0] != '/' && format[0] != '-')
goto next_format; goto next_format;
break; break;
case TYPE_COLON: case TYPE_COMMA:
if (format[0] != ',') if (format[0] != ',')
goto next_format; goto next_format;
break; break;
case TYPE_SEMICOLON: case TYPE_COLON:
if (format[0] != ';') if (format[0] != ':')
goto next_format; goto next_format;
break; break;
default: default:
@@ -631,21 +633,21 @@ parsedate_etc(const char *dateString, time_t now, int *_flags)
switch (format[0]) { switch (format[0]) {
case 'a': // weekday case 'a': // weekday
case 'A': case 'A':
if ((element->type & TYPE_MASK) != TYPE_WEEKDAY) if (!isType(element->type, TYPE_WEEKDAY))
goto next_format; goto next_format;
break; break;
case 'b': // month case 'b': // month
case 'B': case 'B':
if ((element->type & TYPE_MASK) != TYPE_MONTH) if (!isType(element->type, TYPE_MONTH))
goto next_format; goto next_format;
break; break;
case 'p': // meridian case 'p': // meridian
if ((element->type & TYPE_MASK) != TYPE_MERIDIAN) if (!isType(element->type, TYPE_MERIDIAN))
goto next_format; goto next_format;
break; break;
case 'z': // time zone case 'z': // time zone
case 'Z': case 'Z':
if ((element->type & TYPE_MASK) != TYPE_TIME_ZONE) if (!isType(element->type, TYPE_TIME_ZONE))
goto next_format; goto next_format;
break; break;
case 'T': case 'T':