diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2014-02-04 09:09:06 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2014-02-04 09:09:06 (GMT) |
| commit | e7704f85aa81ff101952d41f121bb52631052981 (patch) | |
| tree | 62ac6c2f0bc7a13ce0ee6042cde892978fa60a5f /generic/tclExecute.c | |
| parent | 76a8030f939360bd39bc940842f79175c47ed828 (diff) | |
| parent | a72ae0f931f9ac8a78ef7b78f854ae68e66f9dd1 (diff) | |
| download | tcl-e7704f85aa81ff101952d41f121bb52631052981.zip tcl-e7704f85aa81ff101952d41f121bb52631052981.tar.gz tcl-e7704f85aa81ff101952d41f121bb52631052981.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 ac78370..89305e6 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -5905,14 +5905,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); } } |