summaryrefslogtreecommitdiffstats
path: root/generic/tclScan.c
diff options
context:
space:
mode:
authordonal.k.fellows@manchester.ac.uk <dkf>2014-01-09 21:20:23 (GMT)
committerdonal.k.fellows@manchester.ac.uk <dkf>2014-01-09 21:20:23 (GMT)
commit4aa0402e774719d5bde6de666876df9607d61f62 (patch)
treefe3896fd636563de7504eb24bce205cf9f547457 /generic/tclScan.c
parent8bf48ad5587163c9d5efb09245c0ff6d24db142a (diff)
parent1dd57e7f83b454f114c495ecec9d81fcfa8c13f6 (diff)
downloadtcl-4aa0402e774719d5bde6de666876df9607d61f62.zip
tcl-4aa0402e774719d5bde6de666876df9607d61f62.tar.gz
tcl-4aa0402e774719d5bde6de666876df9607d61f62.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclScan.c')
-rw-r--r--generic/tclScan.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/generic/tclScan.c b/generic/tclScan.c
index ef7eedf..4dfc2d6 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -406,11 +406,14 @@ ValidateFormat(
*/
case 'd':
case 'e':
+ case 'E':
case 'f':
case 'g':
+ case 'G':
case 'i':
case 'o':
case 'x':
+ case 'X':
case 'b':
break;
case 'u':
@@ -743,6 +746,7 @@ Tcl_ScanObjCmd(
parseFlag |= TCL_PARSE_OCTAL_ONLY | TCL_PARSE_SCAN_PREFIXES;
break;
case 'x':
+ case 'X':
op = 'i';
parseFlag |= TCL_PARSE_HEXADECIMAL_ONLY;
break;
@@ -758,7 +762,9 @@ Tcl_ScanObjCmd(
case 'f':
case 'e':
+ case 'E':
case 'g':
+ case 'G':
op = 'f';
break;