diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-08 17:16:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-08 17:16:36 (GMT) |
| commit | 795fcf4f08882df1123a1ab6228a6cdf31fbb3eb (patch) | |
| tree | ce1eec15448d13d9dff53c233970313d8f68876e /generic/tclScan.c | |
| parent | b5fe898956f0d887cbda3595f970480144e89073 (diff) | |
| parent | a7858d818d69719efc88a5de7dfcf85032e7540b (diff) | |
| download | tcl-795fcf4f08882df1123a1ab6228a6cdf31fbb3eb.zip tcl-795fcf4f08882df1123a1ab6228a6cdf31fbb3eb.tar.gz tcl-795fcf4f08882df1123a1ab6228a6cdf31fbb3eb.tar.bz2 | |
Merge 8.7
Bring back Tcl_InitSubsystems to what Tcl_InitSubsystems was: without additional parameters or additional functionality
Diffstat (limited to 'generic/tclScan.c')
| -rw-r--r-- | generic/tclScan.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tclScan.c b/generic/tclScan.c index 6a1311f..ae9f505 100644 --- a/generic/tclScan.c +++ b/generic/tclScan.c @@ -135,7 +135,7 @@ BuildCharSet( * as well as the dash. */ - if (*format == ']') { + if (*format == ']' || !cset->ranges) { cset->chars[cset->nchars++] = start; cset->chars[cset->nchars++] = ch; } else { @@ -1009,8 +1009,10 @@ Tcl_ScanObjCmd( double dvalue; if (Tcl_GetDoubleFromObj(NULL, objPtr, &dvalue) != TCL_OK) { #ifdef ACCEPT_NAN - if (objPtr->typePtr == &tclDoubleType) { - dvalue = objPtr->internalRep.doubleValue; + const Tcl_ObjIntRep *irPtr + = Tcl_FetchIntRep(objPtr, &tclDoubleType); + if (irPtr) { + dvalue = irPtr->doubleValue; } else #endif { |