diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-08-31 10:41:22 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-08-31 10:41:22 (GMT) |
| commit | b13ad887186f6e841d696f4b08dc53f9a2aab8a4 (patch) | |
| tree | c00c8e4ed596c500e03ca46811d7fe010bbc8916 /generic/tclDisassemble.c | |
| parent | 6e584734274ae6286fa7bdf4b14667b673ea68a0 (diff) | |
| parent | cdee0fcd74077f3208f3957e267a611192df1af1 (diff) | |
| download | tcl-b13ad887186f6e841d696f4b08dc53f9a2aab8a4.zip tcl-b13ad887186f6e841d696f4b08dc53f9a2aab8a4.tar.gz tcl-b13ad887186f6e841d696f4b08dc53f9a2aab8a4.tar.bz2 | |
Merge trunk.
Add Gustaf's latest fix for unit-tests.
Diffstat (limited to 'generic/tclDisassemble.c')
| -rw-r--r-- | generic/tclDisassemble.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c index 0a325b3..15502e7 100644 --- a/generic/tclDisassemble.c +++ b/generic/tclDisassemble.c @@ -794,6 +794,7 @@ PrintSourceToObj( { register const char *p; register int i = 0, len; + Tcl_UniChar ch = 0; if (stringPtr == NULL) { Tcl_AppendToObj(appendObj, "\"\"", -1); @@ -803,7 +804,6 @@ PrintSourceToObj( Tcl_AppendToObj(appendObj, "\"", -1); p = stringPtr; for (; (*p != '\0') && (i < maxChars); p+=len) { - Tcl_UniChar ch; len = TclUtfToUniChar(p, &ch); switch (ch) { @@ -832,6 +832,12 @@ PrintSourceToObj( i += 2; continue; default: +#if TCL_UTF_MAX > 4 + if ((int) ch > 0xffff) { + Tcl_AppendPrintfToObj(appendObj, "\\U%08x", (int) ch); + i += 10; + } else +#endif if (ch < 0x20 || ch >= 0x7f) { Tcl_AppendPrintfToObj(appendObj, "\\u%04x", ch); i += 6; |