diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-04-07 16:56:53 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-04-07 16:56:53 (GMT) |
| commit | ff7812fe978a8661671807d3910d7b99e16ea8c2 (patch) | |
| tree | 849f4b6d4c393dcca695ea288a7a192dc6dfbe6d | |
| parent | 05c789647adebac2a77a4910a46810e94cad3efe (diff) | |
| parent | 689f5653f9349eb55b176a83f0daf2762a353a2b (diff) | |
| download | tcl-ff7812fe978a8661671807d3910d7b99e16ea8c2.zip tcl-ff7812fe978a8661671807d3910d7b99e16ea8c2.tar.gz tcl-ff7812fe978a8661671807d3910d7b99e16ea8c2.tar.bz2 | |
merge 8.5
| -rw-r--r-- | doc/string.n | 8 | ||||
| -rw-r--r-- | generic/tclCmdMZ.c | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/doc/string.n b/doc/string.n index 00ce85c..7e666ea 100644 --- a/doc/string.n +++ b/doc/string.n @@ -115,9 +115,7 @@ Any Unicode control character. Any Unicode digit character. Note that this includes characters outside of the [0\-9] range. .IP \fBdouble\fR 12 -Any of the valid forms for a double in Tcl, with optional surrounding -whitespace. In case of under/overflow in the value, 0 is returned and -the \fIvarname\fR will contain \-1. +Any of the forms allowed to \fBTcl_GetDoubleFromObj\fR. .IP \fBentier\fR 12 .VS 8.6 Any of the valid string formats for an integer value of arbitrary size @@ -131,7 +129,7 @@ false. Any Unicode printing character, except space. .IP \fBinteger\fR 12 Any of the valid string formats for a 32-bit integer value in Tcl, -with optional surrounding whitespace. In case of under/overflow in +with optional surrounding whitespace. In case of overflow in the value, 0 is returned and the \fIvarname\fR will contain \-1. .IP \fBlist\fR 12 Any proper list structure, with optional surrounding whitespace. In @@ -156,7 +154,7 @@ true. Any upper case alphabet character in the Unicode character set. .IP \fBwideinteger\fR 12 Any of the valid forms for a wide integer in Tcl, with optional -surrounding whitespace. In case of under/overflow in the value, 0 is +surrounding whitespace. In case of overflow in the value, 0 is returned and the \fIvarname\fR will contain \-1. .IP \fBwordchar\fR 12 Any Unicode word character. That is any alphanumeric character, and diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c index a3a79f8..b686330 100644 --- a/generic/tclCmdMZ.c +++ b/generic/tclCmdMZ.c @@ -1571,7 +1571,6 @@ StringIsCmd( chcomp = Tcl_UniCharIsDigit; break; case STR_IS_DOUBLE: { - /* TODO */ if ((objPtr->typePtr == &tclDoubleType) || (objPtr->typePtr == &tclIntType) || #ifndef TCL_WIDE_INT_IS_LONG |