diff options
| author | dgp@users.sourceforge.net <dgp> | 2015-07-17 21:22:22 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2015-07-17 21:22:22 (GMT) |
| commit | dee9a9cbe77ea21d498f9c6c3885df0a93c8da50 (patch) | |
| tree | eb303b04e47fe05468dc5620171a0ee2c8453095 /generic/tclScan.c | |
| parent | 3b5dff82b3bea4153a4034c95ebdc7af76076428 (diff) | |
| parent | 77985b9936c999f8cbcb0f87825fedb45afada9a (diff) | |
| download | tcl-dee9a9cbe77ea21d498f9c6c3885df0a93c8da50.zip tcl-dee9a9cbe77ea21d498f9c6c3885df0a93c8da50.tar.gz tcl-dee9a9cbe77ea21d498f9c6c3885df0a93c8da50.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclScan.c')
| -rw-r--r-- | generic/tclScan.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/generic/tclScan.c b/generic/tclScan.c index ef7eedf..3edb8be 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': @@ -592,7 +595,7 @@ Tcl_ScanObjCmd( return TCL_ERROR; } - format = Tcl_GetStringFromObj(objv[2], NULL); + format = Tcl_GetString(objv[2]); numVars = objc-3; /* @@ -614,7 +617,7 @@ Tcl_ScanObjCmd( } } - string = Tcl_GetStringFromObj(objv[1], NULL); + string = Tcl_GetString(objv[1]); baseString = string; /* @@ -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; |