diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclDate.c | 8 | ||||
| -rw-r--r-- | generic/tclGetDate.y | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/generic/tclDate.c b/generic/tclDate.c index 5e36665..02a82c7 100644 --- a/generic/tclDate.c +++ b/generic/tclDate.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclDate.c,v 1.16 2000/02/09 03:56:24 ericm Exp $ + * RCS: @(#) $Id: tclDate.c,v 1.17 2000/02/28 18:49:42 ericm Exp $ */ #include "tclInt.h" @@ -765,12 +765,16 @@ TclDatelex() } if (isdigit(UCHAR(c = *TclDateInput))) { /* INTL: digit */ + /* convert the string into a number; count the number of digits */ + Count = 0; for (TclDatelval.Number = 0; isdigit(UCHAR(c = *TclDateInput++)); ) { /* INTL: digit */ TclDatelval.Number = 10 * TclDatelval.Number + c - '0'; + Count++; } TclDateInput--; - if (TclDatelval.Number >= 100000) { + /* A number with 6 or more digits is considered an ISO 8601 base */ + if (Count >= 6) { return tISOBASE; } else { return tUNUMBER; diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y index c5347bb..f34cb9c 100644 --- a/generic/tclGetDate.y +++ b/generic/tclGetDate.y @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclGetDate.y,v 1.14 2000/02/09 03:56:24 ericm Exp $ + * RCS: @(#) $Id: tclGetDate.y,v 1.15 2000/02/28 18:49:42 ericm Exp $ */ %{ @@ -980,12 +980,16 @@ yylex() } if (isdigit(UCHAR(c = *yyInput))) { /* INTL: digit */ + /* convert the string into a number; count the number of digits */ + Count = 0; for (yylval.Number = 0; isdigit(UCHAR(c = *yyInput++)); ) { /* INTL: digit */ yylval.Number = 10 * yylval.Number + c - '0'; + Count++; } yyInput--; - if (yylval.Number >= 100000) { + /* A number with 6 or more digits is considered an ISO 8601 base */ + if (Count >= 6) { return tISOBASE; } else { return tUNUMBER; |