summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-10-12 13:42:40 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-10-12 13:42:40 (GMT)
commit3c8ecbaacd225de1d9b971de37d2bbfd2f4f3bfe (patch)
treeb9d02e375cc98b49355cafc7e7bdb67704ab859b /generic
parentb1c01412e0e3086a5ead8884a55ec71af2b0b755 (diff)
parent88bcb2bce724073d31acb1aa04d9f630b469e576 (diff)
downloadtcl-3c8ecbaacd225de1d9b971de37d2bbfd2f4f3bfe.zip
tcl-3c8ecbaacd225de1d9b971de37d2bbfd2f4f3bfe.tar.gz
tcl-3c8ecbaacd225de1d9b971de37d2bbfd2f4f3bfe.tar.bz2
[be003d570f] TclParseNumber() failed to fully implement TCL_PARSE_OCTAL_ONLY.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclStrToD.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index f69f6b9..dc85124 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -396,6 +396,9 @@ static Tcl_WideUInt Nokia770Twiddle(Tcl_WideUInt w);
* - TCL_PARSE_SCAN_PREFIXES: ignore the prefixes 0b and 0o that are
* not part of the [scan] command's vocabulary. Use only in
* combination with TCL_PARSE_INTEGER_ONLY.
+ * - TCL_PARSE_BINARY_ONLY: parse only in the binary format, whether
+ * or not a prefix is present that would lead to binary parsing.
+ * Use only in combination with TCL_PARSE_INTEGER_ONLY.
* - TCL_PARSE_OCTAL_ONLY: parse only in the octal format, whether
* or not a prefix is present that would lead to octal parsing.
* Use only in combination with TCL_PARSE_INTEGER_ONLY.
@@ -627,6 +630,9 @@ TclParseNumber(
acceptPoint = p;
acceptLen = len;
if (c == 'x' || c == 'X') {
+ if (flags & TCL_PARSE_OCTAL_ONLY) {
+ goto endgame;
+ }
state = ZERO_X;
break;
}
@@ -637,6 +643,9 @@ TclParseNumber(
goto zeroo;
}
if (c == 'b' || c == 'B') {
+ if (flags & TCL_PARSE_OCTAL_ONLY) {
+ goto endgame;
+ }
state = ZERO_B;
break;
}