diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2024-06-20 07:44:32 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2024-06-20 07:44:32 (GMT) |
| commit | e83954d81f5ad30df0736d1cb12f5240bb8e896c (patch) | |
| tree | bcc7064efa50ae367f8843e46d36b864e91b24af /generic/tclScan.c | |
| parent | 2de684d18bf96b3de8c6e42f5aafbdb832096475 (diff) | |
| parent | 58e07be6174a8195b83da655731626e99b605c86 (diff) | |
| download | tcl-e83954d81f5ad30df0736d1cb12f5240bb8e896c.zip tcl-e83954d81f5ad30df0736d1cb12f5240bb8e896c.tar.gz tcl-e83954d81f5ad30df0736d1cb12f5240bb8e896c.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic/tclScan.c')
| -rw-r--r-- | generic/tclScan.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/generic/tclScan.c b/generic/tclScan.c index c143efa..48d2bcc 100644 --- a/generic/tclScan.c +++ b/generic/tclScan.c @@ -385,6 +385,10 @@ ValidateFormat( } format += TclUtfToUniChar(format, &ch); break; + case 'L': + flags |= SCAN_BIG; + format += TclUtfToUniChar(format, &ch); + break; case 'l': if (*format == 'l') { flags |= SCAN_BIG; @@ -393,7 +397,6 @@ ValidateFormat( break; } /* FALLTHRU */ - case 'L': case 'j': case 'q': flags |= SCAN_LONGER; @@ -601,7 +604,7 @@ Tcl_ScanObjCmd( const char *format; int numVars, nconversions, totalVars = -1; int objIndex, offset, i, result, code; - long value; + int value; const char *string, *end, *baseString; char op = 0; int underflow = 0; @@ -994,11 +997,11 @@ Tcl_ScanObjCmd( } } } else { - if (TclGetLongFromObj(NULL, objPtr, &value) != TCL_OK) { + if (TclGetIntFromObj(NULL, objPtr, &value) != TCL_OK) { if (TclGetString(objPtr)[0] == '-') { - value = LONG_MIN; + value = INT_MIN; } else { - value = LONG_MAX; + value = INT_MAX; } } if ((flags & SCAN_UNSIGNED) && (value < 0)) { |