diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-02-06 22:10:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-02-06 22:10:55 (GMT) |
| commit | c05fbe8cf9ce62d0d061610ca3200c26dc12f3e8 (patch) | |
| tree | 1ce3de3e6a1a74a1ae33b87491b78d5fdd9171a6 /generic/tclExecute.c | |
| parent | b7a436af60e61f81ec9e5d31278eb6a5ab9ac0cd (diff) | |
| parent | 1d139334be18bced5b3d4d6b1117e47696032f07 (diff) | |
| download | tcl-c05fbe8cf9ce62d0d061610ca3200c26dc12f3e8.zip tcl-c05fbe8cf9ce62d0d061610ca3200c26dc12f3e8.tar.gz tcl-c05fbe8cf9ce62d0d061610ca3200c26dc12f3e8.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclExecute.c')
| -rw-r--r-- | generic/tclExecute.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index ec55e9a..9607d6e 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -5773,14 +5773,34 @@ TEBCresume( trim2 = 0; } createTrimmedString: + /* + * Careful here; trim set often contains non-ASCII characters so we + * take care when printing. [Bug 971cb4f1db] + */ + +#ifdef TCL_COMPILE_DEBUG + if (traceInstructions) { + TRACE(("\"%.30s\" ", O2S(valuePtr))); + TclPrintObject(stdout, value2Ptr, 30); + printf(" => "); + } +#endif if (trim1 == 0 && trim2 == 0) { - TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ", - O2S(valuePtr), O2S(value2Ptr)), valuePtr); +#ifdef TCL_COMPILE_DEBUG + if (traceInstructions) { + TclPrintObject(stdout, valuePtr, 30); + printf("\n"); + } +#endif NEXT_INST_F(1, 1, 0); } else { objResultPtr = Tcl_NewStringObj(string1+trim1, length-trim1-trim2); - TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ", - O2S(valuePtr), O2S(value2Ptr)), objResultPtr); +#ifdef TCL_COMPILE_DEBUG + if (traceInstructions) { + TclPrintObject(stdout, objResultPtr, 30); + printf("\n"); + } +#endif NEXT_INST_F(1, 2, 1); } } |