diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-07-03 12:32:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-07-03 12:32:38 (GMT) |
| commit | 50dd22e6cdf60c09bbab7adb19cd338f37b85dd7 (patch) | |
| tree | 66680f31354b7397dcd85df73423554298d825fb /generic/tclStringObj.c | |
| parent | fafe9a283fd31baef4c4c0ea42826dac9d6ae2c9 (diff) | |
| parent | f7a562e6ef980a33224b0f7f578e9b4b0c0280c0 (diff) | |
| download | tcl-50dd22e6cdf60c09bbab7adb19cd338f37b85dd7.zip tcl-50dd22e6cdf60c09bbab7adb19cd338f37b85dd7.tar.gz tcl-50dd22e6cdf60c09bbab7adb19cd338f37b85dd7.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'generic/tclStringObj.c')
| -rw-r--r-- | generic/tclStringObj.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 0cafffb..6d97881 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -2027,8 +2027,11 @@ Tcl_AppendFormatToObj( segmentLimit -= 1; precision--; break; - case 'x': case 'X': + Tcl_AppendToObj(segment, "0X", 2); + segmentLimit -= 2; + break; + case 'x': Tcl_AppendToObj(segment, "0x", 2); segmentLimit -= 2; break; @@ -2192,7 +2195,11 @@ Tcl_AppendFormatToObj( } digitOffset = (int) (bits % base); if (digitOffset > 9) { - bytes[numDigits] = 'a' + digitOffset - 10; + if (ch == 'X') { + bytes[numDigits] = 'A' + digitOffset - 10; + } else { + bytes[numDigits] = 'a' + digitOffset - 10; + } } else { bytes[numDigits] = '0' + digitOffset; } @@ -2314,14 +2321,6 @@ Tcl_AppendFormatToObj( goto error; } - switch (ch) { - case 'E': - case 'G': - case 'X': { - Tcl_SetObjLength(segment, Tcl_UtfToUpper(TclGetString(segment))); - } - } - if (width>0 && numChars<0) { numChars = Tcl_GetCharLength(segment); } |